summaryrefslogtreecommitdiffstats
path: root/tdeio/misc/uiserver.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdeio/misc/uiserver.cpp
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeio/misc/uiserver.cpp')
-rw-r--r--tdeio/misc/uiserver.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 4f4b720f5..abe918854 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -41,8 +41,8 @@
#include <twin.h>
#include <kdialog.h>
#include <ksystemtray.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
#include <tqcheckbox.h>
#include <tqlabel.h>