diff options
| author | burcinakalin <brcnakalin@gmail.com> | 2015-12-23 19:51:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-03 09:03:34 +0000 |
| commit | 078d5e8abf51a576dd8532d479fb39bfcb8a4e97 (patch) | |
| tree | 6cd3e2c3a65293205f64bb46f519c3f7d33bb05f /dtrans | |
| parent | 36c3229a2e7765901dc3c21da3b223eca33266a4 (diff) | |
tdf#95416 Get rid of #include "../foo/bar.hxx" style includes.
Change-Id: Icbff7c5f596d4ec1918e0d7924972a0651dde811
Signed-off-by: burcinakalin <brcnakalin@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/20913
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/Library_ftransl.mk | 5 | ||||
| -rw-r--r-- | dtrans/StaticLibrary_dtobj.mk | 5 | ||||
| -rw-r--r-- | dtrans/source/inc/WinClip.hxx (renamed from dtrans/source/win32/misc/WinClip.hxx) | 6 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/DOTransferable.cxx | 2 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/DTransHelper.hxx | 2 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/DataFmtTransl.cxx | 2 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/FetcList.cxx | 2 | ||||
| -rw-r--r-- | dtrans/source/win32/ftransl/ftransl.hxx | 2 |
8 files changed, 18 insertions, 8 deletions
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index b7b735d1d18a..7d4a5a260a17 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 3553ae8a7928..04ed1c53249f 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 index 268c7a0392a6..69d4c500c242 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 7a9a632a0c16..e57b745e6f7d 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 ce0e3b4fcf50..5760ca31a0d8 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 cfba2ebaa742..55b1fba12fb1 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 2b4db3fff80b..fbd950035b68 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 936377d07578..6d1f0ea82481 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> |