summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:16:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:16:45 -0600
commit97f07a51d4e3acc6c957d278e24a96f48202dcdf (patch)
tree6eab4ccebc4ef7eef4ba6052b1c1dc014c6e7430 /src
parent8668a55e039a3b9b8fc39f55d15138a33ea87b22 (diff)
downloadwlassistant-97f07a51d4e3acc6c957d278e24a96f48202dcdf.tar.gz
wlassistant-97f07a51d4e3acc6c957d278e24a96f48202dcdf.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/netlistviewitem.h2
-rw-r--r--src/ui_main.ui2
-rw-r--r--src/wlassistant.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/netlistviewitem.h b/src/netlistviewitem.h
index 7bd0c87..85f09c4 100644
--- a/src/netlistviewitem.h
+++ b/src/netlistviewitem.h
@@ -25,7 +25,7 @@
#include <tqpainter.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmessagebox.h>
class NetListViewItem : public TDEListViewItem
diff --git a/src/ui_main.ui b/src/ui_main.ui
index 94af120..dfc02eb 100644
--- a/src/ui_main.ui
+++ b/src/ui_main.ui
@@ -754,6 +754,6 @@
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kcombobox.h</includehint>
-<includehint>klistview.h</includehint>
+<includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/src/wlassistant.cpp b/src/wlassistant.cpp
index 78ae1e3..2187bde 100644
--- a/src/wlassistant.cpp
+++ b/src/wlassistant.cpp
@@ -40,11 +40,11 @@
#include <kpushbutton.h>
#include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include <kstandarddirs.h>