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

Change-Id: I299fa196e960f14e9480e2ac1047bcdcc95b1021

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:

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
 

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)

vcl/unx/gtk3/app/gtk3fpicker.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * 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"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx → vcl/unx/gtk3/gtk3fpicker.cxx

@@ -7,6 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk/gdi/gtkprintwrapper.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: */

vcl/unx/gtk3/window/gtk3gloactiongroup.cxx → vcl/unx/gtk3/gtk3gloactiongroup.cxx

 /* -*- 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: */

vcl/unx/gtk3/window/gtk3glomenu.cxx → vcl/unx/gtk3/gtk3glomenu.cxx

 /* -*- 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: */

vcl/unx/gtk3/app/gtk3gtkdata.cxx → 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: */

vcl/unx/gtk3/gtk3gtkframe.cxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "../gtk/gtksalframe.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/unx/gtk3/app/gtk3gtkinst.cxx → 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"

vcl/unx/gtk3/window/gtk3gtkobject.cxx → 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: */

vcl/unx/gtk3/gtk3gtkprintwrapper.cxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "../gtk/gtkprintwrapper.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/unx/gtk3/window/gtk3gtksalmenu.cxx → vcl/unx/gtk3/gtk3gtksalmenu.cxx

 /* -*- 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: */

vcl/unx/gtk3/app/gtk3gtksys.cxx → 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: */

vcl/unx/gtk3/window/gtk3hudawareness.cxx → vcl/unx/gtk3/gtk3hudawareness.cxx

 /* -*- 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: */

vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx → 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: */

vcl/unx/gtk3/inc/gtkprintwrapper.hxx → 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
 

vcl/unx/gtk3/window/gtk3gtkframe.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "../../gtk/window/gtksalframe.cxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */