From 64a133c0b7f077faaa81918f2e0e7f9f2762db75 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:10:56 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- kcpuload/kcpuload/icontoggleaction.h | 2 +- kcpuload/kcpuload/kcpuload.cpp | 4 ++-- 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 +#include /** * 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 +#include #include #include -#include +#include 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 #include -#include +#include #include #include #include @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include