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

---
 ksystemlog/src/acpid/acpidOptions.cpp       | 4 ++--
 ksystemlog/src/acpid/acpidOptions.h         | 4 ++--
 ksystemlog/src/apache/apacheOptions.cpp     | 4 ++--
 ksystemlog/src/apache/apacheOptions.h       | 4 ++--
 ksystemlog/src/cron/cronOptions.cpp         | 4 ++--
 ksystemlog/src/cron/cronOptions.h           | 4 ++--
 ksystemlog/src/cups/cupsOptions.cpp         | 4 ++--
 ksystemlog/src/cups/cupsOptions.h           | 4 ++--
 ksystemlog/src/daemon/daemonOptions.cpp     | 4 ++--
 ksystemlog/src/daemon/daemonOptions.h       | 4 ++--
 ksystemlog/src/fileList.cpp                 | 4 ++--
 ksystemlog/src/fileList.h                   | 4 ++--
 ksystemlog/src/kernel/kernelOptions.cpp     | 4 ++--
 ksystemlog/src/kernel/kernelOptions.h       | 4 ++--
 ksystemlog/src/ksystemlog.cpp               | 8 ++++----
 ksystemlog/src/ksystemlog.h                 | 6 +++---
 ksystemlog/src/logLineFilter.h              | 2 +-
 ksystemlog/src/logListItem.h                | 2 +-
 ksystemlog/src/logManager.cpp               | 2 +-
 ksystemlog/src/mail/mailOptions.cpp         | 4 ++--
 ksystemlog/src/mail/mailOptions.h           | 4 ++--
 ksystemlog/src/samba/sambaOptions.cpp       | 4 ++--
 ksystemlog/src/samba/sambaOptions.h         | 4 ++--
 ksystemlog/src/slotLogAction.h              | 2 +-
 ksystemlog/src/slotLogActionCompatibility.h | 2 +-
 ksystemlog/src/system/systemOptions.cpp     | 4 ++--
 ksystemlog/src/system/systemOptions.h       | 4 ++--
 ksystemlog/src/view.h                       | 4 ++--
 ksystemlog/src/viewToolTip.cpp              | 2 +-
 ksystemlog/src/xorg/xorgOptions.cpp         | 4 ++--
 ksystemlog/src/xorg/xorgOptions.h           | 4 ++--
 31 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/ksystemlog/src/acpid/acpidOptions.cpp b/ksystemlog/src/acpid/acpidOptions.cpp
index 0fc7996..caf22f9 100644
--- a/ksystemlog/src/acpid/acpidOptions.cpp
+++ b/ksystemlog/src/acpid/acpidOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/acpid/acpidOptions.h b/ksystemlog/src/acpid/acpidOptions.h
index 7047b2b..8c62528 100644
--- a/ksystemlog/src/acpid/acpidOptions.h
+++ b/ksystemlog/src/acpid/acpidOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "globals.h"
 #include "fileList.h"
diff --git a/ksystemlog/src/apache/apacheOptions.cpp b/ksystemlog/src/apache/apacheOptions.cpp
index dda4969..701a60d 100644
--- a/ksystemlog/src/apache/apacheOptions.cpp
+++ b/ksystemlog/src/apache/apacheOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/apache/apacheOptions.h b/ksystemlog/src/apache/apacheOptions.h
index b79131e..b02c63c 100644
--- a/ksystemlog/src/apache/apacheOptions.h
+++ b/ksystemlog/src/apache/apacheOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <ktabwidget.h>
 
 #include "globals.h"
diff --git a/ksystemlog/src/cron/cronOptions.cpp b/ksystemlog/src/cron/cronOptions.cpp
index a5571ee..776214f 100644
--- a/ksystemlog/src/cron/cronOptions.cpp
+++ b/ksystemlog/src/cron/cronOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/cron/cronOptions.h b/ksystemlog/src/cron/cronOptions.h
index 7622f8f..5d7ee68 100644
--- a/ksystemlog/src/cron/cronOptions.h
+++ b/ksystemlog/src/cron/cronOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 #include "globals.h"
diff --git a/ksystemlog/src/cups/cupsOptions.cpp b/ksystemlog/src/cups/cupsOptions.cpp
index 5ff562b..f4dc0c7 100644
--- a/ksystemlog/src/cups/cupsOptions.cpp
+++ b/ksystemlog/src/cups/cupsOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/cups/cupsOptions.h b/ksystemlog/src/cups/cupsOptions.h
index 2caa523..7847b22 100644
--- a/ksystemlog/src/cups/cupsOptions.h
+++ b/ksystemlog/src/cups/cupsOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <ktabwidget.h>
 
 #include "globals.h"
diff --git a/ksystemlog/src/daemon/daemonOptions.cpp b/ksystemlog/src/daemon/daemonOptions.cpp
index 09d4bc9..699e5c0 100644
--- a/ksystemlog/src/daemon/daemonOptions.cpp
+++ b/ksystemlog/src/daemon/daemonOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/daemon/daemonOptions.h b/ksystemlog/src/daemon/daemonOptions.h
index 6b88537..1b8b07e 100644
--- a/ksystemlog/src/daemon/daemonOptions.h
+++ b/ksystemlog/src/daemon/daemonOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "globals.h"
 #include "specificFileList.h"
diff --git a/ksystemlog/src/fileList.cpp b/ksystemlog/src/fileList.cpp
index ba23dbc..f4aac54 100644
--- a/ksystemlog/src/fileList.cpp
+++ b/ksystemlog/src/fileList.cpp
@@ -32,9 +32,9 @@
 
 // KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/fileList.h b/ksystemlog/src/fileList.h
index d4ed2ac..5a603a6 100644
--- a/ksystemlog/src/fileList.h
+++ b/ksystemlog/src/fileList.h
@@ -24,8 +24,8 @@
 #include <tqvbox.h>
 #include <tqpushbutton.h>
 
-#include <kpopupmenu.h>
-#include <klistbox.h>
+#include <tdepopupmenu.h>
+#include <tdelistbox.h>
 
 #include "globals.h"
 #include "logLevel.h"
diff --git a/ksystemlog/src/kernel/kernelOptions.cpp b/ksystemlog/src/kernel/kernelOptions.cpp
index c9286db..2d7bdf8 100644
--- a/ksystemlog/src/kernel/kernelOptions.cpp
+++ b/ksystemlog/src/kernel/kernelOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/kernel/kernelOptions.h b/ksystemlog/src/kernel/kernelOptions.h
index b49db5f..b4cfac6 100644
--- a/ksystemlog/src/kernel/kernelOptions.h
+++ b/ksystemlog/src/kernel/kernelOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "globals.h"
 #include "specificFileList.h"
diff --git a/ksystemlog/src/ksystemlog.cpp b/ksystemlog/src/ksystemlog.cpp
index 034fcd2..22b0c42 100644
--- a/ksystemlog/src/ksystemlog.cpp
+++ b/ksystemlog/src/ksystemlog.cpp
@@ -49,7 +49,7 @@
 
 #include <tdefiledialog.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 
 #include <tdeconfig.h>
 
@@ -61,13 +61,13 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kedittoolbar.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 //Project includes
diff --git a/ksystemlog/src/ksystemlog.h b/ksystemlog/src/ksystemlog.h
index 49664c0..17b3ed7 100644
--- a/ksystemlog/src/ksystemlog.h
+++ b/ksystemlog/src/ksystemlog.h
@@ -33,11 +33,11 @@
 
 //KDE includes
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeconfig.h>
 #include <ktabwidget.h>
-#include <kactionclasses.h>
-#include <kpopupmenu.h>
+#include <tdeactionclasses.h>
+#include <tdepopupmenu.h>
 //For compatibility with old versions of KDE
 #include <tdeversion.h>
 
diff --git a/ksystemlog/src/logLineFilter.h b/ksystemlog/src/logLineFilter.h
index b3998f5..19bf82e 100644
--- a/ksystemlog/src/logLineFilter.h
+++ b/ksystemlog/src/logLineFilter.h
@@ -27,7 +27,7 @@
 //The filter is activated only if KDE version >= 3.3
 #if defined(TDE_MAKE_VERSION) && TDE_VERSION >= TDE_MAKE_VERSION(3,3,0)
 
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 /**
   This class provides a KLineEdit which contains a greyed-out hinting
diff --git a/ksystemlog/src/logListItem.h b/ksystemlog/src/logListItem.h
index d4999b4..2bcd746 100644
--- a/ksystemlog/src/logListItem.h
+++ b/ksystemlog/src/logListItem.h
@@ -29,7 +29,7 @@
 
 #include <kiconloader.h>
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "globals.h"
 
diff --git a/ksystemlog/src/logManager.cpp b/ksystemlog/src/logManager.cpp
index ec329e0..16dae39 100644
--- a/ksystemlog/src/logManager.cpp
+++ b/ksystemlog/src/logManager.cpp
@@ -22,7 +22,7 @@
 #include <tqclipboard.h>
 
 //KDE includes
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kapplication.h>
diff --git a/ksystemlog/src/mail/mailOptions.cpp b/ksystemlog/src/mail/mailOptions.cpp
index 46b3456..4c7a947 100644
--- a/ksystemlog/src/mail/mailOptions.cpp
+++ b/ksystemlog/src/mail/mailOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/mail/mailOptions.h b/ksystemlog/src/mail/mailOptions.h
index 75dcdf5..31df292 100644
--- a/ksystemlog/src/mail/mailOptions.h
+++ b/ksystemlog/src/mail/mailOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "globals.h"
 #include "specificFileList.h"
diff --git a/ksystemlog/src/samba/sambaOptions.cpp b/ksystemlog/src/samba/sambaOptions.cpp
index 1c22ed5..b2fbec8 100644
--- a/ksystemlog/src/samba/sambaOptions.cpp
+++ b/ksystemlog/src/samba/sambaOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/samba/sambaOptions.h b/ksystemlog/src/samba/sambaOptions.h
index 0daa09e..c0649c2 100644
--- a/ksystemlog/src/samba/sambaOptions.h
+++ b/ksystemlog/src/samba/sambaOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 #include "globals.h"
diff --git a/ksystemlog/src/slotLogAction.h b/ksystemlog/src/slotLogAction.h
index 4a24596..1800644 100644
--- a/ksystemlog/src/slotLogAction.h
+++ b/ksystemlog/src/slotLogAction.h
@@ -22,7 +22,7 @@
 #ifndef _SLOT_LOG_ACTION_H_
 #define _SLOT_LOG_ACTION_H_
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KSystemLog;
 
diff --git a/ksystemlog/src/slotLogActionCompatibility.h b/ksystemlog/src/slotLogActionCompatibility.h
index f4d470f..d698027 100644
--- a/ksystemlog/src/slotLogActionCompatibility.h
+++ b/ksystemlog/src/slotLogActionCompatibility.h
@@ -21,7 +21,7 @@
 #ifndef _SLOT_LOG_ACTION_H_
 #define _SLOT_LOG_ACTION_H_
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KSystemLog;
 
diff --git a/ksystemlog/src/system/systemOptions.cpp b/ksystemlog/src/system/systemOptions.cpp
index ded47fb..b9d1c51 100644
--- a/ksystemlog/src/system/systemOptions.cpp
+++ b/ksystemlog/src/system/systemOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/system/systemOptions.h b/ksystemlog/src/system/systemOptions.h
index 8951285..1bccee5 100644
--- a/ksystemlog/src/system/systemOptions.h
+++ b/ksystemlog/src/system/systemOptions.h
@@ -25,12 +25,12 @@
 #include <tqspinbox.h>
 
 #include <tqcheckbox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "globals.h"
 #include "specificFileList.h"
diff --git a/ksystemlog/src/view.h b/ksystemlog/src/view.h
index 4382c55..86e9f28 100644
--- a/ksystemlog/src/view.h
+++ b/ksystemlog/src/view.h
@@ -27,9 +27,9 @@
 #include <tqdatetime.h>
 
 //KDE includes
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kicondialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 //For compatibility with old versions of KDE
 #include <tdeversion.h>
diff --git a/ksystemlog/src/viewToolTip.cpp b/ksystemlog/src/viewToolTip.cpp
index 0567b28..e0ac6ee 100644
--- a/ksystemlog/src/viewToolTip.cpp
+++ b/ksystemlog/src/viewToolTip.cpp
@@ -22,7 +22,7 @@
 
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "logListItem.h"
 
diff --git a/ksystemlog/src/xorg/xorgOptions.cpp b/ksystemlog/src/xorg/xorgOptions.cpp
index 49818c9..ca0bfe2 100644
--- a/ksystemlog/src/xorg/xorgOptions.cpp
+++ b/ksystemlog/src/xorg/xorgOptions.cpp
@@ -29,9 +29,9 @@
 
 //KDE includes
 #include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
diff --git a/ksystemlog/src/xorg/xorgOptions.h b/ksystemlog/src/xorg/xorgOptions.h
index fa7dbca..e6809e0 100644
--- a/ksystemlog/src/xorg/xorgOptions.h
+++ b/ksystemlog/src/xorg/xorgOptions.h
@@ -24,12 +24,12 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "globals.h"
 #include "fileList.h"