From d1e0cc99a202cef3306b90b8839a6726e89f201e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:04 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- tdeprint/management/cjanuswidget.cpp | 2 +- tdeprint/management/kiconselectaction.cpp | 4 ++-- tdeprint/management/kiconselectaction.h | 2 +- tdeprint/management/kmconfigfilter.cpp | 2 +- tdeprint/management/kmconfigfonts.cpp | 2 +- tdeprint/management/kmdriverdbwidget.cpp | 2 +- tdeprint/management/kminstancepage.cpp | 2 +- tdeprint/management/kmjobviewer.cpp | 6 +++--- tdeprint/management/kmjobviewer.h | 2 +- tdeprint/management/kmmainview.cpp | 8 ++++---- tdeprint/management/kmmainview.h | 2 +- tdeprint/management/kmprinterview.cpp | 2 +- tdeprint/management/kmwclass.cpp | 2 +- tdeprint/management/kmwdriverselect.cpp | 2 +- tdeprint/management/kmwlocal.cpp | 2 +- tdeprint/management/kmwsocket.cpp | 2 +- tdeprint/management/kxmlcommanddlg.cpp | 4 ++-- tdeprint/management/pluginaction.h | 2 +- tdeprint/management/smbview.h | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) (limited to 'tdeprint/management') diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp index 1642fb5c6..5bddffe02 100644 --- a/tdeprint/management/cjanuswidget.cpp +++ b/tdeprint/management/cjanuswidget.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp index f5df42299..230119d27 100644 --- a/tdeprint/management/kiconselectaction.cpp +++ b/tdeprint/management/kiconselectaction.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include class KIconSelectActionPrivate { diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h index 917dc742b..289e1cf20 100644 --- a/tdeprint/management/kiconselectaction.h +++ b/tdeprint/management/kiconselectaction.h @@ -20,7 +20,7 @@ #ifndef KICONSELECTACTION_H #define KICONSELECTACTION_H -#include +#include class KIconSelectActionPrivate; diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index 637f06ecc..21cbc418e 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index cd681db3d..54ebdb87c 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index ee442113a..42d573e71 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -23,7 +23,7 @@ #include "kmmanager.h" #include "driver.h" -#include +#include #include #include #include diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 2d73c6ecd..8c263bb48 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 0af246f80..9d5c498c0 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -30,13 +30,13 @@ #include "kmconfigpage.h" #include "kprinter.h" -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h index 534958656..7a4530f3c 100644 --- a/tdeprint/management/kmjobviewer.h +++ b/tdeprint/management/kmjobviewer.h @@ -24,7 +24,7 @@ #warning internal header, do not use except if you are a TDEPrint developer #endif -#include +#include #include "kmprinterpage.h" #include "kpreloadobject.h" diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index 9673d214f..fbff73671 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -43,13 +43,13 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h index 54cdffbc2..132bba062 100644 --- a/tdeprint/management/kmmainview.h +++ b/tdeprint/management/kmmainview.h @@ -26,7 +26,7 @@ #include #include -#include +#include class KMManager; class KMPrinterView; diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index 59911ff34..6d7edb707 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/management/kmprinterview.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp index cadddf5d0..aee060e5f 100644 --- a/tdeprint/management/kmwclass.cpp +++ b/tdeprint/management/kmwclass.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index 94bf7d02e..f60dcface 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp index 624e87a44..ea79563ec 100644 --- a/tdeprint/management/kmwlocal.cpp +++ b/tdeprint/management/kmwlocal.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp index 71a70f2e9..6b8f4aae9 100644 --- a/tdeprint/management/kmwsocket.cpp +++ b/tdeprint/management/kmwsocket.cpp @@ -22,7 +22,7 @@ #include "kmwizard.h" #include "kmprinter.h" -#include +#include #include #include #include diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index df256f082..5019b92b3 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -37,12 +37,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h index 1d77b71b7..0f87460fd 100644 --- a/tdeprint/management/pluginaction.h +++ b/tdeprint/management/pluginaction.h @@ -20,7 +20,7 @@ #ifndef PLUGINACTION_H #define PLUGINACTION_H -#include +#include class TDEPRINT_EXPORT PluginAction : public TDEAction { diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index 2226fd705..51193254e 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -20,7 +20,7 @@ #ifndef SMBVIEW_H #define SMBVIEW_H -#include +#include class TDEProcess; class KTempFile; -- cgit v1.2.1