vcl: de-layer needless module fragmentation in gtk and gtk3.

Change-Id: I299fa196e960f14e9480e2ac1047bcdcc95b1021

35 files changed, 46 insertions, 46 deletions

diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
index ee17162c557c..296436abd106 100644
--- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk
+++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\
 endif
 
 $(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\
-    vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \
+    vcl/unx/gtk/xid_fullscreen_on_all_monitors \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index ec7f2f8ec805..8a611315187c 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/unx \
-    -I$(SRCDIR)/vcl/unx/gtk/inc \
+    -I$(SRCDIR)/vcl/unx/gtk \
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_gtk,\
@@ -96,12 +96,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
     vcl/unx/gtk/a11y/atkvalue \
     vcl/unx/gtk/a11y/atkwindow \
     vcl/unx/gtk/a11y/atkwrapper \
-    vcl/unx/gtk/app/gtkdata \
-    vcl/unx/gtk/app/gtkinst \
-    vcl/unx/gtk/app/gtksys \
-    vcl/unx/gtk/gdi/salnativewidgets-gtk \
-    vcl/unx/gtk/window/gtksalframe \
-    vcl/unx/gtk/window/gtkobject \
+    vcl/unx/gtk/gtkdata \
+    vcl/unx/gtk/gtkinst \
+    vcl/unx/gtk/gtksys \
+    vcl/unx/gtk/salnativewidgets-gtk \
+    vcl/unx/gtk/gtksalframe \
+    vcl/unx/gtk/gtkobject \
     vcl/unx/gtk/fpicker/resourceprovider \
     vcl/unx/gtk/fpicker/SalGtkPicker \
     vcl/unx/gtk/fpicker/SalGtkFilePicker \
@@ -111,18 +111,18 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
 ifneq ($(ENABLE_DBUS),)
 ifneq ($(ENABLE_GIO),)
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
-    vcl/unx/gtk/window/gloactiongroup \
-    vcl/unx/gtk/window/gtksalmenu \
-    vcl/unx/gtk/window/glomenu \
-    vcl/unx/gtk/window/hudawareness \
+    vcl/unx/gtk/gloactiongroup \
+    vcl/unx/gtk/gtksalmenu \
+    vcl/unx/gtk/glomenu \
+    vcl/unx/gtk/hudawareness \
 ))
 endif
 endif
 
 ifeq ($(ENABLE_GTK_PRINT),TRUE)
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
-    vcl/unx/gtk/gdi/gtkprintwrapper \
-    vcl/unx/gtk/gdi/salprn-gtk \
+    vcl/unx/gtk/gtkprintwrapper \
+    vcl/unx/gtk/salprn-gtk \
 ))
 endif
 
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 515a81c1fdea..e36dc21223e3 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/unx \
-    -I$(SRCDIR)/vcl/unx/gtk3/inc \
+    -I$(SRCDIR)/vcl/unx/gtk3 \
 ))
 
 $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\
@@ -98,21 +98,21 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
     vcl/unx/gtk3/a11y/gtk3atkvalue \
     vcl/unx/gtk3/a11y/gtk3atkwindow \
     vcl/unx/gtk3/a11y/gtk3atkwrapper \
-    vcl/unx/gtk3/app/gtk3gtkdata \
-    vcl/unx/gtk3/app/gtk3gtkinst \
-    vcl/unx/gtk3/app/gtk3gtksys \
-    vcl/unx/gtk3/app/gtk3fpicker \
-    vcl/unx/gtk3/gdi/cairo_gtk3_cairo \
-    vcl/unx/gtk3/gdi/gtk3cairotextrender \
-    vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
-    vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
-    vcl/unx/gtk3/gdi/gtk3salprn-gtk \
-    vcl/unx/gtk3/window/gtk3gtkframe \
-    vcl/unx/gtk3/window/gtk3gtkobject \
-	vcl/unx/gtk3/window/gtk3gtksalmenu \
-	vcl/unx/gtk3/window/gtk3glomenu \
-	vcl/unx/gtk3/window/gtk3gloactiongroup \
-    vcl/unx/gtk3/window/gtk3hudawareness \
+    vcl/unx/gtk3/gtk3gtkdata \
+    vcl/unx/gtk3/gtk3gtkinst \
+    vcl/unx/gtk3/gtk3gtksys \
+    vcl/unx/gtk3/gtk3fpicker \
+    vcl/unx/gtk3/cairo_gtk3_cairo \
+    vcl/unx/gtk3/gtk3cairotextrender \
+    vcl/unx/gtk3/gtk3gtkprintwrapper \
+    vcl/unx/gtk3/gtk3salnativewidgets-gtk \
+    vcl/unx/gtk3/gtk3salprn-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 \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx
index 838538801ca7..838538801ca7 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/gloactiongroup.cxx
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx
index 6aa19e6b74a9..6aa19e6b74a9 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/glomenu.cxx
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 5fd4c0ecb5b3..5fd4c0ecb5b3 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index eeb75de2c902..eeb75de2c902 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/gtkobject.cxx
index 1d510a45c610..1d510a45c610 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/gtkobject.cxx
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gtkprintwrapper.cxx
index e552042478ef..e552042478ef 100644
--- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gtkprintwrapper.cxx
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/gtkprintwrapper.hxx
index 8840d6c3bbc4..8840d6c3bbc4 100644
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk/gtkprintwrapper.hxx
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 3a0ab9b4f61c..3a0ab9b4f61c 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index a0cc9779da8a..a0cc9779da8a 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
index 8d79c98cbe70..8d79c98cbe70 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/gtksys.cxx
diff --git a/vcl/unx/gtk/window/hudawareness.cxx b/vcl/unx/gtk/hudawareness.cxx
index 0cfcd8635736..0cfcd8635736 100644
--- a/vcl/unx/gtk/window/hudawareness.cxx
+++ b/vcl/unx/gtk/hudawareness.cxx
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index f0bfa7088686..f0bfa7088686 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index 767949468563..767949468563 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
diff --git a/vcl/unx/gtk/window/xid_fullscreen_on_all_monitors.c b/vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
index 00554b1df021..00554b1df021 100644
--- a/vcl/unx/gtk/window/xid_fullscreen_on_all_monitors.c
+++ b/vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
diff --git a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.cxx b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
index ec5e641f150e..ec5e641f150e 100644
--- a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.cxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
diff --git a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
index 31961d454978..31961d454978 100644
--- a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx b/vcl/unx/gtk3/gtk3cairotextrender.cxx
index 0171ef12b022..0171ef12b022 100644
--- a/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx
+++ b/vcl/unx/gtk3/gtk3cairotextrender.cxx
diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx b/vcl/unx/gtk3/gtk3cairotextrender.hxx
index 1a0a1ec3b871..1a0a1ec3b871 100644
--- a/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
+++ b/vcl/unx/gtk3/gtk3cairotextrender.hxx
diff --git a/vcl/unx/gtk3/app/gtk3fpicker.cxx b/vcl/unx/gtk3/gtk3fpicker.cxx
index 336d47af5f04..9b83c57daed8 100644
--- a/vcl/unx/gtk3/app/gtk3fpicker.cxx
+++ b/vcl/unx/gtk3/gtk3fpicker.cxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/fpicker/resourceprovider.cxx"
-#include "../../gtk/fpicker/SalGtkPicker.cxx"
-#include "../../gtk/fpicker/SalGtkFilePicker.cxx"
-#include "../../gtk/fpicker/SalGtkFolderPicker.cxx"
+#include "../gtk/fpicker/resourceprovider.cxx"
+#include "../gtk/fpicker/SalGtkPicker.cxx"
+#include "../gtk/fpicker/SalGtkFilePicker.cxx"
+#include "../gtk/fpicker/SalGtkFolderPicker.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3gloactiongroup.cxx b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
index 7f26437360c0..749f5434a456 100644
--- a/vcl/unx/gtk3/window/gtk3gloactiongroup.cxx
+++ b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-#include "../../gtk/window/gloactiongroup.cxx"
+#include "../gtk/gloactiongroup.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3glomenu.cxx b/vcl/unx/gtk3/gtk3glomenu.cxx
index 6ca68cddaea5..e894b09320fd 100644
--- a/vcl/unx/gtk3/window/gtk3glomenu.cxx
+++ b/vcl/unx/gtk3/gtk3glomenu.cxx
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-#include "../../gtk/window/glomenu.cxx"
+#include "../gtk/glomenu.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 28745a4dc6f9..df53f349598a 100644
--- a/vcl/unx/gtk3/app/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/app/gtkdata.cxx"
+#include "../gtk/gtkdata.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5710d506b3de..26d1a079053b 100644
--- a/vcl/unx/gtk3/window/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/window/gtksalframe.cxx"
+#include "../gtk/gtksalframe.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8482ed43001a..9f15db02aa13 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/app/gtkinst.cxx"
+#include "../gtk/gtkinst.cxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "com/sun/star/lang/XServiceInfo.hpp"
diff --git a/vcl/unx/gtk3/window/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index efbafe7171c3..96c152726c58 100644
--- a/vcl/unx/gtk3/window/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/window/gtkobject.cxx"
+#include "../gtk/gtkobject.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
index f456b6ee440f..edefca9626ad 100644
--- a/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx
+++ b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/gdi/gtkprintwrapper.cxx"
+#include "../gtk/gtkprintwrapper.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index ef288bad51df..d465594fc9bc 100644
--- a/vcl/unx/gtk3/window/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-#include "../../gtk/window/gtksalmenu.cxx"
+#include "../gtk/gtksalmenu.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtksys.cxx b/vcl/unx/gtk3/gtk3gtksys.cxx
index 2fcec0951006..2406e0aa3118 100644
--- a/vcl/unx/gtk3/app/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/gtk3gtksys.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/app/gtksys.cxx"
+#include "../gtk/gtksys.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3hudawareness.cxx b/vcl/unx/gtk3/gtk3hudawareness.cxx
index 76ea94ac6af4..3d928f0fd0b1 100644
--- a/vcl/unx/gtk3/window/gtk3hudawareness.cxx
+++ b/vcl/unx/gtk3/gtk3hudawareness.cxx
@@ -1,4 +1,4 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "../../gtk/window/hudawareness.cxx"
+#include "../gtk/hudawareness.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 7c25774a865f..7c25774a865f 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
diff --git a/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
index 708c0bab2ee0..16bf17c8562a 100644
--- a/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/gdi/salprn-gtk.cxx"
+#include "../gtk/salprn-gtk.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx b/vcl/unx/gtk3/gtkprintwrapper.hxx
index 032080ddf6e3..9ee46e7226fe 100644
--- a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk3/gtkprintwrapper.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
 #define INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX
 
-#include "../../gtk/inc/gtkprintwrapper.hxx"
+#include "../gtk/gtkprintwrapper.hxx"
 
 #endif // INCLUDED_VCL_UNX_GTK3_INC_GTKPRINTWRAPPER_HXX