diff options
Diffstat (limited to 'kuickshow/src')
| -rw-r--r-- | kuickshow/src/imagewindow.cpp | 60 | ||||
| -rw-r--r-- | kuickshow/src/kuickshow.cpp | 20 |
2 files changed, 40 insertions, 40 deletions
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 70b3ffd2..8f957cb9 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -146,103 +146,103 @@ void ImageWindow::updateActions() void ImageWindow::setupActions() { new TDEAction( i18n("Show Next Image"), TDEStdAccel::next(), - TQT_TQOBJECT(this), TQT_SLOT( slotRequestNext() ), + this, TQT_SLOT( slotRequestNext() ), m_actions, "next_image" ); new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(), - TQT_TQOBJECT(this), TQT_SLOT( slotRequestPrevious() ), + this, TQT_SLOT( slotRequestPrevious() ), m_actions, "previous_image" ); new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( imageDelete() ), + this, TQT_SLOT( imageDelete() ), m_actions, "delete_image" ); new TDEAction( i18n("Move Image to Trash"), Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT( imageTrash() ), + this, TQT_SLOT( imageTrash() ), m_actions, "trash_image" ); new TDEAction( i18n("Zoom In"), Key_Plus, - TQT_TQOBJECT(this), TQT_SLOT( zoomIn() ), + this, TQT_SLOT( zoomIn() ), m_actions, "zoom_in" ); new TDEAction( i18n("Zoom Out"), Key_Minus, - TQT_TQOBJECT(this), TQT_SLOT( zoomOut() ), + this, TQT_SLOT( zoomOut() ), m_actions, "zoom_out" ); new TDEAction( i18n("Restore Original Size"), Key_O, - TQT_TQOBJECT(this), TQT_SLOT( showImageOriginalSize() ), + this, TQT_SLOT( showImageOriginalSize() ), m_actions, "original_size" ); new TDEAction( i18n("Maximize"), Key_M, - TQT_TQOBJECT(this), TQT_SLOT( maximize() ), + this, TQT_SLOT( maximize() ), m_actions, "maximize" ); new TDEAction( i18n("Rotate 90 Degrees"), Key_9, - TQT_TQOBJECT(this), TQT_SLOT( rotate90() ), + this, TQT_SLOT( rotate90() ), m_actions, "rotate90" ); new TDEAction( i18n("Rotate 180 Degrees"), Key_8, - TQT_TQOBJECT(this), TQT_SLOT( rotate180() ), + this, TQT_SLOT( rotate180() ), m_actions, "rotate180" ); new TDEAction( i18n("Rotate 270 Degrees"), Key_7, - TQT_TQOBJECT(this), TQT_SLOT( rotate270() ), + this, TQT_SLOT( rotate270() ), m_actions, "rotate270" ); new TDEAction( i18n("Flip Horizontally"), Key_Asterisk, - TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ), + this, TQT_SLOT( flipHoriz() ), m_actions, "flip_horicontally" ); new TDEAction( i18n("Flip Vertically"), Key_Slash, - TQT_TQOBJECT(this), TQT_SLOT( flipVert() ), + this, TQT_SLOT( flipVert() ), m_actions, "flip_vertically" ); new TDEAction( i18n("Print Image..."), TDEStdAccel::print(), - TQT_TQOBJECT(this), TQT_SLOT( printImage() ), + this, TQT_SLOT( printImage() ), m_actions, "print_image" ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveImage() ), + KStdAction::saveAs( this, TQT_SLOT( saveImage() ), m_actions, "save_image_as" ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), + KStdAction::close( this, TQT_SLOT( close() ), m_actions, "close_image" ); // -------- new TDEAction( i18n("More Brightness"), Key_B, - TQT_TQOBJECT(this), TQT_SLOT( moreBrightness() ), + this, TQT_SLOT( moreBrightness() ), m_actions, "more_brightness" ); new TDEAction( i18n("Less Brightness"), SHIFT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT( lessBrightness() ), + this, TQT_SLOT( lessBrightness() ), m_actions, "less_brightness" ); new TDEAction( i18n("More Contrast"), Key_C, - TQT_TQOBJECT(this), TQT_SLOT( moreContrast() ), + this, TQT_SLOT( moreContrast() ), m_actions, "more_contrast" ); new TDEAction( i18n("Less Contrast"), SHIFT + Key_C, - TQT_TQOBJECT(this), TQT_SLOT( lessContrast() ), + this, TQT_SLOT( lessContrast() ), m_actions, "less_contrast" ); new TDEAction( i18n("More Gamma"), Key_G, - TQT_TQOBJECT(this), TQT_SLOT( moreGamma() ), + this, TQT_SLOT( moreGamma() ), m_actions, "more_gamma" ); new TDEAction( i18n("Less Gamma"), SHIFT + Key_G, - TQT_TQOBJECT(this), TQT_SLOT( lessGamma() ), + this, TQT_SLOT( lessGamma() ), m_actions, "less_gamma" ); // -------- new TDEAction( i18n("Scroll Up"), Key_Up, - TQT_TQOBJECT(this), TQT_SLOT( scrollUp() ), + this, TQT_SLOT( scrollUp() ), m_actions, "scroll_up" ); new TDEAction( i18n("Scroll Down"), Key_Down, - TQT_TQOBJECT(this), TQT_SLOT( scrollDown() ), + this, TQT_SLOT( scrollDown() ), m_actions, "scroll_down" ); new TDEAction( i18n("Scroll Left"), Key_Left, - TQT_TQOBJECT(this), TQT_SLOT( scrollLeft() ), + this, TQT_SLOT( scrollLeft() ), m_actions, "scroll_left" ); new TDEAction( i18n("Scroll Right"), Key_Right, - TQT_TQOBJECT(this), TQT_SLOT( scrollRight() ), + this, TQT_SLOT( scrollRight() ), m_actions, "scroll_right" ); // -------- new TDEAction( i18n("Pause Slideshow"), Key_P, - TQT_TQOBJECT(this), TQT_SLOT( pauseSlideShow() ), + this, TQT_SLOT( pauseSlideShow() ), m_actions, "kuick_slideshow_pause" ); - TDEAction *fullscreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT( toggleFullscreen() ), m_actions, 0 ); + TDEAction *fullscreenAction = KStdAction::fullScreen(this, TQT_SLOT( toggleFullscreen() ), m_actions, 0 ); TDEAction *reloadAction = new TDEAction( i18n("Reload Image"), TDEStdAccel::shortcut(TDEStdAccel::Reload), - TQT_TQOBJECT(this), TQT_SLOT( reload() ), + this, TQT_SLOT( reload() ), m_actions, "reload_image" ); new TDEAction( i18n("Properties"), ALT + Key_Return, - TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), + this, TQT_SLOT( slotProperties() ), m_actions, "properties" ); m_actions->readShortcutSettings(); diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 7023eb84..6e48642a 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -246,24 +246,24 @@ void KuickShow::initGUI( const KURL& startDir ) this, TQT_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) ); // setup actions - TDEAction *open = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenURL() ), + TDEAction *open = KStdAction::open( this, TQT_SLOT( slotOpenURL() ), coll, "openURL" ); - TDEAction *print = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), + TDEAction *print = KStdAction::print( this, TQT_SLOT( slotPrint() ), coll, "kuick_print" ); print->setText( i18n("Print Image...") ); TDEAction *configure = new TDEAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( configuration() ), + this, TQT_SLOT( configuration() ), coll, "kuick_configure" ); TDEAction *slide = new TDEAction( i18n("Start Slideshow" ), "ksslide", TDEShortcut( Key_F2 ), - TQT_TQOBJECT(this), TQT_SLOT( startSlideShow() ), + this, TQT_SLOT( startSlideShow() ), coll, "kuick_slideshow" ); TDEAction *about = new TDEAction( i18n( "About KuickShow" ), "about", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( about() ), coll, "about" ); + this, TQT_SLOT( about() ), coll, "about" ); oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"), "window-new", @@ -276,17 +276,17 @@ void KuickShow::initGUI( const KURL& startDir ) TQT_SLOT( toggleBrowser() )); TDEAction *showInOther = new TDEAction( i18n("Show Image"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotShowInOtherWindow() ), + this, TQT_SLOT( slotShowInOtherWindow() ), coll, "kuick_showInOtherWindow" ); TDEAction *showInSame = new TDEAction( i18n("Show Image in Active Window"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotShowInSameWindow() ), + this, TQT_SLOT( slotShowInSameWindow() ), coll, "kuick_showInSameWindow" ); TDEAction *showFullscreen = new TDEAction( i18n("Show Image in Fullscreen Mode"), - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotShowFullscreen() ), + TDEShortcut(), this, TQT_SLOT( slotShowFullscreen() ), coll, "kuick_showFullscreen" ); - TDEAction *quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit"); + TDEAction *quit = KStdAction::quit( this, TQT_SLOT(slotQuit()), coll, "quit"); // remove TQString() parameter -- ellis coll->readShortcutSettings( TQString() ); @@ -1300,7 +1300,7 @@ void KuickShow::slotReplayEvent() DelayedRepeatEvent *e = m_delayedRepeatItem; m_delayedRepeatItem = 0L; // otherwise, eventFilter aborts - eventFilter( TQT_TQOBJECT(e->viewer), static_cast<TQEvent*>(e->event) ); + eventFilter( e->viewer, static_cast<TQEvent*>(e->event) ); delete e; // ### WORKAROUND for TQIconView bug in TQt <= 3.0.3 at least |