summaryrefslogtreecommitdiffstats
path: root/tdeprint/cups
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdeprint/cups
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint/cups')
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp2
-rw-r--r--tdeprint/cups/kmcupsuimanager.cpp2
-rw-r--r--tdeprint/cups/kmwfax.cpp2
-rw-r--r--tdeprint/cups/kmwippprinter.cpp2
-rw-r--r--tdeprint/cups/kmwippselect.cpp2
-rw-r--r--tdeprint/cups/kmwother.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index fbdafbdb9..3e3fa80e2 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -19,7 +19,7 @@
#include "editlist.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kpushbutton.h>
#include <tqlayout.h>
#include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index cec6f383b..628e8d40c 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <tqheader.h>
#include <tqpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index fecac0169..99fff556a 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -48,7 +48,7 @@
#include <tdesocketbase.h>
#include <klibloader.h>
#include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdialogbase.h>
#include <kextendedsocket.h>
#include <kprocess.h>
diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp
index d0dfe3cdc..60e683b84 100644
--- a/tdeprint/cups/kmcupsuimanager.cpp
+++ b/tdeprint/cups/kmcupsuimanager.cpp
@@ -57,7 +57,7 @@
#include <tqwhatsthis.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kmessagebox.h>
#include "config.h"
diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp
index 610217da1..05b1b2cfa 100644
--- a/tdeprint/cups/kmwfax.cpp
+++ b/tdeprint/cups/kmwfax.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kurl.h>
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index 1a4cf4d94..e80478f61 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -24,7 +24,7 @@
#include "kmcupsmanager.h"
#include "networkscanner.h"
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqheader.h>
#include <kpushbutton.h>
#include <tqlineedit.h>
diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp
index c889edbf9..c3f48ad27 100644
--- a/tdeprint/cups/kmwippselect.cpp
+++ b/tdeprint/cups/kmwippselect.cpp
@@ -23,7 +23,7 @@
#include "cupsinfos.h"
#include "ipprequest.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <tqlayout.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 7e86cbfb6..4e640d536 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -30,7 +30,7 @@
#include <tqdict.h>
#include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kiconloader.h>
#include <kdebug.h>