Rename many classes and header files to avoid conflicts with KDE4

14 files changed, 19 insertions, 19 deletions

diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index 4b0d1ac1..be02660d 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -35,13 +35,13 @@
 
 #include <tqdatetime.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 3d8fc81a..8f06efa2 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -33,7 +33,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h
index 0ac7d114..180ae801 100644
--- a/kolourpaint/kpmainwindow.h
+++ b/kolourpaint/kpmainwindow.h
@@ -37,7 +37,7 @@
 #include <tqsize.h>
 #include <tqvaluevector.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include <kpdefs.h>
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index 65e1f7d5..3b20417f 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -35,7 +35,7 @@
 #include <tqpixmap.h>
 #include <tqvaluevector.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index 6cc81cfc..65eda702 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -36,7 +36,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
@@ -47,7 +47,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kscan.h>
 
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index 91662481..201302e8 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -29,7 +29,7 @@
 #include <kpmainwindow_p.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kactivelabel.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
@@ -37,7 +37,7 @@
 #include <kdialogbase.h>
 #include <krun.h>
 #include <klocale.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <kptool.h>
 
diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index 6d7bc13d..2a0e60f8 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -32,7 +32,7 @@
 #include <tqcolor.h>
 #include <tqsize.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index e28b7152..70521a94 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -28,7 +28,7 @@
 
 #include <kpmainwindow.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 0e151025..84445585 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -28,7 +28,7 @@
 
 #include <kpmainwindow.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 
 #include <tdeconfig.h>
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 7d58055c..b8757d10 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kolourpaint/kpsinglekeytriggersaction.h b/kolourpaint/kpsinglekeytriggersaction.h
index b041d250..51784672 100644
--- a/kolourpaint/kpsinglekeytriggersaction.h
+++ b/kolourpaint/kpsinglekeytriggersaction.h
@@ -29,7 +29,7 @@
 #define KP_SINGLE_KEY_TRIGGERS_ACTION_H
 
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 
 class kpSingleKeyTriggersActionInterface
@@ -53,7 +53,7 @@ protected:
 };
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 class kpSingleKeyTriggersAction : public TDEAction,
diff --git a/kolourpaint/tools/kptoolaction.h b/kolourpaint/tools/kptoolaction.h
index 210c7668..c1d77159 100644
--- a/kolourpaint/tools/kptoolaction.h
+++ b/kolourpaint/tools/kptoolaction.h
@@ -28,7 +28,7 @@
 #ifndef KP_TOOL_ACTION_H
 #define KP_TOOL_ACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 #include <kpsinglekeytriggersaction.h>
 
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index 14b613c6..b4d52a18 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -34,7 +34,7 @@
 #include <tqwidget.h>
 
 #include <kcolordialog.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <kpcolor.h>
 #include <kpcolorsimilaritycube.h>
diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h
index 3777c1fa..5a5f8f7a 100644
--- a/kolourpaint/widgets/kptooltoolbar.h
+++ b/kolourpaint/widgets/kptooltoolbar.h
@@ -31,7 +31,7 @@
 
 #include <tqvaluevector.h>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 
 class TQBoxLayout;