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 --- kooka/dwmenuaction.cpp | 4 ++-- kooka/dwmenuaction.h | 6 +++--- kooka/kooka.cpp | 54 +++++++++++++++++++++++++------------------------- kooka/kooka.h | 12 +++++------ kooka/kookaview.cpp | 24 +++++++++++----------- kooka/kookaview.h | 12 +++++------ kooka/scanpackager.cpp | 4 ++-- 7 files changed, 58 insertions(+), 58 deletions(-) (limited to 'kooka') diff --git a/kooka/dwmenuaction.cpp b/kooka/dwmenuaction.cpp index da0cee48..c8e75c00 100644 --- a/kooka/dwmenuaction.cpp +++ b/kooka/dwmenuaction.cpp @@ -31,10 +31,10 @@ #include "dwmenuaction.moc" //------------------------------------- -dwMenuAction::dwMenuAction( const TQString& text, const KShortcut& cut, +dwMenuAction::dwMenuAction( const TQString& text, const TDEShortcut& cut, KDockWidget *dw,TQObject* parent, KDockMainWindow *mw, const char* name ) - :KToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw) + :TDEToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw) { connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); diff --git a/kooka/dwmenuaction.h b/kooka/dwmenuaction.h index fa9b9d66..0430eb29 100644 --- a/kooka/dwmenuaction.h +++ b/kooka/dwmenuaction.h @@ -35,18 +35,18 @@ /** * This class is just a helper class since the KDockWidget classes do not yet - * export KActions but only a TQPopup-Pointer, which is quite useless in case + * export TDEActions but only a TQPopup-Pointer, which is quite useless in case * you have a xml-file driven gui. * This class provides Actions for show and hide parts of the GUI (dockwidgets) * Maybe that classes can be removed as soon the DockWidget know Actions */ -class dwMenuAction:public KToggleAction +class dwMenuAction:public TDEToggleAction { Q_OBJECT public: dwMenuAction( const TQString& text, - const KShortcut& cut = KShortcut(), + const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw=0, TQObject* parent = 0, KDockMainWindow * mw=0, const char* name = 0 ); virtual ~dwMenuAction(); diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 70ff9b21..018fa120 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -137,26 +137,26 @@ actionCollection()); m_view->createDockMenu(actionCollection(), this, "settings_show_docks" ); /* Image Viewer action Toolbar - OCR, Scaling etc. */ - (void) new KAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O, + (void) new TDEAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O, m_view, TQT_SLOT(doOCR()), actionCollection(), "ocrImage" ); - (void) new KAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C, + (void) new TDEAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C, m_view, TQT_SLOT(doOCRonSelection()), actionCollection(), "ocrImageSelect" ); - KAction *act; - act = new KAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I, + TDEAction *act; + act = new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I, m_view, TQT_SLOT( slIVScaleToWidth()), actionCollection(), "scaleToWidth" ); m_view->connectViewerAction( act ); - act = new KAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H, + act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H, m_view, TQT_SLOT( slIVScaleToHeight()), actionCollection(), "scaleToHeight" ); m_view->connectViewerAction( act ); - act = new KAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S, + act = new TDEAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S, m_view, TQT_SLOT( slIVScaleOriginal()), actionCollection(), "scaleOriginal" ); m_view->connectViewerAction( act ); @@ -166,10 +166,10 @@ actionCollection()); TQIconSet lockSet; lockSet.setPixmap(BarIcon("lock") , TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On ); lockSet.setPixmap(BarIcon("unlock"), TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::Off); - act = new KToggleAction ( i18n("Keep &Zoom Setting"), lockSet, CTRL+Key_Z, + act = new TDEToggleAction ( i18n("Keep &Zoom Setting"), lockSet, CTRL+Key_Z, actionCollection(), "keepZoom" ); #else - act = new KToggleAction( i18n("Keep &Zoom Setting"), BarIcon("lockzoom"), CTRL+Key_Z, + act = new TDEToggleAction( i18n("Keep &Zoom Setting"), BarIcon("lockzoom"), CTRL+Key_Z, actionCollection(), "keepZoom" ); #endif @@ -179,93 +179,93 @@ actionCollection()); m_view->connectViewerAction( act ); /* thumbview and gallery actions */ - act = new KAction(i18n("Set Zoom..."), "viewmag", 0, + act = new TDEAction(i18n("Set Zoom..."), "viewmag", 0, TQT_TQOBJECT(m_view), TQT_SLOT( slIVShowZoomDialog()), actionCollection(), "showZoomDialog" ); m_view->connectViewerAction( act ); - (void) new KAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N, + (void) new TDEAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N, TQT_TQOBJECT(m_view), TQT_SLOT( slCreateNewImgFromSelection() ), actionCollection(), "createFromSelection" ); - (void) new KAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V, + (void) new TDEAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V, TQT_TQOBJECT(this), TQT_SLOT( slMirrorVertical() ), actionCollection(), "mirrorVertical" ); - (void) new KAction(i18n("&Mirror ImageQt::Horizontally"), "mirror-horiz", CTRL+Key_M, + (void) new TDEAction(i18n("&Mirror ImageQt::Horizontally"), "mirror-horiz", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT( slMirrorHorizontal() ), actionCollection(), "mirrorHorizontal" ); - (void) new KAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B, + (void) new TDEAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slMirrorBoth() ), actionCollection(), "mirrorBoth" ); - (void) new KAction(i18n("Open Image in &Graphic Application..."), "fileopen", CTRL+Key_G, + (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "fileopen", CTRL+Key_G, TQT_TQOBJECT(m_view), TQT_SLOT( slOpenCurrInGraphApp() ), actionCollection(), "openInGraphApp" ); - act = new KAction(i18n("&Rotate Image Clockwise"), "rotate_cw", CTRL+Key_R, + act = new TDEAction(i18n("&Rotate Image Clockwise"), "rotate_cw", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slRotateClockWise() ), actionCollection(), "rotateClockwise" ); m_view->connectViewerAction( act ); - act = new KAction(i18n("Rotate Image Counter-Clock&wise"), "rotate_ccw", CTRL+Key_W, + act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "rotate_ccw", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slRotateCounterClockWise() ), actionCollection(), "rotateCounterClockwise" ); m_view->connectViewerAction( act ); - act = new KAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D, + act = new TDEAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slRotate180() ), actionCollection(), "upsitedown" ); m_view->connectViewerAction( act ); /* Gallery actions */ - act = new KAction(i18n("&Create Folder..."), "folder_new", 0, + act = new TDEAction(i18n("&Create Folder..."), "folder_new", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotCreateFolder() ), actionCollection(), "foldernew" ); m_view->connectGalleryAction( act ); - act = new KAction(i18n("&Save Image..."), "filesave", 0, + act = new TDEAction(i18n("&Save Image..."), "filesave", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotExportFile() ), actionCollection(), "saveImage" ); m_view->connectGalleryAction( act ); - act = new KAction(i18n("&Import Image..."), "inline_image", 0, + act = new TDEAction(i18n("&Import Image..."), "inline_image", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotImportFile() ), actionCollection(), "importImage" ); m_view->connectGalleryAction( act ); - act = new KAction(i18n("&Delete Image"), "edittrash", 0, + act = new TDEAction(i18n("&Delete Image"), "edittrash", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotDeleteItems() ), actionCollection(), "deleteImage" ); m_view->connectGalleryAction( act ); - act = new KAction(i18n("&Unload Image"), "fileclose", 0, + act = new TDEAction(i18n("&Unload Image"), "fileclose", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotUnloadItems() ), actionCollection(), "unloadImage" ); m_view->connectGalleryAction( act ); #if 0 /* not yet supported actions - coming post 3.1 */ - (void) new KAction(i18n("&Load Scan Parameters"), "bookmark_add", CTRL+Key_L, + (void) new TDEAction(i18n("&Load Scan Parameters"), "bookmark_add", CTRL+Key_L, m_view, TQT_SLOT(slLoadScanParams()), actionCollection(), "loadscanparam" ); - (void) new KAction(i18n("Save &Scan Parameters"), "bookmark_add", CTRL+Key_S, + (void) new TDEAction(i18n("Save &Scan Parameters"), "bookmark_add", CTRL+Key_S, m_view, TQT_SLOT(slSaveScanParams()), actionCollection(), "savescanparam" ); #endif - (void) new KAction(i18n("Select Scan Device"), "scanner", 0, + (void) new TDEAction(i18n("Select Scan Device"), "scanner", 0, TQT_TQOBJECT(m_view), TQT_SLOT( slSelectDevice()), actionCollection(), "selectsource" ); - (void) new KAction( i18n("Enable All Warnings && Messages"), 0, + (void) new TDEAction( i18n("Enable All Warnings && Messages"), 0, TQT_TQOBJECT(this), TQT_SLOT(slEnableWarnings()), actionCollection(), "enable_msgs"); - m_saveOCRTextAction = new KAction( i18n("Save OCR Res&ult Text"), "filesaveas", CTRL+Key_U, + m_saveOCRTextAction = new TDEAction( i18n("Save OCR Res&ult Text"), "filesaveas", CTRL+Key_U, m_view, TQT_SLOT(slSaveOCRResult()), actionCollection(), "saveOCRResult"); } diff --git a/kooka/kooka.h b/kooka/kooka.h index 5d8dc476..6702af62 100644 --- a/kooka/kooka.h +++ b/kooka/kooka.h @@ -40,8 +40,8 @@ #define PREFERENCE_DIA_TAB "PreferencesTab" class KPrinter; -class KToggleAction; -class KActionMenu; +class TDEToggleAction; +class TDEActionMenu; class KookaView; /** @@ -131,11 +131,11 @@ private: KookaView *m_view; KPrinter *m_printer; - KToggleAction *m_scanParamsAction; - KToggleAction *m_previewerAction; - KActionMenu *m_settingsShowDocks; + TDEToggleAction *m_scanParamsAction; + TDEToggleAction *m_previewerAction; + TDEActionMenu *m_settingsShowDocks; - KAction *m_saveOCRTextAction; + TDEAction *m_saveOCRTextAction; int m_prefDialogIndex; }; diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index bdc2a075..d74eed20 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -115,7 +115,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU connect( img_canvas, TQT_SIGNAL( imageReadOnly(bool)), this, TQT_SLOT(slViewerReadOnly(bool))); - KPopupMenu *ctxtmenu = static_cast(img_canvas->contextMenu()); + TDEPopupMenu *ctxtmenu = static_cast(img_canvas->contextMenu()); if( ctxtmenu ) ctxtmenu->insertTitle(i18n("Image View")); m_mainDock->setWidget( img_canvas ); @@ -1013,7 +1013,7 @@ TQImage KookaView::rotate180( TQImage *m_img ) -void KookaView::connectViewerAction( KAction *action ) +void KookaView::connectViewerAction( TDEAction *action ) { TQPopupMenu *popup = img_canvas->contextMenu(); kdDebug(29000) << "This is the popup: " << popup << endl; @@ -1023,7 +1023,7 @@ void KookaView::connectViewerAction( KAction *action ) } } -void KookaView::connectGalleryAction( KAction *action ) +void KookaView::connectGalleryAction( TDEAction *action ) { TQPopupMenu *popup = packager->contextMenu(); @@ -1047,35 +1047,35 @@ void KookaView::slFreshUpThumbView() } } -void KookaView::createDockMenu( KActionCollection *col, KDockMainWindow *mainWin, const char * name ) +void KookaView::createDockMenu( TDEActionCollection *col, KDockMainWindow *mainWin, const char * name ) { - KActionMenu *actionMenu = new KActionMenu( i18n("Tool Views"), "view_icon", col, name ); + TDEActionMenu *actionMenu = new TDEActionMenu( i18n("Tool Views"), "view_icon", col, name ); actionMenu->insert( new dwMenuAction( i18n("Show Image Viewer"), - KShortcut(), m_mainDock, col, + TDEShortcut(), m_mainDock, col, mainWin, "dock_viewer" )); actionMenu->insert( new dwMenuAction( i18n("Show Preview"), - KShortcut(), m_dockPreview, col, + TDEShortcut(), m_dockPreview, col, mainWin, "dock_preview" )); actionMenu->insert( new dwMenuAction( i18n("Show Recent Gallery Folders"), - KShortcut(), m_dockRecent, col, + TDEShortcut(), m_dockRecent, col, mainWin, "dock_recent" )); actionMenu->insert( new dwMenuAction( i18n("Show Gallery"), - KShortcut(), m_dockPackager, col, + TDEShortcut(), m_dockPackager, col, mainWin, "dock_gallery" )); actionMenu->insert( new dwMenuAction( i18n("Show Thumbnail Window"), - KShortcut(), m_dockThumbs, col, + TDEShortcut(), m_dockThumbs, col, mainWin, "dock_thumbs" )); actionMenu->insert( new dwMenuAction( i18n("Show Scan Parameters"), - KShortcut(), m_dockScanParam, col, + TDEShortcut(), m_dockScanParam, col, mainWin, "dock_scanparams" )); actionMenu->insert( new dwMenuAction( i18n("Show OCR Results"), - KShortcut(), m_dockOCRText, col, + TDEShortcut(), m_dockOCRText, col, mainWin, "dock_ocrResults" )); } diff --git a/kooka/kookaview.h b/kooka/kookaview.h index aaccd74a..f084e057 100644 --- a/kooka/kookaview.h +++ b/kooka/kookaview.h @@ -51,8 +51,8 @@ class KSANEOCR; class TDEConfig; class KPrinter; class KComboBox; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class ThumbView; class KookaImage; class TQPixmap; @@ -93,7 +93,7 @@ public: void loadStartupImage( void ); KDockWidget *mainDockWidget( ) { return m_mainDock; } - void createDockMenu( KActionCollection*, KDockMainWindow *, const char *); + void createDockMenu( TDEActionCollection*, KDockMainWindow *, const char *); ScanPackager *gallery() { return packager; } @@ -161,8 +161,8 @@ public slots: */ bool slSelectDevice(const TQCString& useDevice=TQCString()); - void connectViewerAction( KAction *action ); - void connectGalleryAction( KAction *action ); + void connectViewerAction( TDEAction *action ); + void connectGalleryAction( TDEAction *action ); void slScanStart(); void slScanFinished( KScanStat stat ); @@ -234,7 +234,7 @@ private: KDockWidget *m_dockPreview; KDockWidget *m_dockOCRText; - KMainWindow *m_mainWindow; + TDEMainWindow *m_mainWindow; ocrResEdit *m_ocrResEdit; }; diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index ec9ad987..e02ff547 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -126,8 +126,8 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent ) m_startup = true; /* create a context menu and set the title */ - m_contextMenu = new KPopupMenu(); - static_cast(m_contextMenu)->insertTitle( i18n( "Gallery" )); + m_contextMenu = new TDEPopupMenu(); + static_cast(m_contextMenu)->insertTitle( i18n( "Gallery" )); } -- cgit v1.2.3