summaryrefslogtreecommitdiffstats
path: root/interfaces/tdescript
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 /interfaces/tdescript
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'interfaces/tdescript')
-rw-r--r--interfaces/tdescript/scriptloader.cpp2
-rw-r--r--interfaces/tdescript/scriptloader.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index a11032ada..65b6604b5 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -26,7 +26,7 @@
#include <tdeconfig.h>
#include <kdesktopfile.h>
#include <kstandarsdirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kdebug.h>
#include <tqdir.h>
diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index d0b338822..7fa4fa93f 100644
--- a/interfaces/tdescript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -19,8 +19,8 @@
#ifndef _script_loader_h
#define _script_loader_h
#include <tqptrlist.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
#include <tdescript/scriptinterface.h>
/**