Rename additional header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent d9e1a7f6e0
commit 4caa59ee39

@ -13,7 +13,7 @@
#include "kcpudock.h" #include "kcpudock.h"
#include <klocale.h> #include <tdelocale.h>
KCPUDock::KCPUDock(int whichCPU, StatPopup *parent, const char *name) : KCPUDock::KCPUDock(int whichCPU, StatPopup *parent, const char *name) :
StatDock(whichCPU, i18n("C"), parent, name) { StatDock(whichCPU, i18n("C"), parent, name) {

@ -18,7 +18,7 @@
#include <tdeaction.h> #include <tdeaction.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
KCPULoad::KCPULoad(TQWidget *parent, const char *name) : KCPULoad::KCPULoad(TQWidget *parent, const char *name) :

@ -15,7 +15,7 @@
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <klocale.h> #include <tdelocale.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
static const char *description = static const char *description =

@ -15,7 +15,7 @@
#include <cstdlib> #include <cstdlib>
#include <kcombobox.h> #include <kcombobox.h>
#include <klocale.h> #include <tdelocale.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <tqvalidator.h> #include <tqvalidator.h>

@ -22,10 +22,10 @@
#include <kcolordialog.h> #include <kcolordialog.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <twin.h> #include <twin.h>
#include <cstdlib> #include <cstdlib>

Loading…
Cancel
Save