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/dialogs/actionconfigdialog.cpp               | 8 ++++----
 quanta/dialogs/actionconfigdialogs.ui               | 4 ++--
 quanta/dialogs/dtepeditdlg.cpp                      | 2 +-
 quanta/dialogs/settings/abbreviation.cpp            | 4 ++--
 quanta/dialogs/settings/abbreviations.ui            | 4 ++--
 quanta/dialogs/specialchardialog.cpp                | 2 +-
 quanta/dialogs/specialchardialogs.ui                | 2 +-
 quanta/dialogs/tagdialogs/CMakeLists.txt            | 2 +-
 quanta/dialogs/tagdialogs/Makefile.am               | 2 +-
 quanta/dialogs/tagdialogs/colorcombo.cpp            | 2 +-
 quanta/dialogs/tagdialogs/colorcombo.h              | 2 +-
 quanta/dialogs/tagdialogs/listdlg.cpp               | 2 +-
 quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp     | 6 +++---
 quanta/dialogs/tagdialogs/tagquictdelistdlg.h       | 2 +-
 quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp | 2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'quanta/dialogs')

diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 4346be52..623b69c1 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -31,16 +31,16 @@
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <kkeybutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 #include <kinputdialog.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 //app includes
 #include "resource.h"
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index 9ed82302..1f803770 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -992,10 +992,10 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kicondialog.h</includehint>
     <includehint>kkeybutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>filecombo.h</includehint>
 </includehints>
 </UI>
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index 79247f40..13be01e7 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -27,7 +27,7 @@
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <kicondialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 90e098b8..6524beb9 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -27,8 +27,8 @@
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kinputdialog.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index f283a092..fc53fe16 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -351,7 +351,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp
index 23c372e1..aff627ef 100644
--- a/quanta/dialogs/specialchardialog.cpp
+++ b/quanta/dialogs/specialchardialog.cpp
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 
 #include "specialchardialog.h"
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index caaf3848..c10bc62e 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -148,6 +148,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/quanta/dialogs/tagdialogs/CMakeLists.txt b/quanta/dialogs/tagdialogs/CMakeLists.txt
index 7d478f6d..6f29cb43 100644
--- a/quanta/dialogs/tagdialogs/CMakeLists.txt
+++ b/quanta/dialogs/tagdialogs/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(
 tde_add_library( tagdialogs STATIC_PIC AUTOMOC
   SOURCES
     tagmisc.ui listdlg.cpp tagmaildlg.cpp
-    tagquicklistdlg.cpp tagquicklistdlgdata.cpp
+    tagquictdelistdlg.cpp tagquictdelistdlgdata.cpp
     tagdialog.cpp tagattr.cpp pictureview.cpp
     tagimgdlg.cpp tagxml.cpp tagwidget.cpp
     colorcombo.cpp tagimgdlgdata.cpp tagmiscdlg.cpp
diff --git a/quanta/dialogs/tagdialogs/Makefile.am b/quanta/dialogs/tagdialogs/Makefile.am
index ac7fd23f..8093e35e 100644
--- a/quanta/dialogs/tagdialogs/Makefile.am
+++ b/quanta/dialogs/tagdialogs/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libtagdialogs.la
 
 libtagdialogs_la_SOURCES = tagmisc.ui listdlg.cpp tagmaildlg.cpp \
-	tagquicklistdlg.cpp tagquicklistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp \
+	tagquictdelistdlg.cpp tagquictdelistdlgdata.cpp tagdialog.cpp tagattr.cpp pictureview.cpp \
 	tagimgdlg.cpp tagxml.cpp tagwidget.cpp colorcombo.cpp tagimgdlgdata.cpp \
 	tagmiscdlg.cpp tagmail.ui
 
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index ebe9a7fd..188f2ca0 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -49,7 +49,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h
index f26bf9dd..0c05dc5a 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.h
+++ b/quanta/dialogs/tagdialogs/colorcombo.h
@@ -31,7 +31,7 @@
 #include <tqframe.h>
 #include <tqpixmap.h>
 #include <kcolordialog.h>
-#include "kselect.h"
+#include "tdeselect.h"
 
 
 /**
diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp
index ba583b99..c9b20d5a 100644
--- a/quanta/dialogs/tagdialogs/listdlg.cpp
+++ b/quanta/dialogs/tagdialogs/listdlg.cpp
@@ -16,7 +16,7 @@
 #include "listdlg.h"
 
 //kde include
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 //qt includes
diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp b/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp
index 7a9edbdb..163abcc6 100644
--- a/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagquictdelistdlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          tagquicklistdlg.cpp  -  description
+                          tagquictdelistdlg.cpp  -  description
                              -------------------
     begin                : Sun Nov 28 1999
     copyright            : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky
@@ -14,8 +14,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "tagquicklistdlg.h"
-#include "tagquicklistdlg.moc"
+#include "tagquictdelistdlg.h"
+#include "tagquictdelistdlg.moc"
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlg.h b/quanta/dialogs/tagdialogs/tagquictdelistdlg.h
index 946efb67..5d242673 100644
--- a/quanta/dialogs/tagdialogs/tagquictdelistdlg.h
+++ b/quanta/dialogs/tagdialogs/tagquictdelistdlg.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          tagquicklistdlg.h  -  description
+                          tagquictdelistdlg.h  -  description
                              -------------------
     begin                : Sun Nov 28 1999
     copyright            : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky
diff --git a/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp
index 7f499c14..79522618 100644
--- a/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagquictdelistdlgdata.cpp
@@ -10,7 +10,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <tqbuttongroup.h>
-#include "tagquicklistdlg.h"
+#include "tagquictdelistdlg.h"
 #include <tqspinbox.h>
 #include <tqlabel.h>
 #include <kpushbutton.h>
-- 
cgit v1.2.1