Rename a number of classes to enhance compatibility with KDE4

11 files changed, 27 insertions, 27 deletions

diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h
index a26b90c1..198c53af 100644
--- a/kview/modules/browser/kviewbrowser.h
+++ b/kview/modules/browser/kviewbrowser.h
@@ -26,7 +26,7 @@
 namespace KImageViewer { class Viewer; }
 
 namespace KParts { class BrowserExtension; }
-class KAction;
+class TDEAction;
 class KDirLister;
 class KMyFileItemList;
 
@@ -55,8 +55,8 @@ private:
 	KParts::BrowserExtension * m_pExtension;
 	bool m_bShowCurrent;
 
-	KAction * m_paBack;
-	KAction * m_paForward;
+	TDEAction * m_paBack;
+	TDEAction * m_paForward;
 };
 
 // vim:sw=4:ts=4:cindent
diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp
index a2e57327..4b717da7 100644
--- a/kview/modules/effects/kvieweffects.cpp
+++ b/kview/modules/effects/kvieweffects.cpp
@@ -37,13 +37,13 @@ KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringLi
 	delete viewerList;
 	if( m_pViewer )
 	{
-		KAction * gammaaction = new KAction( i18n( "&Gamma Correction..." ), 0, 0,
+		TDEAction * gammaaction = new TDEAction( i18n( "&Gamma Correction..." ), 0, 0,
 				this, TQT_SLOT( gamma() ),
 				actionCollection(), "plugin_effects_gamma" );
-		KAction * blendaction = new KAction( i18n( "&Blend Color..." ), 0, 0,
+		TDEAction * blendaction = new TDEAction( i18n( "&Blend Color..." ), 0, 0,
 				this, TQT_SLOT( blend() ),
 				actionCollection(), "plugin_effects_blend" );
-		KAction * intensityaction = new KAction( i18n( "Change &Intensity (Brightness)..." ), 0, 0,
+		TDEAction * intensityaction = new TDEAction( i18n( "Change &Intensity (Brightness)..." ), 0, 0,
 				this, TQT_SLOT( intensity() ),
 				actionCollection(), "plugin_effects_intensity" );
 		gammaaction->setEnabled( m_pViewer->canvas()->image() != 0 );
diff --git a/kview/modules/presenter/DESIGN b/kview/modules/presenter/DESIGN
index 11d77121..3b187e78 100644
--- a/kview/modules/presenter/DESIGN
+++ b/kview/modules/presenter/DESIGN
@@ -20,9 +20,9 @@ Presenter Plugin:
 
 - Implementation:
 	- Playlist:
-		- KListView
+		- TDEListView
 		- Items:
-			- derived from KListViewItem
+			- derived from TDEListViewItem
 			- load Info in the background
 			- keep local copy of downloaded files
 			- delete local copy on destruction
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 8878eab6..b9a21da4 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -23,7 +23,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>URL</string>
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index 313cd75b..74e82bea 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -24,8 +24,8 @@
 
 #include <klistview.h>
 
-ImageListItem::ImageListItem( KListView * parent, const KURL & url )
-	: KListViewItem( parent, parent->lastItem(), url.prettyURL() )
+ImageListItem::ImageListItem( TDEListView * parent, const KURL & url )
+	: TDEListViewItem( parent, parent->lastItem(), url.prettyURL() )
 	, m_pImage( 0 )
 	, m_filename( TQString() )
 	, m_url( url )
diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h
index ee143a90..4eabcb39 100644
--- a/kview/modules/presenter/imagelistitem.h
+++ b/kview/modules/presenter/imagelistitem.h
@@ -27,10 +27,10 @@
 
 class TQImage;
 
-class ImageListItem : public KListViewItem
+class ImageListItem : public TDEListViewItem
 {
 	public:
-		ImageListItem( KListView * parent, const KURL & url );
+		ImageListItem( TDEListView * parent, const KURL & url );
 		~ImageListItem();
 
 		const TQImage * image() const;
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index b7aef984..c554e446 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -67,14 +67,14 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 	delete viewerList;
 	if( m_pViewer )
 	{
-		( void ) new KAction( i18n( "&Image List..." ), 0, 0,
+		( void ) new TDEAction( i18n( "&Image List..." ), 0, 0,
 							this, TQT_SLOT( slotImageList() ),
 							actionCollection(), "plugin_presenter_imageList" );
-		m_paSlideshow = new KToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" );
-		( void ) new KAction( i18n( "&Previous Image in List" ), "previous", ALT+Key_Left,
+		m_paSlideshow = new TDEToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" );
+		( void ) new TDEAction( i18n( "&Previous Image in List" ), "previous", ALT+Key_Left,
 							  this, TQT_SLOT( prev() ),
 							  actionCollection(), "plugin_presenter_prev" );
-		( void ) new KAction( i18n( "&Next Image in List" ), "next", ALT+Key_Right,
+		( void ) new TDEAction( i18n( "&Next Image in List" ), "next", ALT+Key_Right,
 							  this, TQT_SLOT( next() ),
 							  actionCollection(), "plugin_presenter_next" );
 
@@ -97,7 +97,7 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri
 		}
 		else
 		{
-			(void) new KAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O,
+			(void) new TDEAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O,
 							this, TQT_SLOT( slotOpenFiles() ),
 							actionCollection(), "plugin_presenter_openFiles" );
 		}
@@ -383,7 +383,7 @@ void KViewPresenter::setSlideshowInterval( int msec )
 void KViewPresenter::shuffle()
 {
 	m_pImageList->noSort();
-	KListView * listview = m_pImageList->m_pListView;
+	TDEListView * listview = m_pImageList->m_pListView;
 	TQPtrList<TQListViewItem> items;
 	for( TQListViewItem * item = listview->firstChild(); item; item = listview->firstChild() )
 	{
diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h
index 2fff82c1..94b9fa65 100644
--- a/kview/modules/presenter/kviewpresenter.h
+++ b/kview/modules/presenter/kviewpresenter.h
@@ -32,8 +32,8 @@ class ImageListDialog;
 class ImageListItem;
 class TQListViewItem;
 class TQTimer;
-class KToggleAction;
-class KAction;
+class TDEToggleAction;
+class TDEAction;
 
 class KViewPresenter : public KParts::Plugin
 {
@@ -90,9 +90,9 @@ private:
 
 	KImageViewer::Viewer * m_pViewer;
 	ImageListDialog * m_pImageList;
-	KToggleAction * m_paSlideshow;
-	KAction * m_paFileOpen;
-	KAction * m_paFileClose;
+	TDEToggleAction * m_paSlideshow;
+	TDEAction * m_paFileOpen;
+	TDEAction * m_paFileClose;
 
 	TQSortedList<ImageInfo> m_imagelist;
 	bool m_bDontAdd;
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index f5138f55..4dbdbd92 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -46,7 +46,7 @@ KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList &
 		kdDebug( 4630 ) << "m_pViewer->canvas() = " << m_pViewer->canvas() << endl;
 		m_pCanvas = m_pViewer->canvas();
 
-		(void) new KAction( i18n( "&Scale Image..." ), 0, 0,
+		(void) new TDEAction( i18n( "&Scale Image..." ), 0, 0,
 							this, TQT_SLOT( slotScaleDlg() ),
 							actionCollection(), "plugin_scale" );
 	}
diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp
index bf99e282..010296e5 100644
--- a/kview/modules/scanner/kviewscanner.cpp
+++ b/kview/modules/scanner/kviewscanner.cpp
@@ -46,7 +46,7 @@ KViewScanner::KViewScanner( TQObject* parent, const char* name,
 	delete viewerList;
 	if( m_pViewer )
 	{
-		(void) new KAction( i18n( "&Scan Image..." ), "scanner", 0,
+		(void) new TDEAction( i18n( "&Scan Image..." ), "scanner", 0,
 							this, TQT_SLOT( slotScan() ),
 							actionCollection(), "plugin_scan" );
 	}
diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp
index f8277162..78e10595 100644
--- a/kview/modules/template/kviewtemplate.cpp
+++ b/kview/modules/template/kviewtemplate.cpp
@@ -23,7 +23,7 @@ KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQString
 	delete viewerList;
 	if( m_pViewer )
 	{
-		(void) new KAction( /*i18n(*/ "&Do Something" /*)*/, 0, 0,
+		(void) new TDEAction( /*i18n(*/ "&Do Something" /*)*/, 0, 0,
 							this, TQT_SLOT( yourSlot() ),
 							actionCollection(), "plugin_template" );
 	}