rename to remove the gtk3 prefix

Change-Id: I219798ed42aff11d09fd45c26ca1a018c2d22c08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115239 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-07 12:29:47 +01:00
parent e9f9e2315b
commit 2dbf36132a
60 changed files with 87 additions and 88 deletions
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -197,7 +197,7 @@ public:
                    // sc/source/core/tool/adiasync.cxx, would leak
                    // ScAddInAsync* keys if that set is not empty at exit
                || name == "g_aWindowList"
-                    //vcl/unx/gtk3/a11y/gtk3atkutil.cxx, asserted empty at exit
+                    //vcl/unx/gtk3/a11y/atkutil.cxx, asserted empty at exit
                || name == "gFontPreviewVirDevs"
                    //svtools/source/control/ctrlbox.cxx, empty at exit
                || name == "aLogger" // FormulaLogger& FormulaLogger::get() in sc/source/core/tool/formulalogger.cxx
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -32,7 +32,7 @@ public:
        if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "bootstrapfixture.cxx") != 0) {
            return;
        }
-        if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "gtk3gtkinst.cxx") != 0) {
+        if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "gtkinst.cxx") != 0) {
            return;
        }*/

--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -351,8 +351,7 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C
    if (loplugin::TypeCheck(varDecl->getType()).Pointer().Class("IMapCompat").GlobalNamespace())
        return;
    // passing data to gtk API and I can't figure out the types
-    if (fn == SRCDIR "/vcl/unx/gtk3/gtk3gtkdata.cxx"
-        || fn == SRCDIR "/vcl/unx/gtk/gtkdata.cxx")
+    if (fn == SRCDIR "/vcl/unx/gtk3/gtkdata.cxx")
        return;
    // sometimes this stuff is held by tools::SvRef, sometimes by std::unique_ptr...
    if (fn == SRCDIR "/sot/source/unoolestorage/xolesimplestorage.cxx")
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15222,23 +15222,23 @@ vcl/unx/generic/window/screensaverinhibitor.cxx
 vcl/unx/glxtest.cxx
 vcl/unx/gtk3/a11y/atklistener.hxx
 vcl/unx/gtk3/a11y/atkwrapper.hxx
-vcl/unx/gtk3/a11y/gtk3atkaction.cxx
-vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
-vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
-vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
-vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
-vcl/unx/gtk3/a11y/gtk3atkimage.cxx
-vcl/unx/gtk3/a11y/gtk3atklistener.cxx
-vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
-vcl/unx/gtk3/a11y/gtk3atkselection.cxx
-vcl/unx/gtk3/a11y/gtk3atktable.cxx
-vcl/unx/gtk3/a11y/gtk3atktext.cxx
-vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
-vcl/unx/gtk3/a11y/gtk3atkutil.cxx
-vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
-vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
-vcl/unx/gtk3/cairo_gtk3_cairo.cxx
-vcl/unx/gtk3/cairo_gtk3_cairo.hxx
+vcl/unx/gtk3/a11y/atkaction.cxx
+vcl/unx/gtk3/a11y/atkcomponent.cxx
+vcl/unx/gtk3/a11y/atkeditabletext.cxx
+vcl/unx/gtk3/a11y/atkfactory.cxx
+vcl/unx/gtk3/a11y/atkhypertext.cxx
+vcl/unx/gtk3/a11y/atkimage.cxx
+vcl/unx/gtk3/a11y/atklistener.cxx
+vcl/unx/gtk3/a11y/atkregistry.cxx
+vcl/unx/gtk3/a11y/atkselection.cxx
+vcl/unx/gtk3/a11y/atktable.cxx
+vcl/unx/gtk3/a11y/atktext.cxx
+vcl/unx/gtk3/a11y/atktextattributes.cxx
+vcl/unx/gtk3/a11y/atkutil.cxx
+vcl/unx/gtk3/a11y/atkvalue.cxx
+vcl/unx/gtk3/a11y/atkwrapper.cxx
+vcl/unx/gtk3/gtkcairo.cxx
+vcl/unx/gtk3/gtkcairo.hxx
 vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
 vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
 vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
@@ -15246,17 +15246,17 @@ vcl/unx/gtk3/fpicker/SalGtkFolderPicker.hxx
 vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
 vcl/unx/gtk3/fpicker/SalGtkPicker.hxx
 vcl/unx/gtk3/fpicker/resourceprovider.cxx
-vcl/unx/gtk3/gtk3gloactiongroup.cxx
-vcl/unx/gtk3/gtk3glomenu.cxx
-vcl/unx/gtk3/gtk3gtkdata.cxx
-vcl/unx/gtk3/gtk3gtkframe.cxx
-vcl/unx/gtk3/gtk3gtkinst.cxx
-vcl/unx/gtk3/gtk3gtkobject.cxx
-vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
-vcl/unx/gtk3/gtk3gtksalmenu.cxx
-vcl/unx/gtk3/gtk3gtksys.cxx
-vcl/unx/gtk3/gtk3hudawareness.cxx
-vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+vcl/unx/gtk3/gloactiongroup.cxx
+vcl/unx/gtk3/glomenu.cxx
+vcl/unx/gtk3/gtkdata.cxx
+vcl/unx/gtk3/gtkframe.cxx
+vcl/unx/gtk3/gtkinst.cxx
+vcl/unx/gtk3/gtkobject.cxx
+vcl/unx/gtk3/gtkprintwrapper.cxx
+vcl/unx/gtk3/gtksalmenu.cxx
+vcl/unx/gtk3/gtksys.cxx
+vcl/unx/gtk3/hudawareness.cxx
+vcl/unx/gtk3/salnativewidgets-gtk.cxx
 vcl/unx/x11/x11sys.cxx
 vcl/unx/x11/xlimits.cxx
 vcl/win/app/saldata.cxx
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -80,37 +80,37 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
 ))

 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
-    vcl/unx/gtk3/a11y/gtk3atkaction \
-    vcl/unx/gtk3/a11y/gtk3atkbridge \
-    vcl/unx/gtk3/a11y/gtk3atkcomponent \
-    vcl/unx/gtk3/a11y/gtk3atkeditabletext \
-    vcl/unx/gtk3/a11y/gtk3atkfactory \
-    vcl/unx/gtk3/a11y/gtk3atkhypertext \
-    vcl/unx/gtk3/a11y/gtk3atkimage \
-    vcl/unx/gtk3/a11y/gtk3atklistener \
-    vcl/unx/gtk3/a11y/gtk3atkregistry \
-    vcl/unx/gtk3/a11y/gtk3atkselection \
-    vcl/unx/gtk3/a11y/gtk3atktable \
-    vcl/unx/gtk3/a11y/gtk3atktextattributes \
-    vcl/unx/gtk3/a11y/gtk3atktext \
-    vcl/unx/gtk3/a11y/gtk3atkutil \
-    vcl/unx/gtk3/a11y/gtk3atkvalue \
-    vcl/unx/gtk3/a11y/gtk3atkwrapper \
+    vcl/unx/gtk3/a11y/atkaction \
+    vcl/unx/gtk3/a11y/atkbridge \
+    vcl/unx/gtk3/a11y/atkcomponent \
+    vcl/unx/gtk3/a11y/atkeditabletext \
+    vcl/unx/gtk3/a11y/atkfactory \
+    vcl/unx/gtk3/a11y/atkhypertext \
+    vcl/unx/gtk3/a11y/atkimage \
+    vcl/unx/gtk3/a11y/atklistener \
+    vcl/unx/gtk3/a11y/atkregistry \
+    vcl/unx/gtk3/a11y/atkselection \
+    vcl/unx/gtk3/a11y/atktable \
+    vcl/unx/gtk3/a11y/atktextattributes \
+    vcl/unx/gtk3/a11y/atktext \
+    vcl/unx/gtk3/a11y/atkutil \
+    vcl/unx/gtk3/a11y/atkvalue \
+    vcl/unx/gtk3/a11y/atkwrapper \
    vcl/unx/gtk3/fpicker/resourceprovider \
    vcl/unx/gtk3/fpicker/SalGtkFilePicker \
    vcl/unx/gtk3/fpicker/SalGtkFolderPicker \
    vcl/unx/gtk3/fpicker/SalGtkPicker \
-    vcl/unx/gtk3/gtk3gtkdata \
-    vcl/unx/gtk3/gtk3gtkinst \
-    vcl/unx/gtk3/gtk3gtksys \
-    vcl/unx/gtk3/cairo_gtk3_cairo \
-    vcl/unx/gtk3/gtk3salnativewidgets-gtk \
-    vcl/unx/gtk3/gtk3gtkframe \
-    vcl/unx/gtk3/gtk3gtkobject \
-	vcl/unx/gtk3/gtk3gtksalmenu \
-	vcl/unx/gtk3/gtk3glomenu \
-	vcl/unx/gtk3/gtk3gloactiongroup \
-    vcl/unx/gtk3/gtk3hudawareness \
+    vcl/unx/gtk3/gtkdata \
+    vcl/unx/gtk3/gtkinst \
+    vcl/unx/gtk3/gtksys \
+    vcl/unx/gtk3/gtkcairo \
+    vcl/unx/gtk3/salnativewidgets-gtk \
+    vcl/unx/gtk3/gtkframe \
+    vcl/unx/gtk3/gtkobject \
+	vcl/unx/gtk3/gtksalmenu \
+	vcl/unx/gtk3/glomenu \
+	vcl/unx/gtk3/gloactiongroup \
+    vcl/unx/gtk3/hudawareness \
 ))

 ifeq ($(OS),LINUX)
--- a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atktable.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktable.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atktext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktext.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
--- a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
--- a/vcl/unx/gtk3/gtk3gloactiongroup.cxx
+++ b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
--- a/vcl/unx/gtk3/gtk3glomenu.cxx
+++ b/vcl/unx/gtk3/gtk3glomenu.cxx
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
@@ -7,7 +7,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "cairo_gtk3_cairo.hxx"
+#include "gtkcairo.hxx"

 #include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
--- a/vcl/unx/gtk3/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/gtk3gtksys.cxx
--- a/vcl/unx/gtk3/gtk3hudawareness.cxx
+++ b/vcl/unx/gtk3/gtk3hudawareness.cxx
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -22,7 +22,7 @@
 #include <vcl/settings.hxx>
 #include <unx/fontmanager.hxx>

-#include "cairo_gtk3_cairo.hxx"
+#include "gtkcairo.hxx"
 #include <optional>

 GtkStyleContext* GtkSalGraphics::mpWindowStyle = nullptr;
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkaction.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkaction.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkaction.cxx"
+#include "../../gtk3/a11y/atkaction.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkbridge.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkbridge.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkbridge.cxx"
+#include "../../gtk3/a11y/atkbridge.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkcomponent.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkcomponent.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkcomponent.cxx"
+#include "../../gtk3/a11y/atkcomponent.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkeditabletext.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkeditabletext.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkeditabletext.cxx"
+#include "../../gtk3/a11y/atkeditabletext.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkfactory.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkfactory.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkfactory.cxx"
+#include "../../gtk3/a11y/atkfactory.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkhypertext.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkhypertext.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkhypertext.cxx"
+#include "../../gtk3/a11y/atkhypertext.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkimage.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkimage.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkimage.cxx"
+#include "../../gtk3/a11y/atkimage.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atklistener.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atklistener.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atklistener.cxx"
+#include "../../gtk3/a11y/atklistener.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkregistry.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkregistry.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkregistry.cxx"
+#include "../../gtk3/a11y/atkregistry.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkselection.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkselection.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkselection.cxx"
+#include "../../gtk3/a11y/atkselection.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktable.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktable.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atktable.cxx"
+#include "../../gtk3/a11y/atktable.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktext.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktext.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atktext.cxx"
+#include "../../gtk3/a11y/atktext.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktextattributes.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktextattributes.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atktextattributes.cxx"
+#include "../../gtk3/a11y/atktextattributes.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkutil.cxx"
+#include "../../gtk3/a11y/atkutil.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkvalue.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkvalue.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkvalue.cxx"
+#include "../../gtk3/a11y/atkvalue.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkwrapper.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkwrapper.cxx
@@ -7,6 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include "../../gtk3/a11y/gtk3atkwrapper.cxx"
+#include "../../gtk3/a11y/atkwrapper.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/cairo_gtk3_cairo.cxx"
+#include "../gtk3/gtkcairo.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gloactiongroup.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gloactiongroup.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3gloactiongroup.cxx"
+#include "../gtk3/gloactiongroup.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_glomenu.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_glomenu.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3glomenu.cxx"
+#include "../gtk3/glomenu.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkdata.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkdata.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3gtkdata.cxx"
+#include "../gtk3/gtkdata.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkframe.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkframe.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3gtkframe.cxx"
+#include "../gtk3/gtkframe.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx
@@ -19,7 +19,7 @@

 // make gtk3 plug advertise correctly as kde5 hybrid
 #define GTK_TOOLKIT_NAME "gtk3_kde5"
-#include "../gtk3/gtk3gtkinst.cxx"
+#include "../gtk3/gtkinst.cxx"

 #include "gtk3_kde5_filepicker.hxx"
 #include "gtk3_kde5_folderpicker.hxx"
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkobject.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkobject.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3gtkobject.cxx"
+#include "../gtk3/gtkobject.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtksalmenu.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtksalmenu.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3gtksalmenu.cxx"
+#include "../gtk3/gtksalmenu.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtksys.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtksys.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3gtksys.cxx"
+#include "../gtk3/gtksys.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_hudawareness.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_hudawareness.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3hudawareness.cxx"
+#include "../gtk3/hudawareness.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_salnativewidgets-gtk.cxx
@@ -17,6 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include "../gtk3/gtk3salnativewidgets-gtk.cxx"
+#include "../gtk3/salnativewidgets-gtk.cxx"

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */