Rename many classes and header files to avoid conflicts with KDE4

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>

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"

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>

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"

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>

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"

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>

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"

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>

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"

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>

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"

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>

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"

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

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>
 

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

ksystemlog/src/logListItem.h

@@ -29,7 +29,7 @@
 
 #include <kiconloader.h>
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "globals.h"
 

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>

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>

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"

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>

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"

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;
 

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;
 

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>

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"

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>

ksystemlog/src/viewToolTip.cpp

@@ -22,7 +22,7 @@
 
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "logListItem.h"
 

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>

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"