diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:10:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:10:56 -0600 |
| commit | 64a133c0b7f077faaa81918f2e0e7f9f2762db75 (patch) | |
| tree | fafda444fe878a6587a4784a9d59587d63d5b3ac | |
| parent | 05dbfd2d578121f0784548510d25bfb2b49bc316 (diff) | |
| download | kcpuload-64a133c0b7f077faaa81918f2e0e7f9f2762db75.tar.gz kcpuload-64a133c0b7f077faaa81918f2e0e7f9f2762db75.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rw-r--r-- | kcpuload/kcpuload/icontoggleaction.h | 2 | ||||
| -rw-r--r-- | kcpuload/kcpuload/kcpuload.cpp | 4 | ||||
| -rw-r--r-- | kcpuload/kcpuload/statpopup.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kcpuload/kcpuload/icontoggleaction.h b/kcpuload/kcpuload/icontoggleaction.h index 7240af4..c54f120 100644 --- a/kcpuload/kcpuload/icontoggleaction.h +++ b/kcpuload/kcpuload/icontoggleaction.h @@ -14,7 +14,7 @@ #ifndef __ICONTOGGLEACTION_H #define __ICONTOGGLEACTION_H -#include <kaction.h> +#include <tdeaction.h> /** * A toggle action that uses different labels and pixmaps in its diff --git a/kcpuload/kcpuload/kcpuload.cpp b/kcpuload/kcpuload/kcpuload.cpp index 0652d50..45dc173 100644 --- a/kcpuload/kcpuload/kcpuload.cpp +++ b/kcpuload/kcpuload/kcpuload.cpp @@ -16,10 +16,10 @@ #include "kcpuload.h" #include "kcpuproc.h" -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> KCPULoad::KCPULoad(TQWidget *parent, const char *name) : StatPopup(true, parent, name) { diff --git a/kcpuload/kcpuload/statpopup.cpp b/kcpuload/kcpuload/statpopup.cpp index 0d1899c..78d2aea 100644 --- a/kcpuload/kcpuload/statpopup.cpp +++ b/kcpuload/kcpuload/statpopup.cpp @@ -18,7 +18,7 @@ #include <tqpainter.h> #include <tqtimer.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcolordialog.h> #include <tdeconfig.h> #include <kdebug.h> @@ -26,7 +26,7 @@ #include <khelpmenu.h> #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <twin.h> #include <cstdlib> |