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

---
 kpovmodeler/pmactions.cpp             | 4 ++--
 kpovmodeler/pmactions.h               | 2 +-
 kpovmodeler/pmdockwidget.cpp          | 6 +++---
 kpovmodeler/pmdockwidget.h            | 4 ++--
 kpovmodeler/pmglview.cpp              | 2 +-
 kpovmodeler/pminsertpopup.h           | 2 +-
 kpovmodeler/pmlibraryobjectsearch.cpp | 2 +-
 kpovmodeler/pmpart.cpp                | 2 +-
 kpovmodeler/pmpart.h                  | 2 +-
 kpovmodeler/pmshell.cpp               | 4 ++--
 kpovmodeler/pmviewlayoutmanager.cpp   | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kpovmodeler')

diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index a49c2041..31ef2aac 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 #include <tqstyle.h>
 #include <tqpainter.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include "pmdebug.h"
 
diff --git a/kpovmodeler/pmactions.h b/kpovmodeler/pmactions.h
index e5b0b4c2..7e4a4f68 100644
--- a/kpovmodeler/pmactions.h
+++ b/kpovmodeler/pmactions.h
@@ -21,7 +21,7 @@
 #define PMACTIONS_H
 
 #include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQComboBox;
 class TQSpinBox;
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 987f6a8c..a8850184 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -32,8 +32,8 @@
 #ifndef NO_KDE2
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
 #ifdef TQ_WS_X11
@@ -50,7 +50,7 @@
 
 #include <tdeparts/event.h>
 #include <tdeparts/part.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeparts/plugin.h>
 #include <kstatusbar.h>
 #include <kinstance.h>
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 04a43ef9..d4a66f4a 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -64,14 +64,14 @@
 #include <tqtabwidget.h>
 
 #ifndef NO_KDE2
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <netwm_def.h>
 #undef  EXPORT_DOCKCLASS
 #define EXPORT_DOCKCLASS
 #else
 #include <tqmainwindow.h>
 #include "exportdockclass.h"
-#include "dummykmainwindow.h"
+#include "dummytdemainwindow.h"
 #endif
 
 #include <tdeparts/part.h>
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 71e7eafa..615ff417 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -37,7 +37,7 @@
 #include <tqdom.h>
 
 #include <kxmlguifactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <klocale.h>
diff --git a/kpovmodeler/pminsertpopup.h b/kpovmodeler/pminsertpopup.h
index 6f55803f..b9242611 100644
--- a/kpovmodeler/pminsertpopup.h
+++ b/kpovmodeler/pminsertpopup.h
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 /**
  * Popup menu. Ask the user where to insert new objects
diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp
index fe7b4fd4..c8a48601 100644
--- a/kpovmodeler/pmlibraryobjectsearch.cpp
+++ b/kpovmodeler/pmlibraryobjectsearch.cpp
@@ -32,7 +32,7 @@
 #include <kurl.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) :
    TQWidget( parent, "" )
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index 011a86af..11e8b0a3 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <tdeio/netaccess.h>
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index 4758d51c..f6435872 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kurl.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 86dea89b..f2faceed 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
@@ -26,7 +26,7 @@
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kaboutdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqtimer.h>
 
 #include "pmshell.h"
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index f8e1c968..6522f6da 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kfilterdev.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include <tqfile.h>
-- 
cgit v1.2.3