From c076babe3ce636d60a699f66e4912c4d043b0412 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 7 Apr 2016 12:43:39 +0300 Subject: Drop pointless "internal" directory level for already internal include files Change-Id: I1ece44616704483cd4d9d2b6204329414f82a98c --- shell/source/all/xml_parser.cxx | 6 +++--- .../unix/sysshell/recently_used_file_handler.cxx | 4 ++-- shell/source/win32/ooofilereader/basereader.cxx | 4 ++-- shell/source/win32/ooofilereader/contentreader.cxx | 2 +- shell/source/win32/ooofilereader/itag.hxx | 4 ++-- .../source/win32/ooofilereader/metainforeader.cxx | 2 +- shell/source/win32/shlxthandler/classfactory.cxx | 12 +++++------ .../win32/shlxthandler/columninfo/columninfo.cxx | 12 +++++------ .../win32/shlxthandler/infotips/infotips.cxx | 24 +++++++++++----------- .../source/win32/shlxthandler/ooofilt/ooofilt.cxx | 10 ++++----- .../source/win32/shlxthandler/ooofilt/ooofilt.hxx | 2 +- .../win32/shlxthandler/ooofilt/stream_helper.cxx | 2 +- .../win32/shlxthandler/prophdl/propertyhdl.cxx | 14 ++++++------- .../shlxthandler/propsheets/document_statistic.cxx | 12 +++++------ .../shlxthandler/propsheets/document_statistic.hxx | 2 +- .../shlxthandler/propsheets/listviewbuilder.cxx | 6 +++--- .../win32/shlxthandler/propsheets/propsheets.cxx | 10 ++++----- shell/source/win32/shlxthandler/res/rcheader.txt | 2 +- shell/source/win32/shlxthandler/shlxthdl.cxx | 12 +++++------ .../win32/shlxthandler/thumbviewer/thumbviewer.cxx | 18 ++++++++-------- .../win32/shlxthandler/util/fileextensions.cxx | 2 +- .../win32/shlxthandler/util/iso8601_converter.cxx | 4 ++-- shell/source/win32/shlxthandler/util/registry.cxx | 2 +- shell/source/win32/shlxthandler/util/utilities.cxx | 4 ++-- shell/source/win32/zipfile/zipexcptn.cxx | 2 +- shell/source/win32/zipfile/zipfile.cxx | 8 ++++---- 26 files changed, 91 insertions(+), 91 deletions(-) (limited to 'shell/source') diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx index 6d557213d639..3c4dd0bb893b 100644 --- a/shell/source/all/xml_parser.cxx +++ b/shell/source/all/xml_parser.cxx @@ -18,11 +18,11 @@ */ -#include "internal/xml_parser.hxx" -#include "internal/i_xml_parser_event_handler.hxx" +#include "xml_parser.hxx" +#include "i_xml_parser_event_handler.hxx" #ifdef _WIN32 -#include "internal/utilities.hxx" +#include "utilities.hxx" #else #define UTF8ToWString(s) s #endif diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 3049bcf6587a..0d5ded137199 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -29,8 +29,8 @@ #include #include "recently_used_file.hxx" -#include "internal/xml_parser.hxx" -#include "internal/i_xml_parser_event_handler.hxx" +#include "xml_parser.hxx" +#include "i_xml_parser_event_handler.hxx" #include #include diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx index 823618a1349f..d2e9773ce1c5 100644 --- a/shell/source/win32/ooofilereader/basereader.cxx +++ b/shell/source/win32/ooofilereader/basereader.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/basereader.hxx" +#include "basereader.hxx" -#include "internal/xml_parser.hxx" +#include "xml_parser.hxx" #include "assert.h" #include diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx index f2dedcd73d8a..ef2b7748ed17 100644 --- a/shell/source/win32/ooofilereader/contentreader.cxx +++ b/shell/source/win32/ooofilereader/contentreader.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/contentreader.hxx" +#include "contentreader.hxx" #include "dummytag.hxx" #include "simpletag.hxx" #include "autostyletag.hxx" diff --git a/shell/source/win32/ooofilereader/itag.hxx b/shell/source/win32/ooofilereader/itag.hxx index d2b63b5b4c2f..234c31367fd0 100644 --- a/shell/source/win32/ooofilereader/itag.hxx +++ b/shell/source/win32/ooofilereader/itag.hxx @@ -21,8 +21,8 @@ #ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX #define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX -#include "internal/config.hxx" -#include "internal/types.hxx" +#include "config.hxx" +#include "types.hxx" /*************************** interface of tag readers ***************************/ diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx index b45b85041bad..0490b9505e8c 100644 --- a/shell/source/win32/ooofilereader/metainforeader.cxx +++ b/shell/source/win32/ooofilereader/metainforeader.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/metainforeader.hxx" +#include "metainforeader.hxx" #include "dummytag.hxx" #include "simpletag.hxx" #include "keywordstag.hxx" diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 9ca1efedfaf0..4e15e853851b 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -17,18 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/global.hxx" +#include "global.hxx" #include "classfactory.hxx" -#include "internal/infotips.hxx" -#include "internal/propsheets.hxx" -#include "internal/columninfo.hxx" +#include "infotips.hxx" +#include "propsheets.hxx" +#include "columninfo.hxx" #ifdef __MINGW32__ #include using ::std::max; using ::std::min; #endif -#include "internal/thumbviewer.hxx" -#include "internal/shlxthdl.hxx" +#include "thumbviewer.hxx" +#include "shlxthdl.hxx" long CClassFactory::s_ServerLocks = 0; diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index c72c298f2edf..6cfbcda1a9fb 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/global.hxx" -#include "internal/columninfo.hxx" -#include "internal/fileextensions.hxx" -#include "internal/metainforeader.hxx" -#include "internal/utilities.hxx" -#include "internal/config.hxx" +#include "global.hxx" +#include "columninfo.hxx" +#include "fileextensions.hxx" +#include "metainforeader.hxx" +#include "utilities.hxx" +#include "config.hxx" #include #include diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index 6f309485c93d..d8fc781e87e6 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -17,18 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/global.hxx" -#include "internal/infotips.hxx" -#include "internal/shlxthdl.hxx" -#include "internal/metainforeader.hxx" -#include "internal/contentreader.hxx" -#include "internal/utilities.hxx" -#include "internal/registry.hxx" -#include "internal/fileextensions.hxx" -#include "internal/iso8601_converter.hxx" -#include "internal/config.hxx" - -#include "internal/resource.h" +#include "global.hxx" +#include "infotips.hxx" +#include "shlxthdl.hxx" +#include "metainforeader.hxx" +#include "contentreader.hxx" +#include "utilities.hxx" +#include "registry.hxx" +#include "fileextensions.hxx" +#include "iso8601_converter.hxx" +#include "config.hxx" + +#include "resource.h" #include #include #include diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index ea266ac613d7..bbcdebb1f7d7 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -28,10 +28,10 @@ // Platform: Windows 2000, Windows XP -#include "internal/contentreader.hxx" -#include "internal/metainforeader.hxx" -#include "internal/registry.hxx" -#include "internal/fileextensions.hxx" +#include "contentreader.hxx" +#include "metainforeader.hxx" +#include "registry.hxx" +#include "fileextensions.hxx" // Include file Purpose @@ -66,7 +66,7 @@ using ::std::min; #endif -#include "internal/stream_helper.hxx" +#include "stream_helper.hxx" //C------------------------------------------------------------------------- // Class: COooFilter diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index bad8da14a8b9..b448951ed0d4 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX #define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX -#include "internal/types.hxx" +#include "types.hxx" //+------------------------------------------------------------------------- // Contents: LibreOffice filter declarations diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx index f1fb3213cf94..57cf217700d3 100644 --- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx @@ -28,7 +28,7 @@ #include #include -#include "internal/stream_helper.hxx" +#include "stream_helper.hxx" BufferStream::BufferStream(IStream *str) : stream(str) diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index 1f8e7aacf4ea..4e02b2574415 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/global.hxx" -#include "internal/propertyhdl.hxx" -#include "internal/fileextensions.hxx" -#include "internal/metainforeader.hxx" -#include "internal/utilities.hxx" -#include "internal/config.hxx" +#include "global.hxx" +#include "propertyhdl.hxx" +#include "fileextensions.hxx" +#include "metainforeader.hxx" +#include "utilities.hxx" +#include "config.hxx" #include #include @@ -31,7 +31,7 @@ #include #include -#include "internal/stream_helper.hxx" +#include "stream_helper.hxx" // Module global diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx index 4d4bafa75711..668f253a757a 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx @@ -22,12 +22,12 @@ #pragma warning (disable : 4786 4503) #endif #include "document_statistic.hxx" -#include "internal/utilities.hxx" -#include "internal/metainforeader.hxx" -#include "internal/resource.h" -#include "internal/fileextensions.hxx" -#include "internal/config.hxx" -#include "internal/iso8601_converter.hxx" +#include "utilities.hxx" +#include "metainforeader.hxx" +#include "resource.h" +#include "fileextensions.hxx" +#include "config.hxx" +#include "iso8601_converter.hxx" const bool READONLY = false; diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx index 1a4a21d6c7ab..ae979a536967 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "internal/metainforeader.hxx" +#include "metainforeader.hxx" struct statistic_item diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 90d6b7fd9d1d..caaf1e5222cc 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -24,12 +24,12 @@ #include "listviewbuilder.hxx" #include "document_statistic.hxx" -#include "internal/utilities.hxx" -#include "internal/config.hxx" +#include "utilities.hxx" +#include "config.hxx" #include #include -#include "internal/resource.h" +#include "resource.h" list_view_builder_ptr create_list_view_builder( diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index aa938e53a405..af5b21401b11 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/config.hxx" -#include "internal/global.hxx" +#include "config.hxx" +#include "global.hxx" -#include "internal/propsheets.hxx" -#include "internal/utilities.hxx" -#include "internal/resource.h" +#include "propsheets.hxx" +#include "utilities.hxx" +#include "resource.h" #include "listviewbuilder.hxx" #if defined _MSC_VER diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt b/shell/source/win32/shlxthandler/res/rcheader.txt index 065bf2a3a11e..42fb81ee54e5 100644 --- a/shell/source/win32/shlxthandler/res/rcheader.txt +++ b/shell/source/win32/shlxthandler/res/rcheader.txt @@ -3,7 +3,7 @@ #define CB_ADDSTRING (WM_USER+3) #define IDC_STATIC (-1) -#include "internal/resource.h" +#include "resource.h" MANIFEST_RESOURCE_ID RT_MANIFEST "shlxthdl.manifest" diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 821e91b2f747..e168618dba98 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/config.hxx" -#include "internal/global.hxx" -#include "internal/shlxthdl.hxx" +#include "config.hxx" +#include "global.hxx" +#include "shlxthdl.hxx" #include "classfactory.hxx" -#include "internal/registry.hxx" -#include "internal/fileextensions.hxx" -#include "internal/utilities.hxx" +#include "registry.hxx" +#include "fileextensions.hxx" +#include "utilities.hxx" #include #include diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index 84e77f25bb41..63f1eec74c5a 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -20,17 +20,17 @@ #ifndef DONT_HAVE_GDIPLUS -#include "internal/global.hxx" +#include "global.hxx" -#include "internal/thumbviewer.hxx" -#include "internal/shlxthdl.hxx" -#include "internal/registry.hxx" -#include "internal/fileextensions.hxx" -#include "internal/config.hxx" -#include "internal/zipfile.hxx" -#include "internal/utilities.hxx" +#include "thumbviewer.hxx" +#include "shlxthdl.hxx" +#include "registry.hxx" +#include "fileextensions.hxx" +#include "config.hxx" +#include "zipfile.hxx" +#include "utilities.hxx" -#include "internal/resource.h" +#include "resource.h" #include #include diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 8d0028d42fdf..607421cc51f3 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -18,7 +18,7 @@ */ #include "algorithm" -#include "internal/fileextensions.hxx" +#include "fileextensions.hxx" #include diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index a033978d2c5e..36ab617441e6 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -21,8 +21,8 @@ #include -#include "internal/iso8601_converter.hxx" -#include "internal/utilities.hxx" +#include "iso8601_converter.hxx" +#include "utilities.hxx" #include #include diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index ed000debeff9..f74b09f59f45 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -26,7 +26,7 @@ #pragma warning(pop) #endif #include -#include "internal/registry.hxx" +#include "registry.hxx" #if defined _MSC_VER #pragma warning(push, 1) diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index 18ccdb0096ec..c372db495396 100644 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/config.hxx" -#include "internal/utilities.hxx" +#include "config.hxx" +#include "utilities.hxx" #ifdef _WIN32_WINNT_WINBLUE #include diff --git a/shell/source/win32/zipfile/zipexcptn.cxx b/shell/source/win32/zipfile/zipexcptn.cxx index f42165022eed..23e90e6c38de 100644 --- a/shell/source/win32/zipfile/zipexcptn.cxx +++ b/shell/source/win32/zipfile/zipexcptn.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "internal/global.hxx" +#include "global.hxx" #include "zipexcptn.hxx" diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index c701f8ef7ff9..f4cab6277ccc 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -18,10 +18,10 @@ */ #include "zipexcptn.hxx" -#include "internal/zipfile.hxx" -#include "internal/global.hxx" -#include "internal/types.hxx" -#include "internal/stream_helper.hxx" +#include "zipfile.hxx" +#include "global.hxx" +#include "types.hxx" +#include "stream_helper.hxx" #include #include -- cgit