summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:06 -0600
commit20539f19e9f4f0392dbed6c8f6a92957e036a422 (patch)
tree8e80fb1d66f953fc83ed0ef4a27e5acf2147af93
parentab695c12f91b2058b3fc088be4688a968a7bebda (diff)
downloadknetload-20539f19e9f4f0392dbed6c8f6a92957e036a422.tar.gz
knetload-20539f19e9f4f0392dbed6c8f6a92957e036a422.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--knetload/icontoggleaction.h2
-rw-r--r--knetload/knetload.cpp4
-rw-r--r--knetload/statpopup.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/knetload/icontoggleaction.h b/knetload/icontoggleaction.h
index 7240af4..c54f120 100644
--- a/knetload/icontoggleaction.h
+++ b/knetload/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/knetload/knetload.cpp b/knetload/knetload.cpp
index fd05f1d..7c7c316 100644
--- a/knetload/knetload.cpp
+++ b/knetload/knetload.cpp
@@ -17,12 +17,12 @@
#include "knetproc.h"
#include "scaledialog.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqdir.h>
#define DEFAULT_SCALE 128000
diff --git a/knetload/statpopup.cpp b/knetload/statpopup.cpp
index 4268c0e..acd9f74 100644
--- a/knetload/statpopup.cpp
+++ b/knetload/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>
#define DEFAULT_SPEED 1000