[Libreoffice-commits] core.git: dtrans/Library_ftransl.mk dtrans/source dtrans/StaticLibrary_dtobj.mk

[burcinakalin]

 dtrans/Library_ftransl.mk                    |    5 ++++
 dtrans/StaticLibrary_dtobj.mk                |    5 ++++
 dtrans/source/inc/WinClip.hxx                |   29 +++++++++++++++++++++++++++
 dtrans/source/win32/dtobj/DOTransferable.cxx |    2 -
 dtrans/source/win32/dtobj/DTransHelper.hxx   |    2 -
 dtrans/source/win32/dtobj/DataFmtTransl.cxx  |    2 -
 dtrans/source/win32/dtobj/FetcList.cxx       |    2 -
 dtrans/source/win32/ftransl/ftransl.hxx      |    2 -
 dtrans/source/win32/misc/WinClip.hxx         |   29 ---------------------------
 9 files changed, 44 insertions(+), 34 deletions(-)

New commits:
commit 078d5e8abf51a576dd8532d479fb39bfcb8a4e97
Author: burcinakalin <brcnakalin at gmail.com>
Date:   Wed Dec 23 19:51:09 2015 +0200

    tdf#95416 Get rid of #include "../foo/bar.hxx" style includes.
    
    Change-Id: Icbff7c5f596d4ec1918e0d7924972a0651dde811
    Signed-off-by: burcinakalin <brcnakalin at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/20913
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index b7b735d..7d4a5a2 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -46,4 +46,9 @@ $(eval $(call gb_Library_add_exception_objects,ftransl,\
 	dtrans/source/win32/ftransl/ftranslentry \
 ))
 
+$(eval $(call gb_Library_set_include,ftransl,\
+        -I$(SRCDIR)/dtrans/source/inc \
+        $$(INCLUDE) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
index 3553ae8..04ed1c5 100644
--- a/dtrans/StaticLibrary_dtobj.mk
+++ b/dtrans/StaticLibrary_dtobj.mk
@@ -36,4 +36,9 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\
 	dtrans/source/win32/misc/ImplHelper \
 ))
 
+$(eval $(call gb_StaticLibrary_set_include,dtobj,\
+	-I$(SRCDIR)/dtrans/source/inc \
+	$$(INCLUDE) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/dtrans/source/win32/misc/WinClip.hxx b/dtrans/source/inc/WinClip.hxx
similarity index 87%
rename from dtrans/source/win32/misc/WinClip.hxx
rename to dtrans/source/inc/WinClip.hxx
index 268c7a0..69d4c50 100644
--- a/dtrans/source/win32/misc/WinClip.hxx
+++ b/dtrans/source/inc/WinClip.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_MISC_WINCLIP_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_MISC_WINCLIP_HXX
+#ifndef INCLUDED_DTRANS_SOURCE_INC_WINCLIP_HXX
+#define INCLUDED_DTRANS_SOURCE_INC_WINCLIP_HXX
 
 #include <sal/types.h>
 
 const sal_Int32 CF_INVALID = 0;
 
-#endif
+#endif // INCLUDED_DTRANS_SOURCE_INC_WINCLIP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 7a9a632..e57b745 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -23,7 +23,7 @@
 
 #include "DOTransferable.hxx"
 #include "../misc/ImplHelper.hxx"
-#include "../misc/WinClip.hxx"
+#include "WinClip.hxx"
 #include "DTransHelper.hxx"
 #include "TxtCnvtHlp.hxx"
 #include "MimeAttrib.hxx"
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index ce0e3b4..5760ca3 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -27,7 +27,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include "../misc/WinClip.hxx"
+#include "WinClip.hxx"
 
 #define AUTO_INIT                 TRUE
 
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index cfba2eb..55b1fba 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -22,7 +22,7 @@
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 #include "../misc/ImplHelper.hxx"
-#include "../misc/WinClip.hxx"
+#include "WinClip.hxx"
 #include "MimeAttrib.hxx"
 #include "DTransHelper.hxx"
 #include <rtl/string.h>
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 2b4db3f..fbd9500 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -25,7 +25,7 @@
 
 #include "DataFmtTransl.hxx"
 #include "../misc/ImplHelper.hxx"
-#include "../misc/WinClip.hxx"
+#include "WinClip.hxx"
 
 #include <algorithm>
 
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index 936377d..6d1f0ea 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include "../misc/WinClip.hxx"
+#include "WinClip.hxx"
 
 #include <vector>