summaryrefslogtreecommitdiffstats
path: root/kview/modules
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:20:36 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:20:36 -0600
commit81576b133797828eaca3ac819f4adca21de8d327 (patch)
treebb7f38c27a3f21d50df51a745c15739dde29bc68 /kview/modules
parent32ace734b36de108d8322157aaa106069df16477 (diff)
downloadtdegraphics-81576b133797828eaca3ac819f4adca21de8d327.tar.gz
tdegraphics-81576b133797828eaca3ac819f4adca21de8d327.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kview/modules')
-rw-r--r--kview/modules/browser/kviewbrowser.cpp2
-rw-r--r--kview/modules/effects/kvieweffects.cpp2
-rw-r--r--kview/modules/presenter/imagelistdialog.ui2
-rw-r--r--kview/modules/presenter/imagelistitem.cpp2
-rw-r--r--kview/modules/presenter/imagelistitem.h2
-rw-r--r--kview/modules/presenter/kviewpresenter.cpp2
-rw-r--r--kview/modules/scale/kview_scale.cpp2
-rw-r--r--kview/modules/scanner/kviewscanner.cpp2
-rw-r--r--kview/modules/template/kviewtemplate.cpp2
9 files changed, 9 insertions, 9 deletions
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index ea12d237..29d1d9aa 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -23,7 +23,7 @@
#include <tqcursor.h>
#include <kdirlister.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp
index 4b717da7..a2525e77 100644
--- a/kview/modules/effects/kvieweffects.cpp
+++ b/kview/modules/effects/kvieweffects.cpp
@@ -6,7 +6,7 @@
#include <tqobjectlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index b9a21da4..b3f8cf48 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -275,7 +275,7 @@
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kdialog.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index 74e82bea..62ca6e90 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -22,7 +22,7 @@
#include <tqimage.h>
-#include <klistview.h>
+#include <tdelistview.h>
ImageListItem::ImageListItem( TDEListView * parent, const KURL & url )
: TDEListViewItem( parent, parent->lastItem(), url.prettyURL() )
diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h
index 4eabcb39..321dcf4d 100644
--- a/kview/modules/presenter/imagelistitem.h
+++ b/kview/modules/presenter/imagelistitem.h
@@ -21,7 +21,7 @@
#ifndef IMAGELISTITEM_H
#define IMAGELISTITEM_H
-#include <klistview.h>
+#include <tdelistview.h>
#include <kurl.h>
#include <tqstring.h>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index c554e446..7cc3285c 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -32,7 +32,7 @@
#include <kpushbutton.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index 4dbdbd92..d2f6c9c5 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -24,7 +24,7 @@
#include <tqimage.h>
#include <tqvbox.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp
index 010296e5..1c35fa68 100644
--- a/kview/modules/scanner/kviewscanner.cpp
+++ b/kview/modules/scanner/kviewscanner.cpp
@@ -23,7 +23,7 @@
#include <tqimage.h>
#include <tqobjectlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kinstance.h>
#include <klocale.h>
#include <kgenericfactory.h>
diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp
index 78e10595..f148f7ac 100644
--- a/kview/modules/template/kviewtemplate.cpp
+++ b/kview/modules/template/kviewtemplate.cpp
@@ -6,7 +6,7 @@
#include <tqobjectlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
/*#include <klocale.h>*/
#include <kgenericfactory.h>
#include <kdebug.h>