1 files changed, 37 insertions, 37 deletions
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 2c227063..f344dbc1 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -53,7 +53,7 @@
 #include <kpropertiesdialog.h>
 #include <tdestdaccel.h>
 #include <kstdguiitem.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeglobalsettings.h>
 #include <tdetempfile.h>
 #include <twin.h>
@@ -94,14 +94,14 @@ ImageWindow::~ImageWindow()
 
 void ImageWindow::init()
 {
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
     
     KCursor::setAutoHideCursor( this, true, true );
     KCursor::setHideCursorDelay( 1500 );
 
     // give the image window a different WM_CLASS
     XClassHint hint;
-    hint.res_name = const_cast<char*>( kapp->name() );
+    hint.res_name = const_cast<char*>( tdeApp->name() );
     hint.res_class = const_cast<char*>( "ImageWindow" );
     XSetClassHint( x11Display(), winId(), &hint );
 
@@ -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, TQ_SLOT( slotRequestNext() ),
                  m_actions, "next_image" );
     new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(),
-                 TQT_TQOBJECT(this), TQT_SLOT( slotRequestPrevious() ),
+                 this, TQ_SLOT( slotRequestPrevious() ),
                  m_actions, "previous_image" );
 
     new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete,
-                 TQT_TQOBJECT(this), TQT_SLOT( imageDelete() ),
+                 this, TQ_SLOT( imageDelete() ),
                  m_actions, "delete_image" );
     new TDEAction( i18n("Move Image to Trash"), Key_Delete,
-                 TQT_TQOBJECT(this), TQT_SLOT( imageTrash() ),
+                 this, TQ_SLOT( imageTrash() ),
                  m_actions, "trash_image" );
 
     new TDEAction( i18n("Zoom In"), Key_Plus,
-                 TQT_TQOBJECT(this), TQT_SLOT( zoomIn() ),
+                 this, TQ_SLOT( zoomIn() ),
                  m_actions, "zoom_in" );
     new TDEAction( i18n("Zoom Out"), Key_Minus,
-                 TQT_TQOBJECT(this), TQT_SLOT( zoomOut() ),
+                 this, TQ_SLOT( zoomOut() ),
                  m_actions, "zoom_out" );
     new TDEAction( i18n("Restore Original Size"), Key_O,
-                 TQT_TQOBJECT(this), TQT_SLOT( showImageOriginalSize() ),
+                 this, TQ_SLOT( showImageOriginalSize() ),
                  m_actions, "original_size" );
     new TDEAction( i18n("Maximize"), Key_M,
-                 TQT_TQOBJECT(this), TQT_SLOT( maximize() ),
+                 this, TQ_SLOT( maximize() ),
                  m_actions, "maximize" );
 
     new TDEAction( i18n("Rotate 90 Degrees"), Key_9,
-                 TQT_TQOBJECT(this), TQT_SLOT( rotate90() ),
+                 this, TQ_SLOT( rotate90() ),
                  m_actions, "rotate90" );
     new TDEAction( i18n("Rotate 180 Degrees"), Key_8,
-                 TQT_TQOBJECT(this), TQT_SLOT( rotate180() ),
+                 this, TQ_SLOT( rotate180() ),
                  m_actions, "rotate180" );
     new TDEAction( i18n("Rotate 270 Degrees"), Key_7,
-                 TQT_TQOBJECT(this), TQT_SLOT( rotate270() ),
+                 this, TQ_SLOT( rotate270() ),
                  m_actions, "rotate270" );
 
     new TDEAction( i18n("Flip Horizontally"), Key_Asterisk,
-                 TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ),
+                 this, TQ_SLOT( flipHoriz() ),
                  m_actions, "flip_horicontally" );
     new TDEAction( i18n("Flip Vertically"), Key_Slash,
-                 TQT_TQOBJECT(this), TQT_SLOT( flipVert() ),
+                 this, TQ_SLOT( flipVert() ),
                  m_actions, "flip_vertically" );
 
     new TDEAction( i18n("Print Image..."), TDEStdAccel::print(),
-                 TQT_TQOBJECT(this), TQT_SLOT( printImage() ),
+                 this, TQ_SLOT( printImage() ),
                  m_actions, "print_image" );
-    KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveImage() ),
+    KStdAction::saveAs( this, TQ_SLOT( saveImage() ),
                  m_actions, "save_image_as" );
 
-    KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ),
+    KStdAction::close( this, TQ_SLOT( close() ),
                  m_actions, "close_image" );
     // --------
     new TDEAction( i18n("More Brightness"), Key_B,
-                 TQT_TQOBJECT(this), TQT_SLOT( moreBrightness() ),
+                 this, TQ_SLOT( moreBrightness() ),
                  m_actions, "more_brightness" );
     new TDEAction( i18n("Less Brightness"), SHIFT + Key_B,
-                 TQT_TQOBJECT(this), TQT_SLOT( lessBrightness() ),
+                 this, TQ_SLOT( lessBrightness() ),
                  m_actions, "less_brightness" );
     new TDEAction( i18n("More Contrast"), Key_C,
-                 TQT_TQOBJECT(this), TQT_SLOT( moreContrast() ),
+                 this, TQ_SLOT( moreContrast() ),
                  m_actions, "more_contrast" );
     new TDEAction( i18n("Less Contrast"), SHIFT + Key_C,
-                 TQT_TQOBJECT(this), TQT_SLOT( lessContrast() ),
+                 this, TQ_SLOT( lessContrast() ),
                  m_actions, "less_contrast" );
     new TDEAction( i18n("More Gamma"), Key_G,
-                 TQT_TQOBJECT(this), TQT_SLOT( moreGamma() ),
+                 this, TQ_SLOT( moreGamma() ),
                  m_actions, "more_gamma" );
     new TDEAction( i18n("Less Gamma"), SHIFT + Key_G,
-                 TQT_TQOBJECT(this), TQT_SLOT( lessGamma() ),
+                 this, TQ_SLOT( lessGamma() ),
                  m_actions, "less_gamma" );
 
     // --------
     new TDEAction( i18n("Scroll Up"), Key_Up,
-                 TQT_TQOBJECT(this), TQT_SLOT( scrollUp() ),
+                 this, TQ_SLOT( scrollUp() ),
                  m_actions, "scroll_up" );
     new TDEAction( i18n("Scroll Down"), Key_Down,
-                 TQT_TQOBJECT(this), TQT_SLOT( scrollDown() ),
+                 this, TQ_SLOT( scrollDown() ),
                  m_actions, "scroll_down" );
     new TDEAction( i18n("Scroll Left"), Key_Left,
-                 TQT_TQOBJECT(this), TQT_SLOT( scrollLeft() ),
+                 this, TQ_SLOT( scrollLeft() ),
                  m_actions, "scroll_left" );
     new TDEAction( i18n("Scroll Right"), Key_Right,
-                 TQT_TQOBJECT(this), TQT_SLOT( scrollRight() ),
+                 this, TQ_SLOT( scrollRight() ),
                  m_actions, "scroll_right" );
     // --------
     new TDEAction( i18n("Pause Slideshow"), Key_P,
-                 TQT_TQOBJECT(this), TQT_SLOT( pauseSlideShow() ),
+                 this, TQ_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, TQ_SLOT( toggleFullscreen() ), m_actions, 0 );
 
     TDEAction *reloadAction = new TDEAction( i18n("Reload Image"), TDEStdAccel::shortcut(TDEStdAccel::Reload),
-                                         TQT_TQOBJECT(this), TQT_SLOT( reload() ),
+                                         this, TQ_SLOT( reload() ),
                                          m_actions, "reload_image" );
 
     new TDEAction( i18n("Properties"), ALT + Key_Return,
-                 TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ),
+                 this, TQ_SLOT( slotProperties() ),
                  m_actions, "properties" );
 
     m_actions->readShortcutSettings();
@@ -312,7 +312,7 @@ void ImageWindow::updateGeometry( int imWidth, int imHeight )
                             "%3 (%1 x %2)" );
     caption = caption.arg( m_kuim->originalWidth() ).
               arg( m_kuim->originalHeight() ).arg( m_kuim->url().prettyURL() );
-    setCaption( kapp->makeStdCaption( caption ) );
+    setCaption( tdeApp->makeStdCaption( caption ) );
 }
 
 
@@ -630,7 +630,7 @@ void ImageWindow::mousePressEvent( TQMouseEvent *e )
     xposPress = xmove;
     yposPress = ymove;
 
-    if ( e->button() == Qt::LeftButton ) {
+    if ( e->button() == TQt::LeftButton ) {
         if ( e->state() & ShiftButton )
             updateCursor( ZoomCursor );
         else
@@ -675,7 +675,7 @@ void ImageWindow::updateCursor( KuickCursor cursor )
 
 void ImageWindow::mouseMoveEvent( TQMouseEvent *e )
 {
-    if ( !(e->state() & Qt::LeftButton) ) { // only handle LeftButton actions
+    if ( !(e->state() & TQt::LeftButton) ) { // only handle LeftButton actions
 	return;
     }
 
@@ -736,7 +736,7 @@ void ImageWindow::mouseReleaseEvent( TQMouseEvent *e )
     }
 
     // only proceed if shift-Key is still pressed
-    if ( !(e->button() == Qt::LeftButton && e->state() & ShiftButton) )
+    if ( !(e->button() == TQt::LeftButton && e->state() & ShiftButton) )
 	return;
 
     int neww, newh, topX, topY, botX, botY;