summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:47 -0600
commitda47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch)
treeb42ba87fcdfa425a31e243a62d71e1de248b6ee8 /wifi
parent4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff)
downloadtdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz
tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'wifi')
-rw-r--r--wifi/kwifimanager.cpp4
-rw-r--r--wifi/kwifimanager.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 71d7bf29..2b2a1fc3 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -36,8 +36,8 @@
#include <klocale.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <kstdguiitem.h>
#include <kmessagebox.h>
diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h
index 5222cd4b..4387c354 100644
--- a/wifi/kwifimanager.h
+++ b/wifi/kwifimanager.h
@@ -30,7 +30,7 @@ class TQPushButton;
class TQStringList;
// include files for KDE
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class KSystemTray;
class TDEToggleAction;
class TDEProcess;