diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:50:10 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:50:10 -0600 |
commit | a684454d7a6ad1f4f459ddd5e689ca0e3a72cd40 (patch) | |
tree | 3bd5c675dc6cc500fc98ad3f5334ecfa1109b5c0 | |
parent | 7095aa31b688fad1d7fbd4c485b22a73b9abc625 (diff) | |
download | ksystemlog-a684454d7a6ad1f4f459ddd5e689ca0e3a72cd40.tar.gz ksystemlog-a684454d7a6ad1f4f459ddd5e689ca0e3a72cd40.zip |
Rename additional header files to avoid conflicts with KDE4
40 files changed, 70 insertions, 70 deletions
diff --git a/ksystemlog/src/acpid/acpidOptions.cpp b/ksystemlog/src/acpid/acpidOptions.cpp index caf22f9..38e8ce8 100644 --- a/ksystemlog/src/acpid/acpidOptions.cpp +++ b/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> diff --git a/ksystemlog/src/acpid/acpidReader.cpp b/ksystemlog/src/acpid/acpidReader.cpp index fd7c1ce..9c90ea4 100644 --- a/ksystemlog/src/acpid/acpidReader.cpp +++ b/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" diff --git a/ksystemlog/src/apache/apacheAccessReader.cpp b/ksystemlog/src/apache/apacheAccessReader.cpp index cdb4b54..b20b07b 100644 --- a/ksystemlog/src/apache/apacheAccessReader.cpp +++ b/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" diff --git a/ksystemlog/src/apache/apacheOptions.cpp b/ksystemlog/src/apache/apacheOptions.cpp index 701a60d..b16b4ca 100644 --- a/ksystemlog/src/apache/apacheOptions.cpp +++ b/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> diff --git a/ksystemlog/src/apache/apacheReader.cpp b/ksystemlog/src/apache/apacheReader.cpp index ee44415..f81e2be 100644 --- a/ksystemlog/src/apache/apacheReader.cpp +++ b/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" diff --git a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp b/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp index 9396437..0f3f359 100644 --- a/ksystemlog/src/bootauth/bootAuthenticationOptions.cpp +++ b/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> diff --git a/ksystemlog/src/cron/cronOptions.cpp b/ksystemlog/src/cron/cronOptions.cpp index 776214f..510a8d3 100644 --- a/ksystemlog/src/cron/cronOptions.cpp +++ b/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> diff --git a/ksystemlog/src/cron/cronReader.cpp b/ksystemlog/src/cron/cronReader.cpp index 169f473..7031317 100644 --- a/ksystemlog/src/cron/cronReader.cpp +++ b/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) diff --git a/ksystemlog/src/cups/cupsAccessReader.cpp b/ksystemlog/src/cups/cupsAccessReader.cpp index 2b9df7b..1af0fc4 100644 --- a/ksystemlog/src/cups/cupsAccessReader.cpp +++ b/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" diff --git a/ksystemlog/src/cups/cupsOptions.cpp b/ksystemlog/src/cups/cupsOptions.cpp index f4dc0c7..08dad76 100644 --- a/ksystemlog/src/cups/cupsOptions.cpp +++ b/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> diff --git a/ksystemlog/src/cups/cupsReader.cpp b/ksystemlog/src/cups/cupsReader.cpp index 1d472ae..738b63c 100644 --- a/ksystemlog/src/cups/cupsReader.cpp +++ b/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" diff --git a/ksystemlog/src/daemon/daemonOptions.cpp b/ksystemlog/src/daemon/daemonOptions.cpp index 699e5c0..c459916 100644 --- a/ksystemlog/src/daemon/daemonOptions.cpp +++ b/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> diff --git a/ksystemlog/src/defaultReader.cpp b/ksystemlog/src/defaultReader.cpp index 011422c..1b56760 100644 --- a/ksystemlog/src/defaultReader.cpp +++ b/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" diff --git a/ksystemlog/src/detailDialog.cpp b/ksystemlog/src/detailDialog.cpp index 1ba5301..fbf90ca 100644 --- a/ksystemlog/src/detailDialog.cpp +++ b/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 diff --git a/ksystemlog/src/fileList.cpp b/ksystemlog/src/fileList.cpp index f4aac54..ae30f9b 100644 --- a/ksystemlog/src/fileList.cpp +++ b/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) : diff --git a/ksystemlog/src/generalOptions.cpp b/ksystemlog/src/generalOptions.cpp index 5c3bd41..674f70e 100644 --- a/ksystemlog/src/generalOptions.cpp +++ b/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> diff --git a/ksystemlog/src/globals.cpp b/ksystemlog/src/globals.cpp index 91f2309..40dcc19 100644 --- a/ksystemlog/src/globals.cpp +++ b/ksystemlog/src/globals.cpp @@ -20,7 +20,7 @@ #include "globals.h" -#include <klocale.h> +#include <tdelocale.h> #include "logLevel.h" #include "logMode.h" diff --git a/ksystemlog/src/itemFactory.cpp b/ksystemlog/src/itemFactory.cpp index f8f891f..4981b59 100644 --- a/ksystemlog/src/itemFactory.cpp +++ b/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" diff --git a/ksystemlog/src/kernel/kernelOptions.cpp b/ksystemlog/src/kernel/kernelOptions.cpp index 2d7bdf8..15be385 100644 --- a/ksystemlog/src/kernel/kernelOptions.cpp +++ b/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> diff --git a/ksystemlog/src/ksystemlog.cpp b/ksystemlog/src/ksystemlog.cpp index 22b0c42..3a84a95 100644 --- a/ksystemlog/src/ksystemlog.cpp +++ b/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> diff --git a/ksystemlog/src/loadingDialog.cpp b/ksystemlog/src/loadingDialog.cpp index 3d4c48b..99f7649 100644 --- a/ksystemlog/src/loadingDialog.cpp +++ b/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" diff --git a/ksystemlog/src/logLineFilter.cpp b/ksystemlog/src/logLineFilter.cpp index 113f24c..97a18bb 100644 --- a/ksystemlog/src/logLineFilter.cpp +++ b/ksystemlog/src/logLineFilter.cpp @@ -26,7 +26,7 @@ #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include "logLineFilter.h" diff --git a/ksystemlog/src/logListItem.cpp b/ksystemlog/src/logListItem.cpp index 308b0cc..daa4371 100644 --- a/ksystemlog/src/logListItem.cpp +++ b/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> diff --git a/ksystemlog/src/logManager.cpp b/ksystemlog/src/logManager.cpp index 6771478..314bd61 100644 --- a/ksystemlog/src/logManager.cpp +++ b/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" diff --git a/ksystemlog/src/loggerDialog.cpp b/ksystemlog/src/loggerDialog.cpp index cec0795..d284584 100644 --- a/ksystemlog/src/loggerDialog.cpp +++ b/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" diff --git a/ksystemlog/src/mail/mailOptions.cpp b/ksystemlog/src/mail/mailOptions.cpp index 4c7a947..a297073 100644 --- a/ksystemlog/src/mail/mailOptions.cpp +++ b/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> diff --git a/ksystemlog/src/main.cpp b/ksystemlog/src/main.cpp index 474bbbc..a7e9f3a 100644 --- a/ksystemlog/src/main.cpp +++ b/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"); diff --git a/ksystemlog/src/options.cpp b/ksystemlog/src/options.cpp index 16788ad..755ff62 100644 --- a/ksystemlog/src/options.cpp +++ b/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> diff --git a/ksystemlog/src/parsingHelper.cpp b/ksystemlog/src/parsingHelper.cpp index fbf3103..31cc04e 100644 --- a/ksystemlog/src/parsingHelper.cpp +++ b/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" diff --git a/ksystemlog/src/reader.cpp b/ksystemlog/src/reader.cpp index 58cffee..f81f880 100644 --- a/ksystemlog/src/reader.cpp +++ b/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) : diff --git a/ksystemlog/src/readerFactory.cpp b/ksystemlog/src/readerFactory.cpp index 0f1211b..e75c7ab 100644 --- a/ksystemlog/src/readerFactory.cpp +++ b/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" diff --git a/ksystemlog/src/samba/sambaOptions.cpp b/ksystemlog/src/samba/sambaOptions.cpp index b2fbec8..6301860 100644 --- a/ksystemlog/src/samba/sambaOptions.cpp +++ b/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> diff --git a/ksystemlog/src/samba/sambaReader.cpp b/ksystemlog/src/samba/sambaReader.cpp index f1fcb67..dc83260 100644 --- a/ksystemlog/src/samba/sambaReader.cpp +++ b/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" diff --git a/ksystemlog/src/slotLogAction.cpp b/ksystemlog/src/slotLogAction.cpp index 3a2956c..146e7c3 100644 --- a/ksystemlog/src/slotLogAction.cpp +++ b/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> diff --git a/ksystemlog/src/specificFileList.cpp b/ksystemlog/src/specificFileList.cpp index 6b18c68..10ed421 100644 --- a/ksystemlog/src/specificFileList.cpp +++ b/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> diff --git a/ksystemlog/src/system/systemOptions.cpp b/ksystemlog/src/system/systemOptions.cpp index b9d1c51..9aab091 100644 --- a/ksystemlog/src/system/systemOptions.cpp +++ b/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> diff --git a/ksystemlog/src/system/systemReader.cpp b/ksystemlog/src/system/systemReader.cpp index dfe923f..061732a 100644 --- a/ksystemlog/src/system/systemReader.cpp +++ b/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) diff --git a/ksystemlog/src/view.cpp b/ksystemlog/src/view.cpp index 8868934..e786a9e 100644 --- a/ksystemlog/src/view.cpp +++ b/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 diff --git a/ksystemlog/src/xorg/xorgOptions.cpp b/ksystemlog/src/xorg/xorgOptions.cpp index ca0bfe2..2f0dd93 100644 --- a/ksystemlog/src/xorg/xorgOptions.cpp +++ b/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> diff --git a/ksystemlog/src/xorg/xorgReader.cpp b/ksystemlog/src/xorg/xorgReader.cpp index 2697798..0748b9a 100644 --- a/ksystemlog/src/xorg/xorgReader.cpp +++ b/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" |