diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:44 -0600 |
| commit | 4caa59ee398ef468e45da7463c6f86d760c3e12f (patch) | |
| tree | 898f821feb083f7dd68efef8cf2c2d41e4d403d3 | |
| parent | d9e1a7f6e02a199f8c7d55cd6b5f27a377b8b764 (diff) | |
| download | kcpuload-4caa59ee398ef468e45da7463c6f86d760c3e12f.tar.gz kcpuload-4caa59ee398ef468e45da7463c6f86d760c3e12f.zip | |
Rename additional header files to avoid conflicts with KDE4
| -rw-r--r-- | kcpuload/kcpuload/kcpudock.cpp | 2 | ||||
| -rw-r--r-- | kcpuload/kcpuload/kcpuload.cpp | 2 | ||||
| -rw-r--r-- | kcpuload/kcpuload/main.cpp | 2 | ||||
| -rw-r--r-- | kcpuload/kcpuload/speeddialog.cpp | 2 | ||||
| -rw-r--r-- | kcpuload/kcpuload/statpopup.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kcpuload/kcpuload/kcpudock.cpp b/kcpuload/kcpuload/kcpudock.cpp index 32352c3..998cc30 100644 --- a/kcpuload/kcpuload/kcpudock.cpp +++ b/kcpuload/kcpuload/kcpudock.cpp @@ -13,7 +13,7 @@ #include "kcpudock.h" -#include <klocale.h> +#include <tdelocale.h> KCPUDock::KCPUDock(int whichCPU, StatPopup *parent, const char *name) : StatDock(whichCPU, i18n("C"), parent, name) { diff --git a/kcpuload/kcpuload/kcpuload.cpp b/kcpuload/kcpuload/kcpuload.cpp index 45dc173..6005313 100644 --- a/kcpuload/kcpuload/kcpuload.cpp +++ b/kcpuload/kcpuload/kcpuload.cpp @@ -18,7 +18,7 @@ #include <tdeaction.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> KCPULoad::KCPULoad(TQWidget *parent, const char *name) : diff --git a/kcpuload/kcpuload/main.cpp b/kcpuload/kcpuload/main.cpp index fa4b8b5..6b587e5 100644 --- a/kcpuload/kcpuload/main.cpp +++ b/kcpuload/kcpuload/main.cpp @@ -15,7 +15,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuniqueapplication.h> static const char *description = diff --git a/kcpuload/kcpuload/speeddialog.cpp b/kcpuload/kcpuload/speeddialog.cpp index 33c7091..845bb2a 100644 --- a/kcpuload/kcpuload/speeddialog.cpp +++ b/kcpuload/kcpuload/speeddialog.cpp @@ -15,7 +15,7 @@ #include <cstdlib> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqhbox.h> #include <tqvalidator.h> diff --git a/kcpuload/kcpuload/statpopup.cpp b/kcpuload/kcpuload/statpopup.cpp index 78d2aea..d2cc9a6 100644 --- a/kcpuload/kcpuload/statpopup.cpp +++ b/kcpuload/kcpuload/statpopup.cpp @@ -22,10 +22,10 @@ #include <kcolordialog.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <twin.h> #include <cstdlib> |