summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:11:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:11:12 -0600
commitc0c309cc7cedacb98a1b17d46feb58736b9c40ba (patch)
tree92061e0a4c2307d42d57a018a0a1e3d8855c17f2
parentfb3e288d4644ae045680f2613c593a5d285bd21e (diff)
downloadkerberostray-c0c309cc.tar.gz
kerberostray-c0c309cc.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--src/configdlg.cpp2
-rw-r--r--src/toplevel.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/configdlg.cpp b/src/configdlg.cpp
index 34ad7d5..ad4d3aa 100644
--- a/src/configdlg.cpp
+++ b/src/configdlg.cpp
@@ -22,7 +22,7 @@
#include <klineedit.h>
#include <ktextedit.h>
#include <knuminput.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
#include <tqlistbox.h>
#include <kpushbutton.h>
#include <tqpixmap.h>
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 2a9b738..a4bd302 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -47,9 +47,9 @@
#include <knotifyclient.h>
#include <knuminput.h>
#include <kseparator.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdialogbase.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <knotifydialog.h>
#include <klineeditdlg.h>
#include <libtdeldap.h>