Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii

Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc

17 files changed, 26 insertions, 38 deletions

diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index 1d131a6c41e9..6d99dca66c01 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -23,14 +23,14 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <limits.h>
-
+#include <osl/file.hxx>
+#include <osl/process.h>
+#include <osl/thread.h>
+#include <rtl/bootstrap.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/urlobj.hxx>
 #include "vcl/helper.hxx"
 #include "vcl/ppdparser.hxx"
-#include "tools/string.hxx"
-#include "tools/urlobj.hxx"
-#include "osl/file.hxx"
-#include "osl/process.h"
-#include "rtl/bootstrap.hxx"
 
 using ::rtl::Bootstrap;
 
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index 53086c7f5287..a2b5b8a721b3 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -20,11 +20,9 @@
 #ifndef _PSPRINT_FONTCACHE_HXX
 #define _PSPRINT_FONTCACHE_HXX
 
-#include "vcl/dllapi.h"
-#include "vcl/fontmanager.hxx"
-
-#include "tools/string.hxx"
-
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/fontmanager.hxx>
 #include <boost/unordered_map.hpp>
 
 namespace psp
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 0c2df2637b76..4f00487da2c4 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_FONTSUBSET_HXX
 #define _SV_FONTSUBSET_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <cstdio>
 
 #include "vcl/dllapi.h"
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index e849fa5a07fb..8abdd35192ac 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_IMPFONT_HXX
 #define _SV_IMPFONT_HXX
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index e3af7b3f425a..f88a88bcfc0d 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -20,8 +20,8 @@
 #ifndef _SV_OUTFONT_HXX
 #define _SV_OUTFONT_HXX
 
+#include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <tools/string.hxx>
 #include <i18nlangtag/lang.h>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 55bc006f90e5..1ae6087751be 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -21,7 +21,7 @@
 #define _SV_SALWTYPE_HXX
 
 #include <i18nlangtag/lang.h>
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 
 class SalGraphics;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index bc4a59b89a02..3043ad7cf5d4 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -24,11 +24,10 @@
 
 #include <osl/thread.hxx>
 #include <rtl/ref.hxx>
-
+#include <rtl/ustring.hxx>
 #include "tools/shl.hxx"
 #include "tools/link.hxx"
 #include "tools/fldunit.hxx"
-#include "tools/string.hxx"
 #include "tools/color.hxx"
 #include "tools/debug.hxx"
 
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 2b51699c1d7e..dfc4008bd158 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -20,11 +20,9 @@
 #ifndef VCL_TEXTLAYOUT_HXX
 #define VCL_TEXTLAYOUT_HXX
 
-#include "vcl/outdev.hxx"
-
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
-#include <tools/string.hxx>
-
+#include <vcl/outdev.hxx>
 #include <memory>
 
 class Control;
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 96e2c5713fdf..115182364dd8 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -20,8 +20,8 @@
 #ifndef _SV_TOOLBOX_H
 #define _SV_TOOLBOX_H
 
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/string.hxx>
 #include <tools/solar.h>
 #include <vcl/image.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 233b6beb93b7..f1769ed7221d 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -20,8 +20,6 @@
 #ifndef _SAL_I18N_STATUS_HXX
 #define _SAL_I18N_STATUS_HXX
 
-#include <tools/string.hxx>
-
 #include <rtl/ustring.hxx>
 #include <salimestatus.hxx>
 
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 9eb7ad275abb..2c2ee3b38c13 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -20,7 +20,7 @@
 #ifndef _VCL_WMADAPTOR_HXX_
 #define _VCL_WMADAPTOR_HXX_
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #ifndef _PREX_H
 #include <prex.h>
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 1dea032d652e..bf22b77bdc3b 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -17,11 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/string.hxx>
 #include <textdoc.hxx>
-
 #include <stdlib.h>
 
-
 // compare function called by QuickSort
 static bool CompareStart( const TextCharAttrib* pFirst, const TextCharAttrib* pSecond )
 {
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index d5aaadc5962e..4b4afc1b5595 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -20,10 +20,9 @@
 #ifndef _TEXTDOC_HXX
 #define _TEXTDOC_HXX
 
+#include <rtl/ustring.hxx>
 #include <vcl/textdata.hxx>
 #include <vcl/txtattr.hxx>
-
-#include <tools/string.hxx>
 #include <vector>
 
 class TextCharAttribs : public std::vector<TextCharAttrib*> {
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index 664de9e56dac..f8cc38bba551 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -20,12 +20,11 @@
 #ifndef _FILTER_CONFIG_CACHE_HXX_
 #define _FILTER_CONFIG_CACHE_HXX_
 
-#include <tools/string.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-
+#include <rtl/ustring.hxx>
 #include <vector>
 
 /** Cache to keep list of graphic filters + the filters themselves. */
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 868cabe98173..a2ca658d55ca 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -17,11 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include <rtl/alloc.h>
+#include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
-#include <rtl/alloc.h>
 #include <vcl/jobset.hxx>
 
 #include <jobset.h>
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 9b1e59a07e61..09f357d30eaa 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -18,10 +18,9 @@
  */
 
 
-#include <vcl/abstdlg.hxx>
-
+#include <rtl/ustring.hxx>
 #include <osl/module.hxx>
-#include <tools/string.hxx>
+#include <vcl/abstdlg.hxx>
 
 typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)();
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 79137b8c4518..52e48a8c910d 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -20,6 +20,7 @@
 
 // bootstrap stuff
 #include <rtl/bootstrap.hxx>
+#include <rtl/ustring.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
@@ -40,7 +41,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
-#include <tools/string.hxx>
 
 #include <osl/time.h>