Rename additional header files to avoid conflicts with KDE4

ksystemlog/src/acpid/acpidOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/acpid/acpidReader.cpp

@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "parsingHelper.h"
 

ksystemlog/src/apache/apacheAccessReader.cpp

@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "parsingHelper.h"
 #include "apacheAccessReader.h"

ksystemlog/src/apache/apacheOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/apache/apacheReader.cpp

@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 #include "parsingHelper.h"

ksystemlog/src/bootauth/bootAuthenticationOptions.cpp

@@ -30,7 +30,7 @@
 
 //KDE includes
 #include <tdefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>

ksystemlog/src/cron/cronOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/cron/cronReader.cpp

@@ -20,8 +20,8 @@
 
 #include "cronReader.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 CronReader::CronReader(TQObject *parent, const char *name) : 
 	DefaultReader(parent, name)

ksystemlog/src/cups/cupsAccessReader.cpp

@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "parsingHelper.h"
 #include "cupsAccessReader.h"

ksystemlog/src/cups/cupsOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/cups/cupsReader.cpp

@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "parsingHelper.h"
 #include "cupsReader.h"

ksystemlog/src/daemon/daemonOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/defaultReader.cpp

@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "logListItem.h"
 #include "ksystemlogConfig.h"

ksystemlog/src/detailDialog.cpp

@@ -28,7 +28,7 @@
 #include <ktextedit.h>
 #include <kguiitem.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 //Project includes

ksystemlog/src/fileList.cpp

@@ -31,13 +31,13 @@
 #include <tqtooltip.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 FileList::FileList(TQWidget *parent, TQString description) : 

ksystemlog/src/generalOptions.cpp

@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>

ksystemlog/src/globals.cpp

@@ -20,7 +20,7 @@
  
 #include "globals.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "logLevel.h"
 #include "logMode.h"

ksystemlog/src/itemFactory.cpp

@@ -21,7 +21,7 @@
 //KDE includes
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //KSystemLog includes
 #include "logLine.h"

ksystemlog/src/kernel/kernelOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/ksystemlog.cpp

@@ -32,18 +32,18 @@
 
 
 //KDE includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <twin.h>
 #include <kprinter.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <kiconloader.h>
 
 #include <kservice.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 

ksystemlog/src/loadingDialog.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "loadingDialog.h"
 

ksystemlog/src/logLineFilter.cpp

@@ -26,7 +26,7 @@
 
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "logLineFilter.h"
 

ksystemlog/src/logListItem.cpp

@@ -29,8 +29,8 @@
 #include <tqcolor.h>
 
 //KDE includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 //For compatibility with old versions of KDE
 #include <tdeversion.h>

ksystemlog/src/logManager.cpp

@@ -24,14 +24,14 @@
 //KDE includes
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <tdeio/netaccess.h>
 #include <kfilterdev.h>
 
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //Project includes
 #include "logManager.h"

ksystemlog/src/loggerDialog.cpp

@@ -24,13 +24,13 @@
 #include <tqcheckbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //Project includes
 #include "logLevel.h"

ksystemlog/src/mail/mailOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 #include <kdebug.h>

ksystemlog/src/main.cpp

@@ -25,7 +25,7 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[]=I18N_NOOP("System Logs Viewer Tool for TDE");
 

ksystemlog/src/options.cpp

@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>

ksystemlog/src/parsingHelper.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "parsingHelper.h"
 

ksystemlog/src/reader.cpp

@@ -24,9 +24,9 @@
 
 #include <tqpixmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 Reader::Reader(TQObject *parent, const char *name) :

ksystemlog/src/readerFactory.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #include "ksystemlogConfig.h"

ksystemlog/src/samba/sambaOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/samba/sambaReader.cpp

@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "parsingHelper.h"
 #include "sambaReader.h"

ksystemlog/src/slotLogAction.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 //For compatibility with old versions of KDE
 #include <tdeversion.h>
 

ksystemlog/src/specificFileList.cpp

@@ -27,11 +27,11 @@
 #include <tqwhatsthis.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kdialogbase.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/system/systemOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/system/systemReader.cpp

@@ -20,8 +20,8 @@
 
 #include "systemReader.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 SystemReader::SystemReader(TQObject *parent, const char *name) : 
 	DefaultReader(parent, name)

ksystemlog/src/view.cpp

@@ -36,9 +36,9 @@
 
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 //For compatibility with old versions of KDE

ksystemlog/src/xorg/xorgOptions.cpp

@@ -28,13 +28,13 @@
 #include <tqhbox.h>
 
 //KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

ksystemlog/src/xorg/xorgReader.cpp

@@ -21,8 +21,8 @@
 
 #include <tqpair.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "xorgReader.h"