summaryrefslogtreecommitdiffstats
path: root/klinkstatus/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:23:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:23:27 -0600
commitc46f36d00839916c8b6cde8ed2ca54aeb40dba19 (patch)
tree990b3fd4f5a01a1a86b43d158686456eae2bdc44 /klinkstatus/src
parent1e8f4c1ed6da13b851a7100e395d9243871c464d (diff)
downloadtdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.tar.gz
tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'klinkstatus/src')
-rw-r--r--klinkstatus/src/actionmanager.cpp4
-rw-r--r--klinkstatus/src/klinkstatus.cpp4
-rw-r--r--klinkstatus/src/klinkstatus_part.cpp6
-rw-r--r--klinkstatus/src/ui/klshistorycombo.cpp2
-rw-r--r--klinkstatus/src/ui/sessionwidget.cpp2
-rw-r--r--klinkstatus/src/ui/tabwidgetsession.cpp2
-rw-r--r--klinkstatus/src/ui/treeview.h2
7 files changed, 11 insertions, 11 deletions
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 7034c840..e60f2503 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -19,10 +19,10 @@
***************************************************************************/
#include "actionmanager.h"
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
#include <kxmlguifactory.h>
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kguiitem.h>
#include <tqbuttongroup.h>
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index b344e95d..cf8abf2b 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -25,14 +25,14 @@
#include <tdeconfig.h>
#include <kurl.h>
#include <kedittoolbar.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <klibloader.h>
#include <kmessagebox.h>
#include <kstatusbar.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
KLinkStatus::KLinkStatus()
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index be6f9f76..2d233666 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -21,7 +21,7 @@
#include <kaboutdata.h>
#include <klocale.h>
#include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
#include <tdeparts/genericfactory.h>
@@ -31,8 +31,8 @@
#include <kbugreport.h>
#include <tdeconfigdialog.h>
#include <kglobalsettings.h>
-#include <kshortcut.h>
-#include <kaccel.h>
+#include <tdeshortcut.h>
+#include <tdeaccel.h>
#include <kkeydialog.h>
#include <tqbuttongroup.h>
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index d1bbf780..3a4c7787 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -16,7 +16,7 @@
#include <tdeconfig.h>
#include <kcompletionbox.h>
#include <kdebug.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kurldrag.h>
#include <kglobalsettings.h>
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 6567b7db..49fa9759 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -29,7 +29,7 @@
#include <kglobal.h>
#include <kpushbutton.h>
#include <tdefiledialog.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <ktempfile.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index bc7f1492..7c369d4d 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -38,7 +38,7 @@
#include <kstringhandler.h>
#include <kcharsets.h>
#include <kmimetype.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kiconloader.h>
diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h
index 3481108d..55366e0d 100644
--- a/klinkstatus/src/ui/treeview.h
+++ b/klinkstatus/src/ui/treeview.h
@@ -12,7 +12,7 @@
#ifndef TREEVIEW_H
#define TREEVIEW_H
-#include <klistview.h>
+#include <tdelistview.h>
#include "resultview.h"
class TreeViewItem;