summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/vcl/jobdata.hxx (renamed from vcl/inc/unx/jobdata.hxx)0
-rw-r--r--include/vcl/printerinfomanager.hxx (renamed from vcl/inc/unx/printerinfomanager.hxx)2
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx4
-rw-r--r--vcl/headless/svpprn.cxx2
-rw-r--r--vcl/inc/headless/svpprn.hxx2
-rw-r--r--vcl/inc/unx/cupsmgr.hxx2
-rw-r--r--vcl/inc/unx/genprn.h2
-rw-r--r--vcl/inc/unx/printerjob.hxx2
-rw-r--r--vcl/null/printerinfomanager.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx2
-rw-r--r--vcl/unx/generic/plugadapt/salplug.cxx2
-rw-r--r--vcl/unx/generic/print/common_gfx.cxx2
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx2
-rw-r--r--vcl/unx/generic/print/genpspgraphics.cxx4
-rw-r--r--vcl/unx/generic/print/printerjob.cxx2
-rw-r--r--vcl/unx/generic/print/prtsetup.hxx2
-rw-r--r--vcl/unx/generic/printer/jobdata.cxx4
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
18 files changed, 18 insertions, 22 deletions
diff --git a/vcl/inc/unx/jobdata.hxx b/include/vcl/jobdata.hxx
index 13b34de93320..13b34de93320 100644
--- a/vcl/inc/unx/jobdata.hxx
+++ b/include/vcl/jobdata.hxx
diff --git a/vcl/inc/unx/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 8e4b493e8daa..f548bf239e91 100644
--- a/vcl/inc/unx/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -25,7 +25,7 @@
#include <vcl/dllapi.h>
#include <vcl/helper.hxx>
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
#include <osl/file.hxx>
#include <cstdio>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2651704424a9..75fa402bda24 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -137,10 +137,6 @@
#include <IDocumentState.hxx>
#include <memory>
-#include <config_cups.h>
-#if ENABLE_CUPS && !defined(MACOSX)
-#include "unx/printerinfomanager.hxx"
-#endif
#include <comphelper/propertysequence.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 3cc36244e487..1d8557f6fc24 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -19,7 +19,7 @@
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include "jobset.h"
#include "print.h"
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index b23aec9b07fc..1c6d05d2069d 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
#define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
#include "unx/printergfx.hxx"
#include "unx/printerjob.hxx"
#include "unx/genprn.h"
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 52c8a8a67b3f..576afd4fe3cc 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
#define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include "osl/module.h"
#include "osl/thread.h"
#include "osl/mutex.hxx"
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index c1f299016193..94a4046a08a0 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H
#define INCLUDED_VCL_INC_GENERIC_GENPRN_H
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
#include "unx/printergfx.hxx"
#include "unx/printerjob.hxx"
#include "salprn.hxx"
diff --git a/vcl/inc/unx/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
index 3bb214bccf60..8f283cdaff1d 100644
--- a/vcl/inc/unx/printerjob.hxx
+++ b/vcl/inc/unx/printerjob.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
#define INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
#include "osl/file.hxx"
#include "rtl/string.hxx"
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 4be5efb5e5f6..e79701e0cdbb 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include "unx/gendata.hxx"
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 3bc93f3b0c84..b470eff7052a 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -41,7 +41,7 @@
#include "basegfx/polygon/b2dpolypolygoncutter.hxx"
#include "basegfx/polygon/b2dtrapezoid.hxx"
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
#include <vcl/virdev.hxx>
#include "unx/salunx.h"
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index adb46eb501da..6852c0652024 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -28,7 +28,7 @@
#include "unx/gendata.hxx"
#include "headless/svpinst.hxx"
#include "unx/desktops.hxx"
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include <config_vclplug.h>
#include <cstdio>
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 5a8df567ff5f..e8cfadafce76 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -28,7 +28,7 @@
#include "unx/printerjob.hxx"
#include "unx/fontmanager.hxx"
#include <vcl/strhelper.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include "tools/debug.hxx"
#include "tools/color.hxx"
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 7deff32e84ea..45e3e16fa40e 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -47,7 +47,7 @@
#include <vcl/svapp.hxx>
#include <vcl/print.hxx>
#include <vcl/pdfwriter.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include <vcl/settings.hxx>
#include "svids.hrc"
#include "saldatabasic.hxx"
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index e1022a68e128..85b6f17cfe3b 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -35,8 +35,8 @@
#include <comphelper/string.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <vcl/bitmapaccess.hxx>
-#include "unx/jobdata.hxx"
-#include "unx/printerinfomanager.hxx"
+#include <vcl/jobdata.hxx>
+#include <vcl/printerinfomanager.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index 1e37dfc806be..9266c820a584 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -30,7 +30,7 @@
#include "unx/printergfx.hxx"
#include <vcl/ppdparser.hxx>
#include <vcl/strhelper.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include "rtl/ustring.hxx"
#include "rtl/strbuf.hxx"
diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx
index 2bbc513c276a..3d02468658d7 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -32,7 +32,7 @@
#include <vcl/field.hxx>
#include <vcl/combobox.hxx>
#include <vcl/ppdparser.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
class RTSPaperPage;
class RTSDevicePage;
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index b4e3e1a03481..aead34c96eb1 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -18,8 +18,8 @@
*/
#include <officecfg/Office/Common.hxx>
-#include "unx/jobdata.hxx"
-#include "unx/printerinfomanager.hxx"
+#include <vcl/jobdata.hxx>
+#include <vcl/printerinfomanager.hxx>
#include "tools/stream.hxx"
#include <rtl/strbuf.hxx>
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 046cc89a4552..a8e0cabf7bba 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -31,7 +31,7 @@
#include <vcl/svapp.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
#include <vcl/settings.hxx>
#include <vcl/bitmapaccess.hxx>
#include <vcl/opengl/OpenGLContext.hxx>