summaryrefslogtreecommitdiffstats
path: root/kviewshell
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
commit958d14ea303abe33fce2c259c1000f18171e4229 (patch)
tree61bc8236ab3aa4bc27ca205740322f8df50baff1 /kviewshell
parentb2de6514213d205907e8de3dd17f8eb80d868a4f (diff)
downloadtdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz
tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kviewshell')
-rw-r--r--kviewshell/documentWidget.cpp4
-rw-r--r--kviewshell/empty_multipage.cpp4
-rw-r--r--kviewshell/kprintDialogPage_pageoptions.cpp2
-rw-r--r--kviewshell/kviewpart.cpp8
-rw-r--r--kviewshell/kviewshell.cpp6
-rw-r--r--kviewshell/main.cpp2
-rw-r--r--kviewshell/martdelist.cpp4
-rw-r--r--kviewshell/pageSize.cpp4
-rw-r--r--kviewshell/pageSizeDialog.cpp4
-rw-r--r--kviewshell/pageSizeWidget.cpp2
-rw-r--r--kviewshell/plugins/djvu/djvumultipage.cpp4
-rw-r--r--kviewshell/plugins/djvu/djvurenderer.cpp4
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp2
-rw-r--r--kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp2
-rw-r--r--kviewshell/searchWidget.cpp4
-rw-r--r--kviewshell/tableOfContents.cpp2
-rw-r--r--kviewshell/tdemultipage.cpp4
-rw-r--r--kviewshell/units.cpp4
-rw-r--r--kviewshell/zoom.cpp2
19 files changed, 34 insertions, 34 deletions
diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index 509bab71..619135df 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -14,9 +14,9 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqclipboard.h>
#include <tqcursor.h>
#include <tqimage.h>
diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp
index 83ba49d9..26d55611 100644
--- a/kviewshell/empty_multipage.cpp
+++ b/kviewshell/empty_multipage.cpp
@@ -19,8 +19,8 @@
#include <config.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "empty_multipage.h"
diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp
index 1086b83f..f3577ab1 100644
--- a/kviewshell/kprintDialogPage_pageoptions.cpp
+++ b/kviewshell/kprintDialogPage_pageoptions.cpp
@@ -9,7 +9,7 @@
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 1b028c81..cc8f8b2f 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -19,12 +19,12 @@
#include <tdefiledialog.h>
#include <kfilterbase.h>
#include <kfilterdev.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/genericfactory.h>
@@ -32,7 +32,7 @@
#include <kprogress.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <ktrader.h>
#include <kinputdialog.h>
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index 855019e9..1a29eb71 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -18,9 +18,9 @@
#include <tdeaction.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdemenubar.h>
#include <klibloader.h>
#include <kstdaction.h>
#include <kedittoolbar.h>
diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp
index aa6dd7be..b2c1ba47 100644
--- a/kviewshell/main.cpp
+++ b/kviewshell/main.cpp
@@ -7,7 +7,7 @@
#include <kdebug.h>
#include <kmimetype.h>
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tqdir.h>
diff --git a/kviewshell/martdelist.cpp b/kviewshell/martdelist.cpp
index 7adb4a23..acc94311 100644
--- a/kviewshell/martdelist.cpp
+++ b/kviewshell/martdelist.cpp
@@ -30,8 +30,8 @@
#include <tqtimer.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp
index 9e59da04..6a94aeed 100644
--- a/kviewshell/pageSize.cpp
+++ b/kviewshell/pageSize.cpp
@@ -10,8 +10,8 @@
#include <config.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <math.h>
#include <tqstringlist.h>
diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp
index 02cc9c04..aaede928 100644
--- a/kviewshell/pageSizeDialog.cpp
+++ b/kviewshell/pageSizeDialog.cpp
@@ -11,8 +11,8 @@
#include <tdeapplication.h>
#include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqlineedit.h>
diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp
index 9f2503d2..52e52237 100644
--- a/kviewshell/pageSizeWidget.cpp
+++ b/kviewshell/pageSizeWidget.cpp
@@ -11,7 +11,7 @@
#include <kcombobox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include <tqvalidator.h>
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index ad044d20..ae1ab9f6 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -26,7 +26,7 @@
#include <tdefiledialog.h>
#include <tdeparts/genericfactory.h>
#include <kprinter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "kvsprefs.h"
#include <tqapplication.h>
#include <tqpaintdevicemetrics.h>
@@ -41,7 +41,7 @@
#include "pageRangeWidget.h"
#include "prefs.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
typedef KParts::GenericFactory<DjVuMultiPage> DjVuMultiPageFactory;
K_EXPORT_COMPONENT_FACTORY(djvuviewpart, DjVuMultiPageFactory)
diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp
index ae0b0454..c9e52c1e 100644
--- a/kviewshell/plugins/djvu/djvurenderer.cpp
+++ b/kviewshell/plugins/djvu/djvurenderer.cpp
@@ -21,9 +21,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfileinfo.h>
#include <tqimage.h>
#include <tqpainter.h>
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
index 24b7dfbb..325effeb 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
index cb932048..c192b7ff 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp
index b6a4d95d..4387b070 100644
--- a/kviewshell/searchWidget.cpp
+++ b/kviewshell/searchWidget.cpp
@@ -29,8 +29,8 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <klineedit.h>
diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp
index e2ae9a02..82862d14 100644
--- a/kviewshell/tableOfContents.cpp
+++ b/kviewshell/tableOfContents.cpp
@@ -20,7 +20,7 @@
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "tableOfContents.h"
diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index 07e433d4..063b8f2d 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -6,8 +6,8 @@
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
#include <kstdaction.h>
#include <tqobject.h>
diff --git a/kviewshell/units.cpp b/kviewshell/units.cpp
index 99dc2da9..bfc8b3b6 100644
--- a/kviewshell/units.cpp
+++ b/kviewshell/units.cpp
@@ -10,8 +10,8 @@
#include <config.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <math.h>
#include <tqstringlist.h>
diff --git a/kviewshell/zoom.cpp b/kviewshell/zoom.cpp
index 1c3ee6f6..0268f80f 100644
--- a/kviewshell/zoom.cpp
+++ b/kviewshell/zoom.cpp
@@ -12,7 +12,7 @@
#include <math.h>
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "zoom.h"
#include "zoomlimits.h"