summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:01 -0600
commit577ac5a23791dae4503e26ab46a3f7a0ba393c7a (patch)
tree86bdb25b48ee850dc404d382eecbf10f9f48f845 /src/app
parent5920e96087707ba892650898521dac63152274f9 (diff)
downloadgwenview-577ac5a23791dae4503e26ab46a3f7a0ba393c7a.tar.gz
gwenview-577ac5a23791dae4503e26ab46a3f7a0ba393c7a.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/app')
-rw-r--r--src/app/bookmarkviewcontroller.cpp8
-rw-r--r--src/app/bookmarkviewcontroller.h2
-rw-r--r--src/app/history.cpp6
-rw-r--r--src/app/mainwindow.cpp12
-rw-r--r--src/app/mainwindow.h2
5 files changed, 15 insertions, 15 deletions
diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index e7fb24f..18f21cb 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -31,17 +31,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqvbox.h>
// KDE
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
#include <kbookmarkmanager.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmimetype.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <kurl.h>
#include <kurldrag.h>
diff --git a/src/app/bookmarkviewcontroller.h b/src/app/bookmarkviewcontroller.h
index e7780e7..facf7b5 100644
--- a/src/app/bookmarkviewcontroller.h
+++ b/src/app/bookmarkviewcontroller.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqobject.h>
// KDE
-#include <klistview.h>
+#include <tdelistview.h>
#include <kurl.h>
class TQDragMoveEvent;
diff --git a/src/app/history.cpp b/src/app/history.cpp
index 4105856..1bfe115 100644
--- a/src/app/history.cpp
+++ b/src/app/history.cpp
@@ -21,11 +21,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
// KDE
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tdeversion.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kstdguiitem.h>
// Local
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 0ce4417..f07c219 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// KDE
#include <kaboutdata.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kbookmarkmanager.h>
#include <kbookmarkmenu.h>
@@ -47,18 +47,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tdeio/netaccess.h>
#include <kkeydialog.h>
#include <klargefile.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kpropsdlg.h>
#include <kprotocolinfo.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kstdaction.h>
-#include <ktoolbarlabelaction.h>
+#include <tdetoolbarlabelaction.h>
#include <kurlcompletion.h>
#include <kurlpixmapprovider.h>
#include <kprinter.h>
diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h
index 2bda2e2..eb21f27 100644
--- a/src/app/mainwindow.h
+++ b/src/app/mainwindow.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqptrlist.h>
// KDE
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kurl.h>
// Local