diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /kppp/logview | |
parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kppp/logview')
-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 |
5 files changed, 7 insertions, 7 deletions
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" |