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

---
 quanta/components/csseditor/colorrequester.cpp        | 2 +-
 quanta/components/cvsservice/cvscommitdlgs.ui         | 2 +-
 quanta/components/cvsservice/cvsservice.cpp           | 6 +++---
 quanta/components/debugger/backtracelistview.cpp      | 2 +-
 quanta/components/debugger/backtracelistview.h        | 4 ++--
 quanta/components/debugger/debuggerbreakpointview.cpp | 2 +-
 quanta/components/debugger/debuggerbreakpointview.h   | 4 ++--
 quanta/components/debugger/debuggervariable.h         | 2 +-
 quanta/components/debugger/variableslistview.h        | 4 ++--
 quanta/components/tableeditor/tableeditor.cpp         | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'quanta/components')

diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 004f4c74..043e3470 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -22,7 +22,7 @@
 #include <tqiconset.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 
 #include "propertysetter.h"
 
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index 6f79a85e..f63b910e 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -145,6 +145,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index e423a221..6681d390 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -22,16 +22,16 @@
 #include <tqtimer.h>
 
 //kde includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // CvsService
 #include <repository_stub.h>
diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp
index a5925c26..0c0afdc7 100644
--- a/quanta/components/debugger/backtracelistview.cpp
+++ b/quanta/components/debugger/backtracelistview.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Quanta includes
 #include "backtracelistview.h"
diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h
index 4203cf70..01c34c45 100644
--- a/quanta/components/debugger/backtracelistview.h
+++ b/quanta/components/debugger/backtracelistview.h
@@ -19,8 +19,8 @@
 #ifndef BACKTRACELISTVIEW_H
 #define BACKTRACELISTVIEW_H
 
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <tqptrlist.h>
 
 class BacktraceListview;
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index c1074e9d..e32c0de8 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -21,7 +21,7 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kinputdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Quanta includes
 #include "debuggerbreakpointview.h"
diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h
index e6abcfcd..074de811 100644
--- a/quanta/components/debugger/debuggerbreakpointview.h
+++ b/quanta/components/debugger/debuggerbreakpointview.h
@@ -19,8 +19,8 @@
 #ifndef DEBUGGERBREAKPOINTVIEW_H
 #define DEBUGGERBREAKPOINTVIEW_H
 
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <tqptrlist.h>
 #include "debuggerbreakpoint.h"
 
diff --git a/quanta/components/debugger/debuggervariable.h b/quanta/components/debugger/debuggervariable.h
index af78fde6..8bc8ad0f 100644
--- a/quanta/components/debugger/debuggervariable.h
+++ b/quanta/components/debugger/debuggervariable.h
@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 #include <tqptrlist.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace DebuggerVariableTypes
 {
diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h
index de837241..69b27852 100644
--- a/quanta/components/debugger/variableslistview.h
+++ b/quanta/components/debugger/variableslistview.h
@@ -19,8 +19,8 @@
 #ifndef VARIABLESLISTVIEW_H
 #define VARIABLESLISTVIEW_H
 
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <tqptrlist.h>
 
 class DebuggerVariable;
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index c53d87b1..9d97c7eb 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdeparts/componentfactory.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>
-- 
cgit v1.2.3