summaryrefslogtreecommitdiffstats
path: root/konsole
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /konsole
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konsole')
-rw-r--r--konsole/konsole/TEWidget.cpp2
-rw-r--r--konsole/konsole/TEWidget.h2
-rw-r--r--konsole/konsole/konsole.cpp8
-rw-r--r--konsole/konsole/konsole.h2
-rw-r--r--konsole/konsole/konsole_part.cpp6
-rw-r--r--konsole/konsole/konsolebookmarkhandler.cpp2
-rw-r--r--konsole/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--konsole/konsole/session.h2
8 files changed, 14 insertions, 14 deletions
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 72c69e8c..8aae214f 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -79,7 +79,7 @@
#include <klocale.h>
#include <knotifyclient.h>
#include <kglobalsettings.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kurldrag.h>
#include <tdeio/netaccess.h>
#include <tqlabel.h>
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index 1ca74464..1e2c36d8 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -29,7 +29,7 @@
#include <tqscrollbar.h>
#include <tqdragobject.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "TECommon.h"
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 189ebb3a..d78908cd 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -97,7 +97,7 @@ Time to start a requirement list.
#include <tdefiledialog.h>
#include <kurlrequesterdlg.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kkeydialog.h>
#include <kstandarddirs.h>
#include <tqpainter.h>
@@ -114,13 +114,13 @@ Time to start a requirement list.
#include <knotifydialog.h>
#undef B0
#include <kprinter.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <kurifilter.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kshell.h>
#include <tqlabel.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include <sys/wait.h>
#include <sys/stat.h>
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index c5c77d0c..468764e2 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -26,7 +26,7 @@
#define KONSOLE_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kdialogbase.h>
#include <ksimpleconfig.h>
#include <keditcl.h>
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index ac0b65bf..930c951f 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -30,7 +30,7 @@
#include <kaboutdata.h>
#include <kcharsets.h>
#include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <kinputdialog.h>
@@ -44,10 +44,10 @@
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <krootpixmap.h>
#include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
// We can't use the ARGB32 visual when embedded in another application
bool argb_visual = false;
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 4f2dca84..13af12ca 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -18,7 +18,7 @@
// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kshell.h>
#include <tdeio/job.h>
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 0aae87d7..0afe6a69 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -16,9 +16,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "konsole.h"
#include "konsolebookmarkmenu.h"
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index d3bc9b8f..e375ec58 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -22,7 +22,7 @@
#define SESSION_H
#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tqstrlist.h>
#include "TEPty.h"