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

---
 kpilot/datebookWidget.cc    | 2 +-
 kpilot/dbSelectionDialog.cc | 2 +-
 kpilot/dbSelection_base.ui  | 2 +-
 kpilot/dbviewerWidget.cc    | 2 +-
 kpilot/kpilot.cc            | 4 ++--
 kpilot/kpilot.h             | 2 +-
 kpilot/listCat.h            | 2 +-
 kpilot/pilotDaemon.cc       | 2 +-
 kpilot/todoWidget.cc        | 2 +-
 lib/pilotAddress.cc         | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kpilot/datebookWidget.cc b/kpilot/datebookWidget.cc
index db824cd..88d0a70 100644
--- a/kpilot/datebookWidget.cc
+++ b/kpilot/datebookWidget.cc
@@ -35,7 +35,7 @@
 #include <tqdir.h>
 #include <tqpushbutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdatepicker.h>
 #include <kmessagebox.h>
 
diff --git a/kpilot/dbSelectionDialog.cc b/kpilot/dbSelectionDialog.cc
index 4ce9c02..629e9f3 100644
--- a/kpilot/dbSelectionDialog.cc
+++ b/kpilot/dbSelectionDialog.cc
@@ -32,7 +32,7 @@
 
 #include <tqlistview.h>
 #include <tqpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
diff --git a/kpilot/dbSelection_base.ui b/kpilot/dbSelection_base.ui
index 67b6b67..20f68b2 100644
--- a/kpilot/dbSelection_base.ui
+++ b/kpilot/dbSelection_base.ui
@@ -72,7 +72,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
-	<include location="system" impldecl="in implementation">klistview.h</include>
+	<include location="system" impldecl="in implementation">tdelistview.h</include>
 	<include location="system" impldecl="in implementation">kpushbutton.h</include>
 	<include location="system" impldecl="in implementation">klineedit.h</include>
 	<include location="system" impldecl="in implementation">kpushbutton.h</include>
diff --git a/kpilot/dbviewerWidget.cc b/kpilot/dbviewerWidget.cc
index 8cca3e8..5a0aa25 100644
--- a/kpilot/dbviewerWidget.cc
+++ b/kpilot/dbviewerWidget.cc
@@ -42,7 +42,7 @@
 #include <tqregexp.h>
 #include <tqlistview.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <ktextedit.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc
index 1ac9be7..2e21851 100644
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@@ -50,8 +50,8 @@
 #include <kcmdlineargs.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kstdaction.h>
 #include <kuniqueapplication.h>
 #include <kkeydialog.h>
diff --git a/kpilot/kpilot.h b/kpilot/kpilot.h
index e270d3a..1dcf947 100644
--- a/kpilot/kpilot.h
+++ b/kpilot/kpilot.h
@@ -29,7 +29,7 @@
 ** Bug reports and questions can be sent to kde-pim@kde.org
 */
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class TQPopupMenu;
diff --git a/kpilot/listCat.h b/kpilot/listCat.h
index d844692..a816f37 100644
--- a/kpilot/listCat.h
+++ b/kpilot/listCat.h
@@ -34,7 +34,7 @@
 ** Bug reports and questions can be sent to kde-pim@kde.org
 */
 
-#include <klistview.h>
+#include <tdelistview.h>
 class TQStringList;
 
 /**
diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index 06926d1..03ce904 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -42,7 +42,7 @@
 #include <kcmdlineargs.h>
 #include <twin.h>
 #include <kurl.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kprocess.h>
diff --git a/kpilot/todoWidget.cc b/kpilot/todoWidget.cc
index e2bcb8a..d457a94 100644
--- a/kpilot/todoWidget.cc
+++ b/kpilot/todoWidget.cc
@@ -30,7 +30,7 @@
 #include "options.h"
 
 #include <tqptrlist.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/lib/pilotAddress.cc b/lib/pilotAddress.cc
index 0706a39..fa0cd3e 100644
--- a/lib/pilotAddress.cc
+++ b/lib/pilotAddress.cc
@@ -44,7 +44,7 @@ static const char *default_address_category_names[] = {
 	"Unfiled",
 	"Business",
 	"Personal",
-	"Quicklist",
+	"Quictdelist",
 	0L
 } ;