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

---
 lib/interfaces/kdevmainwindow.cpp       | 2 +-
 lib/interfaces/kdevplugin.cpp           | 2 +-
 lib/util/tdescriptactionmanager.cpp     | 2 +-
 lib/widgets/CMakeLists.txt              | 4 ++--
 lib/widgets/Makefile.am                 | 4 ++--
 lib/widgets/fancylistviewitem.h         | 2 +-
 lib/widgets/kcomboview.cpp              | 2 +-
 lib/widgets/kdevhtmlpart.cpp            | 6 +++---
 lib/widgets/ksavealldialog.cpp          | 4 ++--
 lib/widgets/processwidget.h             | 2 +-
 lib/widgets/propeditor/pfontbutton.cpp  | 2 +-
 lib/widgets/propeditor/pfontcombo.cpp   | 2 +-
 lib/widgets/propeditor/propertyeditor.h | 2 +-
 lib/widgets/tdelistviewaction.cpp       | 2 +-
 lib/widgets/tdelistviewaction.h         | 4 ++--
 15 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/interfaces/kdevmainwindow.cpp b/lib/interfaces/kdevmainwindow.cpp
index 92a92989..39fc4c10 100644
--- a/lib/interfaces/kdevmainwindow.cpp
+++ b/lib/interfaces/kdevmainwindow.cpp
@@ -19,7 +19,7 @@
 */
 #include "kdevmainwindow.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstatusbar.h>
 
 KStatusBar *KDevMainWindow::statusBar()
diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp
index bca67f52..b7bf4f6c 100644
--- a/lib/interfaces/kdevplugin.cpp
+++ b/lib/interfaces/kdevplugin.cpp
@@ -32,7 +32,7 @@
 #include "kdevpartcontroller.h"
 #include "kdevplugincontroller.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 
diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index a74841e5..50bd159a 100644
--- a/lib/util/tdescriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -28,7 +28,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <scriptinterface.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqfileinfo.h>
 #include <tqtimer.h>
 
diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
index d9003dbd..30e0ba3e 100644
--- a/lib/widgets/CMakeLists.txt
+++ b/lib/widgets/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    klistviewaction.h qcomboview.h flagboxes.h
+    tdelistviewaction.h qcomboview.h flagboxes.h
     ksavealldialog.h resizablecombo.h kcomboview.h
     kdevhtmlpart.h processlinemaker.h processwidget.h
     fancylistviewitem.h
@@ -42,7 +42,7 @@ install( FILES kdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop )
 
 tde_add_library( kdevwidgets SHARED AUTOMOC
   SOURCES
-    flagboxes.cpp qcomboview.cpp klistviewaction.cpp
+    flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp
     kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp
     processlinemaker.cpp processwidget.cpp ksavealldialog.cpp
     fancylistviewitem.cpp
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 7d65a18f..69be7a11 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -6,12 +6,12 @@ lib_LTLIBRARIES = libkdevwidgets.la
 
 kdevwidgetsincludedir = $(includedir)/tdevelop/widgets
 
-libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp klistviewaction.cpp \
+libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \
 	kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp \
 	processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp
 
 
-kdevwidgetsinclude_HEADERS = klistviewaction.h qcomboview.h flagboxes.h \
+kdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \
 	ksavealldialog.h resizablecombo.h kcomboview.h kdevhtmlpart.h processlinemaker.h \
 	processwidget.h fancylistviewitem.h 
 	
diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h
index 24b17d0a..e8eb4596 100644
--- a/lib/widgets/fancylistviewitem.h
+++ b/lib/widgets/fancylistviewitem.h
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqfont.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TextPaintStyleStore {
     public:
diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp
index a18dc93c..90ea79ca 100644
--- a/lib/widgets/kcomboview.cpp
+++ b/lib/widgets/kcomboview.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcompletionbox.h>
 #include <tqheader.h>
 #include <tqmap.h>
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index e92927ae..494764fe 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -3,13 +3,13 @@
 #include <tqapplication.h>
 
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdehtmlview.h>
 #include <tdehtml_settings.h>
 #include <tdeconfig.h>
diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp
index 46736be2..e82788de 100644
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@@ -23,8 +23,8 @@
 
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kstdguiitem.h>
 
 #include "ksavealldialog.h"
diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h
index 0ee5b3e6..eaffbfc4 100644
--- a/lib/widgets/processwidget.h
+++ b/lib/widgets/processwidget.h
@@ -20,7 +20,7 @@
 #ifndef _PROCESSWIDGET_H_
 #define _PROCESSWIDGET_H_
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kprocess.h>
 
 /**
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index fda1322b..de850890 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqpushbutton.h>
 
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 
 #ifndef PURE_QT
 #include <klocale.h>
diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp
index 0675a6e0..cb8a80b2 100644
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@@ -20,7 +20,7 @@
 #include "pfontcombo.h"
 
 #ifndef PURE_QT
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #else
 #include <tqcombobox.h>
 #endif
diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h
index 3e683a58..852d795a 100644
--- a/lib/widgets/propeditor/propertyeditor.h
+++ b/lib/widgets/propeditor/propertyeditor.h
@@ -21,7 +21,7 @@
 #define PROPERTYEDITOR_H
 
 #ifndef PURE_QT
-#include <klistview.h>
+#include <tdelistview.h>
 #else
 #include <tqlistview.h>
 #define TDEListView TQListView
diff --git a/lib/widgets/tdelistviewaction.cpp b/lib/widgets/tdelistviewaction.cpp
index 2d687027..bfd73887 100644
--- a/lib/widgets/tdelistviewaction.cpp
+++ b/lib/widgets/tdelistviewaction.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "klistviewaction.h"
+#include "tdelistviewaction.h"
 #include "kcomboview.h"
 #include "resizablecombo.h"
 
diff --git a/lib/widgets/tdelistviewaction.h b/lib/widgets/tdelistviewaction.h
index 703f58cf..bf547ab3 100644
--- a/lib/widgets/tdelistviewaction.h
+++ b/lib/widgets/tdelistviewaction.h
@@ -21,12 +21,12 @@
 
 #include <kxmlguiclient.h>
 #include <tdeversion.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KComboView;
  
 /**
-@file klistviewaction.h
+@file tdelistviewaction.h
 Widget action with KComboView.
 */
 
-- 
cgit v1.2.1