From 81576b133797828eaca3ac819f4adca21de8d327 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:20:36 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kpdf/core/generator_pdf/generator_pdf.cpp | 2 +-
 kpdf/part.cpp                             | 4 ++--
 kpdf/shell/shell.cpp                      | 4 ++--
 kpdf/ui/minibar.cpp                       | 2 +-
 kpdf/ui/pageview.cpp                      | 8 ++++----
 kpdf/ui/presentationwidget.cpp            | 6 +++---
 kpdf/ui/propertiesdialog.cpp              | 2 +-
 kpdf/ui/searchwidget.cpp                  | 8 ++++----
 kpdf/ui/searchwidget.h                    | 2 +-
 kpdf/ui/thumbnaillist.cpp                 | 4 ++--
 kpdf/ui/thumbnaillist.h                   | 2 +-
 kpdf/ui/toc.h                             | 2 +-
 12 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'kpdf')

diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 20bb8516..817da45c 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -17,7 +17,7 @@
 #include <tqregexp.h>
 #include <tqvariant.h>
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpassdlg.h>
 #include <tdewallet.h>
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index d0d6ba8e..2cb3aa77 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -35,7 +35,7 @@
 #include <dcopobject.h>
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdirwatch.h>
 #include <kinstance.h>
 #include <kprinter.h>
@@ -51,7 +51,7 @@
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index 14baa149..47e500ea 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -20,7 +20,7 @@
 // qt/kde includes
 #include <tqcursor.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
@@ -33,7 +33,7 @@
 #include <kmenubar.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeio/netaccess.h>
-#include <kmainwindowiface.h>
+#include <tdemainwindowiface.h>
 
 // local includes
 #include "shell.h"
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index 262b74c7..eaceeed2 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -17,7 +17,7 @@
 #include <tqvalidator.h>
 #include <tqpainter.h>
 #include <kiconloader.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdeversion.h>
 
 // local includes
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index a0ce66e7..12bfc100 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -29,10 +29,10 @@
 #include <kcursor.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kaction.h>
-#include <kstdaccel.h>
-#include <kactioncollection.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
+#include <tdeactioncollection.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
 #include <kimageeffect.h>
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 94cfdc08..f51ea189 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -14,11 +14,11 @@
 #include <tqapplication.h>
 #include <tqdesktopwidget.h>
 #include <tqtooltip.h>
-#include <kaccel.h>
-#include <kactioncollection.h>
+#include <tdeaccel.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <kcursor.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index feff5eae..79203666 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -10,7 +10,7 @@
 // qt/kde includes
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <ksqueezedtextlabel.h>
 #include <kglobalsettings.h>
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 19f77753..35f61dd3 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -11,13 +11,13 @@
 #include <tqtooltip.h>
 #include <tqapplication.h>
 #include <tqtimer.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kpopupmenu.h>
-#include <ktoolbarbutton.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbarbutton.h>
 
 // local includes
 #include "searchwidget.h"
diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h
index a6a9efb4..c84db96f 100644
--- a/kpdf/ui/searchwidget.h
+++ b/kpdf/ui/searchwidget.h
@@ -10,7 +10,7 @@
 #ifndef _KPDF_SEARCHWIDGET_H_
 #define _KPDF_SEARCHWIDGET_H_
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class TDEPopupMenu;
 class KPDFDocument;
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index 14d9d2f5..ab25704f 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -13,9 +13,9 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 // local includes
 #include "thumbnaillist.h"
diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h
index 5b1e5f94..b9fc06ae 100644
--- a/kpdf/ui/thumbnaillist.h
+++ b/kpdf/ui/thumbnaillist.h
@@ -13,7 +13,7 @@
 #include <tqscrollview.h>
 #include <tqvaluevector.h>
 #include <tqvbox.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include "core/observer.h"
 
 class TQTimer;
diff --git a/kpdf/ui/toc.h b/kpdf/ui/toc.h
index eef7dbb4..3de43502 100644
--- a/kpdf/ui/toc.h
+++ b/kpdf/ui/toc.h
@@ -11,7 +11,7 @@
 #define _KPDF_TOC_H_
 
 #include <tqdom.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include "core/document.h"
 #include "core/observer.h"
 
-- 
cgit v1.2.3