diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:01 -0600 |
commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /kppp | |
parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kppp')
-rw-r--r-- | kppp/accounting.cpp | 2 | ||||
-rw-r--r-- | kppp/accounts.cpp | 6 | ||||
-rw-r--r-- | kppp/acctselect.cpp | 2 | ||||
-rw-r--r-- | kppp/connect.cpp | 4 | ||||
-rw-r--r-- | kppp/conwindow.cpp | 4 | ||||
-rw-r--r-- | kppp/debug.cpp | 2 | ||||
-rw-r--r-- | kppp/docking.cpp | 2 | ||||
-rw-r--r-- | kppp/edit.cpp | 4 | ||||
-rw-r--r-- | kppp/general.cpp | 2 | ||||
-rw-r--r-- | kppp/kpppwidget.cpp | 6 | ||||
-rw-r--r-- | kppp/loginterm.cpp | 2 | ||||
-rw-r--r-- | kppp/logview/export.h | 2 | ||||
-rw-r--r-- | kppp/logview/log.cpp | 2 | ||||
-rw-r--r-- | kppp/logview/main.cpp | 2 | ||||
-rw-r--r-- | kppp/logview/main.h | 2 | ||||
-rw-r--r-- | kppp/logview/monthly.cpp | 6 | ||||
-rw-r--r-- | kppp/main.cpp | 6 | ||||
-rw-r--r-- | kppp/miniterm.cpp | 6 | ||||
-rw-r--r-- | kppp/modem.cpp | 2 | ||||
-rw-r--r-- | kppp/modemcmds.cpp | 2 | ||||
-rw-r--r-- | kppp/modemdb.cpp | 2 | ||||
-rw-r--r-- | kppp/modeminfo.cpp | 4 | ||||
-rw-r--r-- | kppp/modems.cpp | 6 | ||||
-rw-r--r-- | kppp/pppdargs.cpp | 2 | ||||
-rw-r--r-- | kppp/pppdata.cpp | 6 | ||||
-rw-r--r-- | kppp/ppplog.cpp | 4 | ||||
-rw-r--r-- | kppp/pppstatdlg.cpp | 2 | ||||
-rw-r--r-- | kppp/providerdb.cpp | 2 | ||||
-rw-r--r-- | kppp/pwentry.cpp | 2 | ||||
-rw-r--r-- | kppp/ruleset.cpp | 4 | ||||
-rw-r--r-- | kppp/runtests.cpp | 4 |
31 files changed, 52 insertions, 52 deletions
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index 7f346eef..b92d5e4f 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -32,7 +32,7 @@ #include <tqdir.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <time.h> diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index 39d41cca..250a83d4 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -33,9 +33,9 @@ #include <tdeapplication.h> #include <kbuttonbox.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <twin.h> #include <kdialogbase.h> #include <kstdguiitem.h> diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index 55c30e9c..f42b5a66 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -44,7 +44,7 @@ #include <tqcheckbox.h> #include <kdialog.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <krun.h> diff --git a/kppp/connect.cpp b/kppp/connect.cpp index 3b7eb6fc..879de553 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -31,8 +31,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <unistd.h> diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index fb0aa27b..4523af90 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -26,8 +26,8 @@ #include "docking.h" #include "pppdata.h" #include "pppstats.h" -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> extern PPPData gpppdata; diff --git a/kppp/debug.cpp b/kppp/debug.cpp index 8ad64d41..24fd939f 100644 --- a/kppp/debug.cpp +++ b/kppp/debug.cpp @@ -23,7 +23,7 @@ #include "debug.h" #include "main.h" #include "pppdata.h" -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/kppp/docking.cpp b/kppp/docking.cpp index b569b3c1..cfb41529 100644 --- a/kppp/docking.cpp +++ b/kppp/docking.cpp @@ -25,7 +25,7 @@ */ #include <twin.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdepopupmenu.h> diff --git a/kppp/edit.cpp b/kppp/edit.cpp index 9e24bd99..7d2b6f58 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -26,13 +26,13 @@ #include <string.h> #include <termios.h> #include <tqlayout.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqwhatsthis.h> #include <tqregexp.h> #include <tdeapplication.h> #include <kiconloader.h> #include <kbuttonbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqvgroupbox.h> #include <tqhbox.h> #include <kdialog.h> diff --git a/kppp/general.cpp b/kppp/general.cpp index 55f3b307..1dbe4aad 100644 --- a/kppp/general.cpp +++ b/kppp/general.cpp @@ -37,7 +37,7 @@ #include "modemcmds.h" #include "devices.h" #include "pppdata.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqgrid.h> diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index e8176fa8..ec8647b7 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -38,13 +38,13 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kbuttonbox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> // For BarIcon -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <kstandarddirs.h> #include <twin.h> diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp index fd544486..badf77df 100644 --- a/kppp/loginterm.cpp +++ b/kppp/loginterm.cpp @@ -31,7 +31,7 @@ #include "modem.h" #include <stdio.h> -#include <klocale.h> +#include <tdelocale.h> extern KPPPWidget *p_kppp; diff --git a/kppp/logview/export.h b/kppp/logview/export.h index 04ed0005..fda394d3 100644 --- a/kppp/logview/export.h +++ b/kppp/logview/export.h @@ -32,7 +32,7 @@ #include <tqtooltip.h> #include <kwizard.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> class Export; diff --git a/kppp/logview/log.cpp b/kppp/logview/log.cpp index 8335e55c..61009d7b 100644 --- a/kppp/logview/log.cpp +++ b/kppp/logview/log.cpp @@ -27,7 +27,7 @@ #include <tqdir.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index ea37aa70..b282f64b 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -24,7 +24,7 @@ #include "log.h" #include "monthly.h" #include "main.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kpushbutton.h> diff --git a/kppp/logview/main.h b/kppp/logview/main.h index dcbf2cb8..ce386f63 100644 --- a/kppp/logview/main.h +++ b/kppp/logview/main.h @@ -23,7 +23,7 @@ #include <tdemainwindow.h> #include <tqtabwidget.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include "monthly.h" class TopWidget : public TDEMainWindow { diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 0fd6e83e..e36a6219 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -24,11 +24,11 @@ #include <tqheader.h> #include <kcalendarsystem.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdelistview.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "monthly.h" #include "export.h" diff --git a/kppp/main.cpp b/kppp/main.cpp index d7c40cf1..4d18b76b 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -48,9 +48,9 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include "kpppwidget.h" diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 5eaa1404..94d484cf 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -32,11 +32,11 @@ #include "pppdata.h" #include "modem.h" #include "miniterm.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeapplication.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstdguiitem.h> #include <tqlayout.h> diff --git a/kppp/modem.cpp b/kppp/modem.cpp index 4fc3e503..ee75d417 100644 --- a/kppp/modem.cpp +++ b/kppp/modem.cpp @@ -36,7 +36,7 @@ #include "modem.h" #include "pppdata.h" #include "requester.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdecmdlineargs.h> #include <config.h> diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index 6f89ae90..43900295 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -29,7 +29,7 @@ #include <kbuttonbox.h> #include <stdlib.h> #include <tdeapplication.h> // for getMiniIcon() -#include <klocale.h> +#include <tdelocale.h> #include "modemcmds.h" #include "pppdata.h" #include <twin.h> diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index 3213d00b..a59bbb7d 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -36,7 +36,7 @@ #include <kbuttonbox.h> #include <tqlayout.h> #include "modemdb.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlistbox.h> #include <tdeconfig.h> diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index dd7ed5a0..b91fe671 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -28,12 +28,12 @@ #include <tqregexp.h> #include <tqlayout.h> #include <twin.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kpushbutton.h> #include "modeminfo.h" #include "modem.h" -#include <klocale.h> +#include <tdelocale.h> ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) : TQDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 4f15c17d..c064b714 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -34,9 +34,9 @@ #include <tdeapplication.h> #include <kbuttonbox.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <twin.h> #include <kdialogbase.h> #include <tqvgroupbox.h> diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp index 6a662be6..138cc663 100644 --- a/kppp/pppdargs.cpp +++ b/kppp/pppdargs.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include "pppdargs.h" #include "pppdata.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index 08b0aaf8..8702d403 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -27,11 +27,11 @@ #include "pppdata.h" #include "runtests.h" #include "devices.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <assert.h> PPPData gpppdata; diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index fe73a1ad..8ca0a652 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -43,11 +43,11 @@ #include <tqlayout.h> #include <kbuttonbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "pppdata.h" #include "requester.h" -#include <klocale.h> +#include <tdelocale.h> int PPPL_MakeLog(TQStringList &list) { diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index dcf6f48e..cc5386e7 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -28,7 +28,7 @@ #include <twin.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqframe.h> #include <tqgroupbox.h> diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index 703d9375..d88fbefb 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -33,7 +33,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include "providerdb.h" diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp index 7584c3c6..c3fc516e 100644 --- a/kppp/pwentry.cpp +++ b/kppp/pwentry.cpp @@ -27,7 +27,7 @@ #include <stdio.h> #include <tqapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "pwentry.h" PWEntry::PWEntry( TQWidget *parent, const char *name ) diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp index 41fc12c5..d5c60330 100644 --- a/kppp/ruleset.cpp +++ b/kppp/ruleset.cpp @@ -32,8 +32,8 @@ #include <tqregexp.h> #include <tqfile.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> RuleSet::RuleSet() { diff --git a/kppp/runtests.cpp b/kppp/runtests.cpp index 6e3f8f21..01e1437d 100644 --- a/kppp/runtests.cpp +++ b/kppp/runtests.cpp @@ -28,7 +28,7 @@ #include "runtests.h" #include <ctype.h> #include <unistd.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <sys/stat.h> #include <stdlib.h> #include <sys/types.h> @@ -44,7 +44,7 @@ #define _PATH_RESCONF "/etc/resolv.conf" #endif -#include <klocale.h> +#include <tdelocale.h> #include "pppdata.h" // initial effective uid (main.cpp) |