From 65eca7929c22f0f0bc64135c02d85d1243df376c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:51 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kview/modules/presenter/DESIGN | 4 ++-- kview/modules/presenter/imagelistdialog.ui | 2 +- kview/modules/presenter/imagelistitem.cpp | 4 ++-- kview/modules/presenter/imagelistitem.h | 4 ++-- kview/modules/presenter/kviewpresenter.cpp | 12 ++++++------ kview/modules/presenter/kviewpresenter.h | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kview/modules/presenter') 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 @@ unnamed - + URL 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 -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 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 m_imagelist; bool m_bDontAdd; -- cgit v1.2.1