Rename coretext/salgdi2.* to coretext/salgdi.*

The "2" part was a temporary measure so an older version of the file,
that is long gone, can coexist.

Change-Id: I3a22b287bfb1351bb73e9dabbfa67100fe17bb97

17 files changed, 16 insertions, 16 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fbeeaf0401c1..fb7816f79070 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -343,7 +343,7 @@ vcl_quartz_code= \
 vcl_coretext_code= \
     vcl/coretext/ctfonts \
     vcl/coretext/ctlayout \
-    vcl/coretext/salgdi2 \
+    vcl/coretext/salgdi \
 
 # GUIBASE specific stuff
 
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 0eb867374421..a30b8d2c242a 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -20,7 +20,7 @@
 
 #include "aqua/salinst.h"
 #include "quartz/utils.h"
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 
 #include "aqua11ytextattributeswrapper.h"
 
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index 7e7e56f03946..a1691fefc327 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -28,7 +28,7 @@
 #include "basegfx/polygon/b2dpolygon.hxx"
 
 #include "quartz/salbmp.h"
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 
 #include "fontsubset.hxx"
 #include "sft.hxx"
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index 8a30e145bb7b..0f7f79aa2c3c 100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -29,7 +29,7 @@
 
 #include "vcl/svapp.hxx"
 
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include "aqua/salframe.h"
 #include "aqua/saldata.hxx"
 
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 89ac7c05b6ae..d9219cf5bd16 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -22,7 +22,7 @@
 #include "vcl/svapp.hxx"
 #include "vcl/timer.hxx"
 
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include "aqua/salnativewidgets.h"
 #include "aqua/saldata.hxx"
 #include "aqua/salframe.h"
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 85c6d438bb50..b64d039a5c04 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -27,7 +27,7 @@
 #include "aqua/salinst.h"
 #include "aqua/salprn.h"
 #include "aqua/aquaprintview.h"
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include "aqua/saldata.hxx"
 #include "quartz/utils.h"
 
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 2539c3892a61..f58ce6fb4768 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -23,7 +23,7 @@
 
 #include "aqua/salvd.h"
 #include "aqua/salinst.h"
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include "aqua/saldata.hxx"
 #include "aqua/salframe.h"
 
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 986283744e85..87f1be1a9746 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -29,7 +29,7 @@
 #include "vcl/syswin.hxx"
 
 #include "aqua/saldata.hxx"
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include "aqua/salframe.h"
 #include "aqua/salmenu.h"
 #include "aqua/salinst.h"
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 0f095326d65c..c46b84d957dc 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -25,7 +25,7 @@
 #include "vcl/svapp.hxx"
 
 #include "aqua/salinst.h"
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include "aqua/salframe.h"
 #include "aqua/salframeview.h"
 #include "aqua/aqua11yfactory.h"
diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index f7fdc8e2f1c9..fd113b892099 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -27,7 +27,7 @@
 #include "aqua/salinst.h"
 #include "aqua/saldata.hxx"
 #endif
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include "quartz/utils.h"
 #include "ctfonts.hxx"
 
diff --git a/vcl/coretext/ctfonts.hxx b/vcl/coretext/ctfonts.hxx
index 7a69b6afc03e..44153115bb94 100644
--- a/vcl/coretext/ctfonts.hxx
+++ b/vcl/coretext/ctfonts.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #ifdef IOS
 #include "headless/svpgdi.hxx"
 #endif
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi.cxx
index 4a58e887c16d..ee6c834aead9 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi.cxx
@@ -38,7 +38,7 @@
 #include "vcl/sysdata.hxx"
 #include "vcl/svapp.hxx"
 
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 
 #ifdef MACOSX
 #include "aqua/salframe.h"
diff --git a/vcl/inc/aqua/salvd.h b/vcl/inc/aqua/salvd.h
index e5bfbd93122f..09e2a01c1897 100644
--- a/vcl/inc/aqua/salvd.h
+++ b/vcl/inc/aqua/salvd.h
@@ -24,7 +24,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include "postmac.h"
 
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 
 #include "salvd.hxx"
 
diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi.h
index ae18647632d6..ae18647632d6 100644
--- a/vcl/inc/coretext/salgdi2.h
+++ b/vcl/inc/coretext/salgdi.h
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 3ffca01fc6ec..fc0e3c5c6e0e 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -27,7 +27,7 @@
 #include "sallayout.hxx"
 
 #ifdef IOS
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #include <premac.h>
 #include <CoreGraphics/CoreGraphics.h>
 #include <postmac.h>
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 01e9aee22561..f7d8d634c0f2 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -27,7 +27,7 @@
 #include "vcl/salbtype.hxx"
 
 #ifdef MACOSX
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #else
 #include "headless/svpgdi.hxx"
 #endif
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 8c9886e0ea1d..4ec1a9f25b21 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -27,7 +27,7 @@
 #include "vcl/dllapi.h"
 
 #ifdef IOS
-#include "coretext/salgdi2.h"
+#include "coretext/salgdi.h"
 #endif
 
 namespace psp