summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vcl/Library_vclplug_gtk3.mk14
-rw-r--r--vcl/Library_vclplug_svp.mk20
-rw-r--r--vcl/Module_vcl.mk4
-rw-r--r--vcl/README6
-rw-r--r--vcl/headless/svpbmp.cxx (renamed from vcl/unx/headless/svpbmp.cxx)2
-rw-r--r--vcl/headless/svpdummies.cxx (renamed from vcl/unx/headless/svpdummies.cxx)4
-rw-r--r--vcl/headless/svpelement.cxx (renamed from vcl/unx/headless/svpelement.cxx)8
-rw-r--r--vcl/headless/svpframe.cxx (renamed from vcl/unx/headless/svpframe.cxx)6
-rw-r--r--vcl/headless/svpgdi.cxx (renamed from vcl/unx/headless/svpgdi.cxx)6
-rw-r--r--vcl/headless/svpinst.cxx (renamed from vcl/unx/headless/svpinst.cxx)10
-rw-r--r--vcl/headless/svpprn.cxx (renamed from vcl/unx/headless/svpprn.cxx)6
-rw-r--r--vcl/headless/svppspgraphics.cxx (renamed from vcl/unx/headless/svppspgraphics.cxx)4
-rw-r--r--vcl/headless/svptext.cxx (renamed from vcl/unx/headless/svptext.cxx)6
-rw-r--r--vcl/headless/svpvd.cxx (renamed from vcl/unx/headless/svpvd.cxx)4
-rw-r--r--vcl/inc/headless/svpbmp.hxx (renamed from vcl/inc/unx/headless/svpbmp.hxx)0
-rw-r--r--vcl/inc/headless/svpdummies.hxx (renamed from vcl/inc/unx/headless/svpdummies.hxx)0
-rw-r--r--vcl/inc/headless/svpelement.hxx (renamed from vcl/inc/unx/headless/svpelement.hxx)0
-rw-r--r--vcl/inc/headless/svpframe.hxx (renamed from vcl/inc/unx/headless/svpframe.hxx)0
-rw-r--r--vcl/inc/headless/svpgdi.hxx (renamed from vcl/inc/unx/headless/svpgdi.hxx)0
-rw-r--r--vcl/inc/headless/svpinst.hxx (renamed from vcl/inc/unx/headless/svpinst.hxx)0
-rw-r--r--vcl/inc/headless/svpprn.hxx (renamed from vcl/inc/unx/headless/svpprn.hxx)0
-rw-r--r--vcl/inc/headless/svppspgraphics.hxx (renamed from vcl/inc/unx/headless/svppspgraphics.hxx)0
-rw-r--r--vcl/inc/headless/svpvd.hxx (renamed from vcl/inc/unx/headless/svpvd.hxx)0
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx2
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx4
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx2
27 files changed, 54 insertions, 56 deletions
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index d3aa016314ce..a88e4262112e 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -116,13 +116,13 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
vcl/unx/gtk3/window/gtk3gtkframe \
vcl/unx/gtk3/window/gtk3gtkobject \
- vcl/unx/headless/svpbmp \
- vcl/unx/headless/svpdummies \
- vcl/unx/headless/svpelement \
- vcl/unx/headless/svpframe \
- vcl/unx/headless/svpprn \
- vcl/unx/headless/svptext \
- vcl/unx/headless/svpvd \
+ vcl/headless/svpbmp \
+ vcl/headless/svpdummies \
+ vcl/headless/svpelement \
+ vcl/headless/svpframe \
+ vcl/headless/svpprn \
+ vcl/headless/svptext \
+ vcl/headless/svpvd \
))
ifeq ($(OS),LINUX)
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index da2a83781a56..6ab205139c30 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -78,16 +78,16 @@ $(eval $(call gb_Library_use_externals,vclplug_svp,\
))
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
- vcl/unx/headless/svpbmp \
- vcl/unx/headless/svpdummies \
- vcl/unx/headless/svpelement \
- vcl/unx/headless/svpframe \
- vcl/unx/headless/svpgdi \
- vcl/unx/headless/svpinst \
- vcl/unx/headless/svpprn \
- vcl/unx/headless/svppspgraphics \
- vcl/unx/headless/svptext \
- vcl/unx/headless/svpvd \
+ vcl/headless/svpbmp \
+ vcl/headless/svpdummies \
+ vcl/headless/svpelement \
+ vcl/headless/svpframe \
+ vcl/headless/svpgdi \
+ vcl/headless/svpinst \
+ vcl/headless/svpprn \
+ vcl/headless/svppspgraphics \
+ vcl/headless/svptext \
+ vcl/headless/svpvd \
))
ifeq ($(OS),LINUX)
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 224a68a6c95b..998598791385 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -31,17 +31,17 @@ $(eval $(call gb_Module_Module,vcl))
$(eval $(call gb_Module_add_targets,vcl,\
Library_vcl \
+ Library_vclplug_svp \
StaticLibrary_vclmain \
Package_inc \
+ Package_afmhash \
AllLangResTarget_vcl \
))
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_gen \
- Library_vclplug_svp \
Library_desktop_detector \
- Package_afmhash \
))
ifneq ($(ENABLE_GTK),)
diff --git a/vcl/README b/vcl/README
index c752457d5247..9e9507c9c8fd 100644
--- a/vcl/README
+++ b/vcl/README
@@ -1,18 +1,16 @@
Welcome to the Visual Class Libraries (vcl) code
-
source/
+ the main cross-platform chunk of source
-
inc/
+ cross-platform abstraction headers / definition
vcl/
+ external headers
-
generic/
+ shared helper code for backends,
actually built into vcl
-
+headless/
+ + a backend renderer that draws to bitmaps
aqua/
+ OS/X backend
ios/
diff --git a/vcl/unx/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index eccdd2bb97b3..f385682afada 100644
--- a/vcl/unx/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include "unx/headless/svpbmp.hxx"
+#include "headless/svpbmp.hxx"
#include <basegfx/vector/b2ivector.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/vcl/unx/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 326ad814651f..272f06c7030a 100644
--- a/vcl/unx/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#include "unx/headless/svpdummies.hxx"
-#include "unx/headless/svpinst.hxx"
+#include "headless/svpdummies.hxx"
+#include "headless/svpinst.hxx"
#include <rtl/ustrbuf.hxx>
// SalObject
diff --git a/vcl/unx/headless/svpelement.cxx b/vcl/headless/svpelement.cxx
index 785f3377e9af..fb0447224773 100644
--- a/vcl/unx/headless/svpelement.cxx
+++ b/vcl/headless/svpelement.cxx
@@ -26,7 +26,7 @@
*
************************************************************************/
-#include "unx/headless/svpelement.hxx"
+#include "headless/svpelement.hxx"
#include <basebmp/scanlineformats.hxx>
#include <tools/debug.hxx>
@@ -39,9 +39,9 @@
#include <vcl/bitmap.hxx>
#include <tools/stream.hxx>
-#include "unx/headless/svpvd.hxx"
-#include "unx/headless/svpbmp.hxx"
-#include "unx/headless/svpframe.hxx"
+#include "headless/svpvd.hxx"
+#include "headless/svpbmp.hxx"
+#include "headless/svpframe.hxx"
#include <list>
#include <boost/unordered_map.hpp>
diff --git a/vcl/unx/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index bd15389cb1c0..8ff0e5ecf377 100644
--- a/vcl/unx/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -26,9 +26,9 @@
*
************************************************************************/
-#include "unx/headless/svpframe.hxx"
-#include "unx/headless/svpinst.hxx"
-#include "unx/headless/svpgdi.hxx"
+#include "headless/svpframe.hxx"
+#include "headless/svpinst.hxx"
+#include "headless/svpgdi.hxx"
#include <basebmp/scanlineformats.hxx>
#include <basegfx/vector/b2ivector.hxx>
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index b5197b6ad38c..c415774d1bb5 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#include "unx/headless/svpgdi.hxx"
-#include "unx/headless/svpbmp.hxx"
+#include "headless/svpgdi.hxx"
+#include "headless/svpbmp.hxx"
#include <vcl/sysdata.hxx>
#include <basegfx/range/b2drange.hxx>
@@ -46,7 +46,7 @@
#include <sys/stat.h>
#endif
-#include "unx/headless/svppspgraphics.hxx"
+#include "headless/svppspgraphics.hxx"
#include <region.h>
using namespace basegfx;
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 24b10e56f7b0..182cf867529e 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -35,11 +35,11 @@
#include <vcl/apptypes.hxx>
-#include "unx/headless/svpinst.hxx"
-#include "unx/headless/svpframe.hxx"
-#include "unx/headless/svpdummies.hxx"
-#include "unx/headless/svpvd.hxx"
-#include "unx/headless/svpbmp.hxx"
+#include "headless/svpinst.hxx"
+#include "headless/svpframe.hxx"
+#include "headless/svpdummies.hxx"
+#include "headless/svpvd.hxx"
+#include "headless/svpbmp.hxx"
#include <salframe.hxx>
#include <svdata.hxx>
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 5fe71e052082..452f8ab2f940 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -42,9 +42,9 @@
#include "salptype.hxx"
#include "saldatabasic.hxx"
-#include "unx/headless/svpprn.hxx"
-#include "unx/headless/svppspgraphics.hxx"
-#include "unx/headless/svpinst.hxx"
+#include "headless/svpprn.hxx"
+#include "headless/svppspgraphics.hxx"
+#include "headless/svpinst.hxx"
using namespace psp;
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/headless/svppspgraphics.cxx
index cff75c3751c0..5a792538948b 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/headless/svppspgraphics.cxx
@@ -53,8 +53,8 @@
#include "outfont.hxx"
#include "fontsubset.hxx"
#include "generic/printergfx.hxx"
-#include "unx/headless/svppspgraphics.hxx"
-#include "unx/headless/svpbmp.hxx"
+#include "headless/svppspgraphics.hxx"
+#include "headless/svpbmp.hxx"
#include "generic/glyphcache.hxx"
#include "region.h"
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 9aa0eeb7f2c6..64367063fa9b 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -43,9 +43,9 @@
#include <rtl/instance.hxx>
#include "generic/glyphcache.hxx"
-#include "unx/headless/svpgdi.hxx"
-#include "unx/headless/svpbmp.hxx"
-#include "unx/headless/svppspgraphics.hxx"
+#include "headless/svpgdi.hxx"
+#include "headless/svpbmp.hxx"
+#include "headless/svppspgraphics.hxx"
using namespace basegfx;
using namespace basebmp;
diff --git a/vcl/unx/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index c1de04b8d865..8b90d648d5d5 100644
--- a/vcl/unx/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -26,8 +26,8 @@
*
************************************************************************/
-#include "unx/headless/svpvd.hxx"
-#include "unx/headless/svpgdi.hxx"
+#include "headless/svpvd.hxx"
+#include "headless/svpgdi.hxx"
#include <basegfx/vector/b2ivector.hxx>
#include <basebmp/scanlineformats.hxx>
diff --git a/vcl/inc/unx/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index b3adb3b9951f..b3adb3b9951f 100644
--- a/vcl/inc/unx/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
diff --git a/vcl/inc/unx/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index bc46e9b22f70..bc46e9b22f70 100644
--- a/vcl/inc/unx/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
diff --git a/vcl/inc/unx/headless/svpelement.hxx b/vcl/inc/headless/svpelement.hxx
index c7f647cf3a03..c7f647cf3a03 100644
--- a/vcl/inc/unx/headless/svpelement.hxx
+++ b/vcl/inc/headless/svpelement.hxx
diff --git a/vcl/inc/unx/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index e57381780f61..e57381780f61 100644
--- a/vcl/inc/unx/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
diff --git a/vcl/inc/unx/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 007c4b55ddee..007c4b55ddee 100644
--- a/vcl/inc/unx/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
diff --git a/vcl/inc/unx/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 34a9c7f8ba2e..34a9c7f8ba2e 100644
--- a/vcl/inc/unx/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
diff --git a/vcl/inc/unx/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index 67861f6e6cb5..67861f6e6cb5 100644
--- a/vcl/inc/unx/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
diff --git a/vcl/inc/unx/headless/svppspgraphics.hxx b/vcl/inc/headless/svppspgraphics.hxx
index 1ce9109918d5..1ce9109918d5 100644
--- a/vcl/inc/unx/headless/svppspgraphics.hxx
+++ b/vcl/inc/headless/svppspgraphics.hxx
diff --git a/vcl/inc/unx/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 211cf36846f9..211cf36846f9 100644
--- a/vcl/inc/unx/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 5074d166c731..1fd2e5e80632 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -39,7 +39,7 @@
#if GTK_CHECK_VERSION(3,0,0)
-#include <unx/headless/svpgdi.hxx>
+#include <headless/svpgdi.hxx>
class GtkSalFrame;
class GtkSalGraphics : public SvpSalGraphics
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index b8a80adbd31a..e6e0076e6d77 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -31,7 +31,7 @@
#include <unx/salinst.h>
#include <generic/gensys.h>
-#include <unx/headless/svpinst.hxx>
+#include <headless/svpinst.hxx>
#include <gtk/gtk.h>
class GtkYieldMutex : public SalYieldMutex
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index af660830a10b..223dc424ce7c 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -36,8 +36,8 @@
#include <unx/gtk/gtkframe.hxx>
#include <unx/gtk/gtkobject.hxx>
#include <unx/gtk/atkbridge.hxx>
-#include <unx/headless/svpvd.hxx>
-#include <unx/headless/svpbmp.hxx>
+#include <headless/svpvd.hxx>
+#include <headless/svpbmp.hxx>
#include <rtl/strbuf.hxx>
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4cb441b667e5..830822a2fc93 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -39,7 +39,7 @@
#include <unx/salbmp.h>
#include <generic/genprn.h>
#include <generic/geninst.h>
-#include <unx/headless/svpgdi.hxx>
+#include <headless/svpgdi.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
generated by cgit (git 2.34.1) at 2024-06-07 15:25:34 +0000