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/kview.cpp | 30 +++++++++++------------ kview/kview.h | 20 ++++++++-------- kview/kviewcanvas/config/generalconfigwidget.ui | 2 +- kview/kviewviewer/kviewviewer.cpp | 24 +++++++++---------- kview/kviewviewer/kviewviewer.h | 32 ++++++++++++------------- kview/modules/browser/kviewbrowser.h | 6 ++--- kview/modules/effects/kvieweffects.cpp | 6 ++--- 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 ++++---- kview/modules/scale/kview_scale.cpp | 2 +- kview/modules/scanner/kviewscanner.cpp | 2 +- kview/modules/template/kviewtemplate.cpp | 2 +- kview/photobook/photobook.h | 6 ++--- 17 files changed, 84 insertions(+), 84 deletions(-) (limited to 'kview') diff --git a/kview/kview.cpp b/kview/kview.cpp index 21b851c3..f03b6a07 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -163,7 +163,7 @@ void KView::load( const KURL & url ) if( url.isLocalFile() ) { // XXX: this code is what - //KRecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() ); + //TDERecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() ); // would do: TQString directory = url.directory(); TQString key = TQString::fromLatin1( "load_image" ); @@ -403,7 +403,7 @@ void KView::reloadConfig() void KView::enableAction( const char * name, bool b ) { - KAction * a = actionCollection()->action( name ); + TDEAction * a = actionCollection()->action( name ); if( a ) a->setEnabled( b ); else @@ -491,7 +491,7 @@ void KView::setupActions( TQObject * partobject ) // File KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenFile() ), actionCollection() ); m_paRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); - KAction * aClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); + TDEAction * aClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); aClose->setEnabled( false ); connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aClose, TQT_SLOT( setEnabled( bool ) ) ); @@ -502,22 +502,22 @@ void KView::setupActions( TQObject * partobject ) if( slotNames.contains( "print()" ) ) KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" ); if( slotNames.contains( "del()" ) ) - ( void )new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, + ( void )new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, extension, TQT_SLOT( del() ), actionCollection(), "del" ); connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) ); } KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); // Edit - KAction * aCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); + TDEAction * aCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); aCopy->setEnabled( false ); connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aCopy, TQT_SLOT( setEnabled( bool ) ) ); m_paPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), actionCollection() ); clipboardDataChanged(); //enable or disable paste - KAction * aCrop = new KAction( i18n( "Cr&op" ), Key_C, TQT_TQOBJECT(this), TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); + TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, TQT_TQOBJECT(this), TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); aCrop->setEnabled( false ); - KAction * aReload = new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut( KStdAccel::Reload ), partobject, + TDEAction * aReload = new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), partobject, TQT_SLOT( reload() ), actionCollection(), "reload" ); aReload->setEnabled( false ); connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aReload, TQT_SLOT( setEnabled( bool ) ) ); @@ -525,7 +525,7 @@ void KView::setupActions( TQObject * partobject ) // Settings m_paShowMenubar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); createStandardStatusBarAction(); - m_paShowStatusBar = ::tqqt_cast( action( "options_show_statusbar" ) ); + m_paShowStatusBar = ::tqqt_cast( action( "options_show_statusbar" ) ); if( m_paShowStatusBar ) connect( m_paShowStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( statusbarToggled( bool ) ) ); m_paShowFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); @@ -644,20 +644,20 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from ) { switch( toolBar()->barPos() ) { - case KToolBar::Top: - case KToolBar::Bottom: + case TDEToolBar::Top: + case TDEToolBar::Bottom: height += toolBar()->height(); break; - case KToolBar::Left: - case KToolBar::Right: + case TDEToolBar::Left: + case TDEToolBar::Right: width += toolBar()->width(); break; - case KToolBar::Flat: + case TDEToolBar::Flat: height += kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ); break; - case KToolBar::Floating: + case TDEToolBar::Floating: break; - case KToolBar::Unmanaged: + case TDEToolBar::Unmanaged: break; } } diff --git a/kview/kview.h b/kview/kview.h index dd5bacd7..2a024026 100644 --- a/kview/kview.h +++ b/kview/kview.h @@ -33,9 +33,9 @@ namespace KImageViewer { } class TQSize; class TQRect; -class KAction; -class KToggleAction; -class KRecentFilesAction; +class TDEAction; +class TDEToggleAction; +class TDERecentFilesAction; class KWinModule; class TQStringList; class KProgress; @@ -105,13 +105,13 @@ class KView : public KParts::MainWindow KWinModule * m_pWinModule; // Actions: - KAction * m_paOpenFile; - KAction * m_paPaste; - KRecentFilesAction * m_paRecent; - KAction * m_paQuit; - KToggleFullScreenAction * m_paShowFullScreen; - KToggleAction * m_paShowMenubar; - KToggleAction * m_paShowStatusBar; + TDEAction * m_paOpenFile; + TDEAction * m_paPaste; + TDERecentFilesAction * m_paRecent; + TDEAction * m_paQuit; + TDEToggleFullScreenAction * m_paShowFullScreen; + TDEToggleAction * m_paShowMenubar; + TDEToggleAction * m_paShowStatusBar; int m_nResizeMode; bool m_bImageSizeChangedBlocked; diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui index 108ed82e..37d4b0f5 100644 --- a/kview/kviewcanvas/config/generalconfigwidget.ui +++ b/kview/kviewcanvas/config/generalconfigwidget.ui @@ -152,7 +152,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a Choose which blend effects should be used: - + Effect diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 4e318342..3495adbf 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -465,33 +465,33 @@ bool KViewViewer::saveFile() void KViewViewer::setupActions() { - m_paZoomIn = new KAction( i18n( "Zoom In" ), "viewmag+", KStdAccel::shortcut( KStdAccel::ZoomIn ), this, + m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "viewmag+", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this, TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" ); - m_paZoomOut = new KAction( i18n( "Zoom Out" ), "viewmag-", KStdAccel::shortcut( KStdAccel::ZoomOut ), this, + m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "viewmag-", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this, TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" ); - m_paZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); + m_paZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); connect( m_paZoom, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( setZoom( const TQString & ) ) ); m_paZoom->setEditable( true ); m_paZoom->clear(); m_paZoom->setItems( TQStringList::split( '|', "20%|25%|33%|50%|75%|100%|125%|150%|200%|250%|300%|350%|400%|450%|500%" ) ); m_paZoom->setCurrentItem( 5 ); - m_paFlipMenu = new KActionMenu( i18n( "&Flip" ), actionCollection(), "flip" ); - m_paFlipV = new KAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" ); - m_paFlipH = new KAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" ); + m_paFlipMenu = new TDEActionMenu( i18n( "&Flip" ), actionCollection(), "flip" ); + m_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" ); + m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" ); m_paFlipMenu->insert( m_paFlipV ); m_paFlipMenu->insert( m_paFlipH ); - m_paRotateCCW = new KAction( i18n( "Ro&tate Counter-Clockwise" ), "rotate_ccw", 0, this, + m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "rotate_ccw", 0, this, TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" ); - m_paRotateCW = new KAction( i18n( "Rotate Clockwise" ), "rotate_cw", 0, this, + m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "rotate_cw", 0, this, TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" ); m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() ); m_paSave->setEnabled( false ); m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveAs() ), actionCollection() ); - m_paFitToWin = new KAction( i18n( "Fit Image to Window" ), 0, 0, this, + m_paFitToWin = new TDEAction( i18n( "Fit Image to Window" ), 0, 0, this, TQT_SLOT( slotFitToWin() ), actionCollection(), "fittowin" ); m_paZoomIn->setEnabled( false ); m_paZoomOut->setEnabled( false ); @@ -514,7 +514,7 @@ void KViewViewer::setupActions() connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipV, TQT_SLOT( setEnabled( bool ) ) ); connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipH, TQT_SLOT( setEnabled( bool ) ) ); - m_paShowScrollbars = new KToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ), + m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ), actionCollection(), "show_scrollbars" ); m_paShowScrollbars->setCheckedState(i18n("Hide Scrollbars")); } @@ -622,7 +622,7 @@ void KViewViewer::slotSaveAs() m_newMimeType = KImageIO::mimeType( url.path() ); kdDebug( 4610 ) << k_funcinfo << "m_newMimeType = " << m_newMimeType << endl; if( url.isValid() ) - KRecentDocument::add( url ); + TDERecentDocument::add( url ); saveAs( url ); } @@ -754,7 +754,7 @@ void KViewViewer::slotPopupMenu( const TQPoint &pos ) { KXMLGUIClient *popupGUIClient = new PopupGUIClient( instance(), m_popupDoc ); - (void) new KAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ), + (void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ), popupGUIClient->actionCollection(), "saveimageas" ); // ### HACK treat the image as dir to get the back/fwd/reload buttons (Simon) diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index 54f08e88..58cb1c1c 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -31,10 +31,10 @@ namespace KImageViewer { class Canvas; } namespace TDEIO { class Job; } class KTempFile; -class KAction; -class KActionMenu; -class KToggleAction; -class KSelectAction; +class TDEAction; +class TDEActionMenu; +class TDEToggleAction; +class TDESelectAction; class TDEAboutData; class TQBuffer; class TQSize; @@ -120,18 +120,18 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf KDirWatch * m_pFileWatch; // Actions: - KAction * m_paZoomIn; - KAction * m_paZoomOut; - KSelectAction * m_paZoom; - KActionMenu * m_paFlipMenu; - KAction * m_paFlipH; - KAction * m_paFlipV; - KAction * m_paRotateCCW; - KAction * m_paRotateCW; - KAction * m_paSave; - KAction * m_paSaveAs; - KAction * m_paFitToWin; - KToggleAction * m_paShowScrollbars; + TDEAction * m_paZoomIn; + TDEAction * m_paZoomOut; + TDESelectAction * m_paZoom; + TDEActionMenu * m_paFlipMenu; + TDEAction * m_paFlipH; + TDEAction * m_paFlipV; + TDEAction * m_paRotateCCW; + TDEAction * m_paRotateCW; + TDEAction * m_paSave; + TDEAction * m_paSaveAs; + TDEAction * m_paFitToWin; + TDEToggleAction * m_paShowScrollbars; TQString m_popupDoc; TQString m_mimeType; 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 @@ 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; 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" ); } diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index e19abe36..e931ecf8 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -55,7 +55,7 @@ class PhotoBook : public TQSplitter Q_OBJECT Previews *mList; - KAction *mFit; + TDEAction *mFit; KParts::ReadOnlyPart *mViewer; public: @@ -110,8 +110,8 @@ class PhotoBookPart : public KParts::ReadOnlyPart Q_OBJECT PhotoBook *bv; - KAction *m_pPreviousAction; - KAction *m_pNextAction; + TDEAction *m_pPreviousAction; + TDEAction *m_pNextAction; public: PhotoBookPart( -- cgit v1.2.3