[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Chris Sherlock]

 vcl/inc/cupsmgr.hxx                            |  125 -------------------------
 vcl/inc/unx/cupsmgr.hxx                        |  125 +++++++++++++++++++++++++
 vcl/unx/generic/printer/cupsmgr.cxx            |    2 
 vcl/unx/generic/printer/ppdparser.cxx          |    4 
 vcl/unx/generic/printer/printerinfomanager.cxx |    2 
 5 files changed, 130 insertions(+), 128 deletions(-)

New commits:
commit ed65e53f749611e9acc9684e4ce4c58ef14dc81f
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Jan 25 19:10:58 2016 +1100

    vcl: cupsmgr.hxx is a private Unix-only header
    
    Change-Id: I362c9cada1769a654b6b8132e07d7f6af3e004fd

diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
similarity index 100%
rename from vcl/inc/cupsmgr.hxx
rename to vcl/inc/unx/cupsmgr.hxx
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index b46b299..3667e1a 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 
-#include "cupsmgr.hxx"
+#include "unx/cupsmgr.hxx"
 
 #include "osl/thread.h"
 #include "osl/diagnose.h"
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 823ca70..538ce82 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -25,7 +25,9 @@
 #include "vcl/helper.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/settings.hxx"
-#include "cupsmgr.hxx"
+
+#include "unx/cupsmgr.hxx"
+
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
 #include "tools/zcodec.hxx"
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 3bb9475..eb89e14 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -21,7 +21,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 
-#include "cupsmgr.hxx"
+#include "unx/cupsmgr.hxx"
 #include "vcl/strhelper.hxx"
 
 #include "unx/saldata.hxx"