summaryrefslogtreecommitdiffstats
path: root/kexi/core
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/core')
-rw-r--r--kexi/core/kexiactionproxy.cpp6
-rw-r--r--kexi/core/kexiactionproxy.h2
-rw-r--r--kexi/core/kexicontexthelp.cpp2
-rw-r--r--kexi/core/kexisharedactionhost.h2
-rw-r--r--kexi/core/kexisharedactionhost_p.h4
-rw-r--r--kexi/core/kexiuseraction.cpp2
-rw-r--r--kexi/core/kexiuseraction.h2
7 files changed, 10 insertions, 10 deletions
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 72004434..fd3e2b2c 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -21,9 +21,9 @@
#include "kexiactionproxy_p.h"
#include <kdebug.h>
-#include <kaction.h>
-#include <kmainwindow.h>
-#include <kshortcut.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
+#include <tdeshortcut.h>
#include <tqwidget.h>
#include <tqsignal.h>
diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h
index d9868976..aa6498e0 100644
--- a/kexi/core/kexiactionproxy.h
+++ b/kexi/core/kexiactionproxy.h
@@ -26,7 +26,7 @@
#include <tqpair.h>
#include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "kexiproject.h"
#include "kexisharedactionhost.h"
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index e806aaaf..63f72d87 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -22,7 +22,7 @@
#include <kxmlguiclient.h>
#include <kapplication.h>
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqlayout.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index 5b2046d6..9a7ada11 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -26,7 +26,7 @@
#include <tqpair.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
class TDEShortcut;
class KGuiItem;
diff --git a/kexi/core/kexisharedactionhost_p.h b/kexi/core/kexisharedactionhost_p.h
index eef28a19..9c93a548 100644
--- a/kexi/core/kexisharedactionhost_p.h
+++ b/kexi/core/kexisharedactionhost_p.h
@@ -24,7 +24,7 @@
#include <tqptrdict.h>
#include <tqsignalmapper.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "kexiactionproxy.h"
@@ -34,7 +34,7 @@ class KexiVolatileActionData
{
public:
KexiVolatileActionData() { plugged=false; }
-// TDEAction *kaction;
+// TDEAction *tdeaction;
bool plugged : 1;
};
diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp
index 5a79929e..3bc22a7a 100644
--- a/kexi/core/kexiuseraction.cpp
+++ b/kexi/core/kexiuseraction.cpp
@@ -1,6 +1,6 @@
#include <kmessagebox.h>
#include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kexidb/cursor.h>
diff --git a/kexi/core/kexiuseraction.h b/kexi/core/kexiuseraction.h
index 602d5751..c64e08cd 100644
--- a/kexi/core/kexiuseraction.h
+++ b/kexi/core/kexiuseraction.h
@@ -1,7 +1,7 @@
#ifndef KEXIUSERACTION_H
#define KEXIUSERACTION_H
-#include <kaction.h>
+#include <tdeaction.h>
#include "kexiuseractionmethod.h"