summaryrefslogtreecommitdiffstats
path: root/noatun/modules/kjofol-skin/kjloader.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:33 -0600
commit5b28c57424294aa30218a9c11cd6ed1a929409b6 (patch)
treeaaa8c9380d183dfa87857abd34b3ef42bb0de1b5 /noatun/modules/kjofol-skin/kjloader.cpp
parent120dff5f18d13aab7d2731de84e64c898728dc60 (diff)
downloadtdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.tar.gz
tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/kjofol-skin/kjloader.cpp')
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index ee8ca247..67bf516c 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -52,12 +52,12 @@
#include <tqvbox.h>
#include <tqlabel.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <tdefiledialog.h>
#include <khelpmenu.h>
#include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include <kglobalsettings.h>
#include <kglobal.h>