[Libreoffice-commits] core.git: vcl/generic vcl/headless vcl/inc vcl/Library_vcl.mk vcl/unx
Chris Sherlock
chris.sherlock79 at gmail.com
Sun Jan 10 23:15:12 PST 2016
vcl/Library_vcl.mk | 14 -
vcl/generic/app/gendisp.cxx | 152 -----------------
vcl/generic/app/geninst.cxx | 164 ------------------
vcl/generic/app/gensys.cxx | 213 ------------------------
vcl/headless/svpdata.cxx | 2
vcl/headless/svpglyphcache.cxx | 2
vcl/headless/svpinst.cxx | 2
vcl/inc/generic/gendata.hxx | 69 -------
vcl/inc/generic/gendisp.hxx | 79 --------
vcl/inc/generic/geninst.h | 127 --------------
vcl/inc/generic/gensys.h | 55 ------
vcl/inc/headless/svpdummies.hxx | 2
vcl/inc/headless/svpinst.hxx | 2
vcl/inc/unx/gendata.hxx | 69 +++++++
vcl/inc/unx/gendisp.hxx | 79 ++++++++
vcl/inc/unx/geninst.h | 127 ++++++++++++++
vcl/inc/unx/gensys.h | 55 ++++++
vcl/inc/unx/gtk/gtkdata.hxx | 2
vcl/inc/unx/gtk/gtkinst.hxx | 2
vcl/inc/unx/gtk/gtksys.hxx | 2
vcl/inc/unx/saldata.hxx | 2
vcl/inc/unx/saldisp.hxx | 4
vcl/inc/unx/salinst.h | 2
vcl/inc/unx/x11/x11sys.hxx | 2
vcl/unx/generic/app/gendisp.cxx | 152 +++++++++++++++++
vcl/unx/generic/app/geninst.cxx | 164 ++++++++++++++++++
vcl/unx/generic/app/gensys.cxx | 213 ++++++++++++++++++++++++
vcl/unx/generic/app/salinst.cxx | 2
vcl/unx/generic/fontmanager/fontmanager.cxx | 2
vcl/unx/generic/fontmanager/fontsubst.cxx | 2
vcl/unx/generic/gdi/cairotextrender.cxx | 2
vcl/unx/generic/plugadapt/salplug.cxx | 4
vcl/unx/generic/print/genprnpsp.cxx | 2
vcl/unx/generic/print/genpspgraphics.cxx | 2
vcl/unx/generic/window/salframe.cxx | 2
vcl/unx/generic/window/screensaverinhibitor.cxx | 2
vcl/unx/gtk/gtkdata.cxx | 2
vcl/unx/gtk/gtksalframe.cxx | 2
vcl/unx/gtk/gtksalmenu.cxx | 2
vcl/unx/gtk3/gtk3gtkframe.cxx | 2
vcl/unx/kde4/KDE4FilePicker.cxx | 2
41 files changed, 890 insertions(+), 898 deletions(-)
New commits:
commit 7546390fb8d4a0f6184302061985e68b0dbceb1d
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Mon Jan 11 15:44:23 2016 +1100
vcl: move vcl/generic/app/ files to vcl/unx/generic/app
These source files as all specific to Unix environments (not, however,
OS X) and are not "generic" (i.e. used across all platforms).
Change-Id: Idba1e9bbe14d8a4bb8e5dd2c2ad1dc75458da53c
Reviewed-on: https://gerrit.libreoffice.org/21335
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5556cf9..f757232 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -538,14 +538,6 @@ endif
endif
-vcl_really_generic_code= \
- vcl/generic/app/gensys \
- vcl/generic/app/geninst \
-
-vcl_generic_code= \
- $(vcl_really_generic_code) \
- vcl/generic/app/gendisp \
-
vcl_headless_code= \
vcl/headless/svpbmp \
vcl/headless/svpdummies \
@@ -554,6 +546,7 @@ vcl_headless_code= \
vcl/headless/svpinst \
vcl/headless/svpdata \
vcl/headless/svpvd \
+ vcl/unx/generic/app/gendisp \
vcl_headless_freetype_code=\
vcl/headless/svpprn \
@@ -580,10 +573,11 @@ vcl_headless_freetype_code=\
vcl/unx/generic/print/genprnpsp \
vcl/unx/generic/print/prtsetup \
vcl/unx/generic/print/text_gfx \
+ vcl/unx/generic/app/gensys \
+ vcl/unx/generic/app/geninst \
ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Library_add_exception_objects,vcl,\
- $(vcl_generic_code) \
vcl/unx/generic/plugadapt/salplug \
vcl/unx/generic/printer/jobdata \
vcl/unx/generic/printer/ppdparser \
@@ -615,7 +609,6 @@ endif
ifeq ($(ENABLE_HEADLESS),TRUE)
$(eval $(call gb_Library_add_exception_objects,vcl,\
- $(vcl_generic_code) \
vcl/unx/generic/printer/jobdata \
vcl/unx/generic/printer/ppdparser \
vcl/null/printerinfomanager \
@@ -646,7 +639,6 @@ $(eval $(call gb_Library_add_libs,vcl,\
-llo-bootstrap \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
- $(vcl_generic_code) \
vcl/unx/generic/printer/jobdata \
vcl/unx/generic/printer/ppdparser \
vcl/null/printerinfomanager \
diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx
index d4fbdae..f1f9851 100644
--- a/vcl/headless/svpdata.cxx
+++ b/vcl/headless/svpdata.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <generic/gendata.hxx>
+#include <unx/gendata.hxx>
#include <headless/svpinst.hxx>
class SvpSalData : public SalGenericData
diff --git a/vcl/headless/svpglyphcache.cxx b/vcl/headless/svpglyphcache.cxx
index e5c5675..f1af1e6 100644
--- a/vcl/headless/svpglyphcache.cxx
+++ b/vcl/headless/svpglyphcache.cxx
@@ -24,7 +24,7 @@
#include <rtl/instance.hxx>
#include <tools/debug.hxx>
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "unx/glyphcache.hxx"
#include "headless/svpgdi.hxx"
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 0d765c1..8d50964 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -40,7 +40,7 @@
#include <salframe.hxx>
#include <svdata.hxx>
-#include <generic/gendata.hxx>
+#include <unx/gendata.hxx>
#include <basebmp/scanlineformats.hxx>
// FIXME: remove when we re-work the svp mainloop
#include <unx/salunxtime.h>
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index f2df54c..b265407 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
#include <vcl/sysdata.hxx>
-#include <generic/gensys.h>
+#include <unx/gensys.h>
#include <salobj.hxx>
#include <salimestatus.hxx>
#include <salsys.hxx>
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 97fa2f8..ecf68d4 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -25,7 +25,7 @@
#include <salinst.hxx>
#include <salwtype.hxx>
#include <saltimer.hxx>
-#include <generic/geninst.h>
+#include <unx/geninst.h>
#include <unx/genprn.h>
#include <basebmp/scanlineformats.hxx>
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/unx/gendata.hxx
similarity index 100%
rename from vcl/inc/generic/gendata.hxx
rename to vcl/inc/unx/gendata.hxx
diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/unx/gendisp.hxx
similarity index 100%
rename from vcl/inc/generic/gendisp.hxx
rename to vcl/inc/unx/gendisp.hxx
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/unx/geninst.h
similarity index 100%
rename from vcl/inc/generic/geninst.h
rename to vcl/inc/unx/geninst.h
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/unx/gensys.h
similarity index 100%
rename from vcl/inc/generic/gensys.h
rename to vcl/inc/unx/gensys.h
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 082aa62..6783e32 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
#include <postx.h>
-#include <generic/gendata.hxx>
+#include <unx/gendata.hxx>
#include <unx/saldisp.hxx>
#include <unx/saldata.hxx>
#include <unx/gtk/gtksys.hxx>
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index a7c489b..adcb142 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_INC_UNX_GTK_GTKINST_HXX
#include <unx/salinst.h>
-#include <generic/gensys.h>
+#include <unx/gensys.h>
#include <headless/svpinst.hxx>
#include <gtk/gtk.h>
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 32585bb..9f2fb5c 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -9,7 +9,7 @@
#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
#define INCLUDED_VCL_INC_UNX_GTK_GTKSYS_HXX
-#include "generic/gensys.h"
+#include "unx/gensys.h"
#include <gtk/gtk.h>
#include <unx/saltype.h>
#include <deque>
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index df2f700..a4486c7 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -28,7 +28,7 @@
#include <vcl/salgtype.hxx>
#include <salframe.hxx>
#include <unx/salinst.h>
-#include <generic/gendata.hxx>
+#include <unx/gendata.hxx>
#include <osl/module.h>
#include <vclpluginapi.h>
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 58ac8d0..bee66fd 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -36,8 +36,8 @@ class SalXLib;
#include <vector>
#include <tools/gen.hxx>
#include <salwtype.hxx>
-#include <generic/gendata.hxx>
-#include <generic/gendisp.hxx>
+#include <unx/gendata.hxx>
+#include <unx/gendisp.hxx>
#include <o3tl/enumarray.hxx>
#include <vclpluginapi.h>
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index f651fa2..ac90ca2 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -23,7 +23,7 @@
#include <osl/thread.hxx>
#include <vclpluginapi.h>
#include <salinst.hxx>
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include <prex.h>
#include <X11/Xlib.h>
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 7c44132..61505ce 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
#define INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
-#include <generic/gensys.h>
+#include <unx/gensys.h>
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <vclpluginapi.h>
diff --git a/vcl/generic/app/gendisp.cxx b/vcl/unx/generic/app/gendisp.cxx
similarity index 98%
rename from vcl/generic/app/gendisp.cxx
rename to vcl/unx/generic/app/gendisp.cxx
index ca985aa..565d417 100644
--- a/vcl/generic/app/gendisp.cxx
+++ b/vcl/unx/generic/app/gendisp.cxx
@@ -18,8 +18,8 @@
*/
#include <salframe.hxx>
-#include <generic/gendisp.hxx>
-#include <generic/geninst.h>
+#include <unx/gendisp.hxx>
+#include <unx/geninst.h>
SalGenericDisplay::SalGenericDisplay()
{
diff --git a/vcl/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
similarity index 99%
rename from vcl/generic/app/geninst.cxx
rename to vcl/unx/generic/app/geninst.cxx
index b5e5969..77c6eae 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/unx/generic/app/geninst.cxx
@@ -28,7 +28,7 @@
#include <comphelper/solarmutex.hxx>
#include <vcl/opengl/OpenGLContext.hxx>
-#include "generic/geninst.h"
+#include "unx/geninst.h"
// SalYieldMutex
diff --git a/vcl/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
similarity index 99%
rename from vcl/generic/app/gensys.cxx
rename to vcl/unx/generic/app/gensys.cxx
index 0bd02ee..32c0e09 100644
--- a/vcl/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -19,7 +19,7 @@
#include <config_folders.h>
-#include <generic/gensys.h>
+#include <unx/gensys.h>
#include <vcl/msgbox.hxx>
#include <vcl/button.hxx>
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 697e16f..74d576b 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -26,7 +26,7 @@
#include "unx/salunx.h"
#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "unx/genpspgraphics.h"
#include "unx/salframe.h"
#include "unx/genprn.h"
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 6145f54..a926e97 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -29,7 +29,7 @@
#include "fontsubset.hxx"
#include "impfont.hxx"
#include "svdata.hxx"
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "fontmanager.hxx"
#include "vcl/strhelper.hxx"
#include "vcl/ppdparser.hxx"
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx
index c78ec9b..0072c09 100644
--- a/vcl/unx/generic/fontmanager/fontsubst.cxx
+++ b/vcl/unx/generic/fontmanager/fontsubst.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "unx/genpspgraphics.h"
#include "unx/glyphcache.hxx"
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index b48b0ca..929055a 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -27,7 +27,7 @@
#include "unx/printergfx.hxx"
#include "unx/genpspgraphics.h"
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "unx/glyphcache.hxx"
#include "PhysicalFontFace.hxx"
#include "impfont.hxx"
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index c51d1ec..d76cdf6 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -24,8 +24,8 @@
#include "rtl/process.h"
#include "salinst.hxx"
-#include "generic/gensys.h"
-#include "generic/gendata.hxx"
+#include "unx/gensys.h"
+#include "unx/gendata.hxx"
#include "headless/svpinst.hxx"
#include "unx/desktops.hxx"
#include "vcl/printerinfomanager.hxx"
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 5a961ba..4e70454 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -52,7 +52,7 @@
#include "svids.hrc"
#include "saldatabasic.hxx"
#include "unx/genprn.h"
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "unx/genpspgraphics.h"
#include "jobset.h"
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 80f4fa4..ef6d063 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -44,7 +44,7 @@
#include <config_cairo_canvas.h>
#include "fontsubset.hxx"
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "unx/genpspgraphics.h"
#include "unx/glyphcache.hxx"
#include "unx/printergfx.hxx"
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index d88a7f9..4b496d6 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -57,7 +57,7 @@
#include "unx/i18n_status.hxx"
#include <unx/x11/xlimits.hxx>
-#include "generic/gensys.h"
+#include "unx/gensys.h"
#include "sallayout.hxx"
#include <sal/macros.h>
diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx
index 2067370..ca4cecc 100644
--- a/vcl/unx/generic/window/screensaverinhibitor.cxx
+++ b/vcl/unx/generic/window/screensaverinhibitor.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <generic/gensys.h>
+#include <unx/gensys.h>
#include <unx/screensaverinhibitor.hxx>
#include <prex.h>
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 5f0acfa..f0ce4f4 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -35,7 +35,7 @@
#include <unx/gtk/gtkframe.hxx>
#include <unx/gtk/gtksalmenu.hxx>
#include <unx/salobj.h>
-#include <generic/geninst.h>
+#include <unx/geninst.h>
#include <osl/thread.h>
#include <osl/process.h>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index d49dafa..4576f36 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -28,7 +28,7 @@
#include <unx/sm.hxx>
#include <unx/salbmp.h>
#include <unx/genprn.h>
-#include <generic/geninst.h>
+#include <unx/geninst.h>
#include <headless/svpgdi.hxx>
#include <osl/file.hxx>
#include <rtl/bootstrap.hxx>
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 35250a0..d8211eb 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -11,7 +11,7 @@
#ifdef ENABLE_GMENU_INTEGRATION
-#include <generic/gendata.hxx>
+#include <unx/gendata.hxx>
#include <unx/saldisp.hxx>
#include <unx/gtk/gtkdata.hxx>
#include <unx/gtk/glomenu.h>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 71a7b3d..c255131 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -28,7 +28,7 @@
#include <unx/sm.hxx>
#include <unx/salbmp.h>
#include <unx/genprn.h>
-#include <generic/geninst.h>
+#include <unx/geninst.h>
#include <headless/svpgdi.hxx>
#include <osl/file.hxx>
#include <rtl/bootstrap.hxx>
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 9aa4817..9515e4a 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -57,7 +57,7 @@
#undef Region
-#include "generic/geninst.h"
+#include "unx/geninst.h"
#include "svids.hrc"
More information about the Libreoffice-commits
mailing list