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/cups/cupsdconf2/editlist.cpp | 2 +- tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 2 +- tdeprint/cups/kmcupsmanager.cpp | 2 +- tdeprint/cups/kmcupsuimanager.cpp | 2 +- tdeprint/cups/kmwfax.cpp | 2 +- tdeprint/cups/kmwippprinter.cpp | 2 +- tdeprint/cups/kmwippselect.cpp | 2 +- tdeprint/cups/kmwother.cpp | 2 +- tdeprint/driverview.h | 2 +- tdeprint/droptionview.cpp | 2 +- tdeprint/kmjobmanager.cpp | 2 +- tdeprint/kpfilterpage.cpp | 2 +- tdeprint/kprintaction.cpp | 2 +- tdeprint/kprintaction.h | 2 +- tdeprint/kprintpreview.cpp | 6 +++--- tdeprint/lpr/editentrydialog.cpp | 2 +- tdeprint/lpr/kmlprmanager.cpp | 2 +- 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 +- tdeprint/rlpr/kmwrlpr.cpp | 2 +- tdeprint/tdefilelist.cpp | 2 +- tdeprint/tests/helpwindow.cpp | 2 +- tdeprint/tests/helpwindow.h | 2 +- 40 files changed, 49 insertions(+), 49 deletions(-) (limited to 'tdeprint') 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 +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #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 #include -#include +#include #include #include #include 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 +#include #include #include #include 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 +#include #include #include #include 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 #include -#include +#include #include #include diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h index 96c225ee4..7e06648fa 100644 --- a/tdeprint/driverview.h +++ b/tdeprint/driverview.h @@ -22,7 +22,7 @@ #define DRIVERVIEW_H #include -#include +#include #include #include diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp index a11ec7ee0..1ec954251 100644 --- a/tdeprint/droptionview.cpp +++ b/tdeprint/droptionview.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index db1b7c9b0..de71d4dc7 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -22,7 +22,7 @@ #include "kmthreadjob.h" #include "kmfactory.h" -#include +#include #include #include diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp index 9fabfc6d4..7f3d18807 100644 --- a/tdeprint/kpfilterpage.cpp +++ b/tdeprint/kpfilterpage.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp index 6ce7f3f79..cc94fe3c8 100644 --- a/tdeprint/kprintaction.cpp +++ b/tdeprint/kprintaction.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include class KPrintAction::KPrintActionPrivate diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h index 9916629ba..94549402f 100644 --- a/tdeprint/kprintaction.h +++ b/tdeprint/kprintaction.h @@ -20,7 +20,7 @@ #ifndef KPRINTACTION_H #define KPRINTACTION_H -#include +#include class KPrinter; diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index 6f763fe75..b1a2f50ac 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include KPreviewProc::KPreviewProc() diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp index 5d9f52bea..3977f12f8 100644 --- a/tdeprint/lpr/editentrydialog.cpp +++ b/tdeprint/lpr/editentrydialog.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index a81a24a72..157105e60 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include 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; diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp index dc12da040..79682b91a 100644 --- a/tdeprint/rlpr/kmwrlpr.cpp +++ b/tdeprint/rlpr/kmwrlpr.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp index b365c1fb6..8753d144d 100644 --- a/tdeprint/tdefilelist.cpp +++ b/tdeprint/tdefilelist.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp index aedb9e2b8..11cf22fd2 100644 --- a/tdeprint/tests/helpwindow.cpp +++ b/tdeprint/tests/helpwindow.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h index d32f2f773..2ff3d3649 100644 --- a/tdeprint/tests/helpwindow.h +++ b/tdeprint/tests/helpwindow.h @@ -11,7 +11,7 @@ #ifndef HELPWINDOW_H #define HELPWINDOW_H -#include +#include #include #include #include -- cgit v1.2.1