summaryrefslogtreecommitdiffstats
path: root/xparts
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:12 -0600
commit67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d (patch)
tree07b85c0ecb70077c87f3b52207393a92c180f413 /xparts
parentae2858133ebe92da16e5aab05f0b138de7cf514c (diff)
downloadtdebindings-67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d.tar.gz
tdebindings-67e97e92622b5f6bab7ad6aa2e188bdcf6e4428d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'xparts')
-rw-r--r--xparts/mozilla/kmozillapart.cpp4
-rw-r--r--xparts/mozilla/kshell.cpp4
-rw-r--r--xparts/src/kde/xparthost_kpart.cpp2
-rw-r--r--xparts/xpart_notepad/shell_xparthost.cpp4
-rw-r--r--xparts/xpart_notepad/shell_xparthost.h2
-rw-r--r--xparts/xpart_notepad/xp_notepad_factory.cpp4
6 files changed, 10 insertions, 10 deletions
diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp
index 625de5ad..7116a4d3 100644
--- a/xparts/mozilla/kmozillapart.cpp
+++ b/xparts/mozilla/kmozillapart.cpp
@@ -4,8 +4,8 @@
#include <dcopobject.h>
#include <kapplication.h>
#include <kstdaction.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
#include <kprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp
index 31103418..2770b95f 100644
--- a/xparts/mozilla/kshell.cpp
+++ b/xparts/mozilla/kshell.cpp
@@ -5,8 +5,8 @@
#include <dcopobject.h>
#include <kapplication.h>
#include <kstdaction.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
#include <kprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp
index 9195a278..0ed7181e 100644
--- a/xparts/src/kde/xparthost_kpart.cpp
+++ b/xparts/src/kde/xparthost_kpart.cpp
@@ -10,7 +10,7 @@
#include <qxembed.h>
#include <tqdom.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp
index 16f23b62..95d744a4 100644
--- a/xparts/xpart_notepad/shell_xparthost.cpp
+++ b/xparts/xpart_notepad/shell_xparthost.cpp
@@ -6,8 +6,8 @@
#include <dcopobject.h>
#include <kapplication.h>
#include <kstdaction.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
#include <kprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
diff --git a/xparts/xpart_notepad/shell_xparthost.h b/xparts/xpart_notepad/shell_xparthost.h
index 590a6293..4e329822 100644
--- a/xparts/xpart_notepad/shell_xparthost.h
+++ b/xparts/xpart_notepad/shell_xparthost.h
@@ -1,7 +1,7 @@
#ifndef shell_xparthost_h
#define shell_xparthost_h
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp
index f815fd4d..f81ea334 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.cpp
+++ b/xparts/xpart_notepad/xp_notepad_factory.cpp
@@ -22,8 +22,8 @@
#include <dcopobject.h>
#include <kapplication.h>
#include <kstdaction.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
#include <kprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>