diff options
Diffstat (limited to 'kview')
46 files changed, 291 insertions, 302 deletions
@@ -22,7 +22,7 @@ around with internals like the presenter plugin does. - This would make preloading (and caching) the images possible. - Caching: currently the canvas doesn't do anything with files while the - viewer only calls QImage( QByteArray ) or QImage( filename ). Therefor the + viewer only calls TQImage( QByteArray ) or TQImage( filename ). Therefor the Viewer has to cache the loading of images while the canvas would have to cache the zoomed images and pixmaps. It would be no problem to make the canvas work on files and bytearrays @@ -36,12 +36,12 @@ Something like: class Effect { - QString dialogTitle() const = 0; - QWidget * dialogWidget() = 0; + TQString dialogTitle() const = 0; + TQWidget * dialogWidget() = 0; /* @returns whether @ref applyEffect() would create the same image as * last time or a changed one */ bool changed() const = 0; - void applyEffect( QImage & ) = 0; + void applyEffect( TQImage & ) = 0; }; - Brightness Adjustment - Greyscale conversion diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index 1c2bcec5..2889e4d4 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -39,7 +39,7 @@ KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/ m_pResizeGroup = new TQVButtonGroup( i18n( "Resizing" ), this ); m_pResizeGroup->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - connect( m_pResizeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( resizeChanged( int ) ) ); + connect( m_pResizeGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( resizeChanged( int ) ) ); layout->addWidget( m_pResizeGroup ); ( void )new TQRadioButton( i18n( "Only resize window" ), m_pResizeGroup ); diff --git a/kview/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h index e1cc5047..57db099d 100644 --- a/kview/config/kviewconfmodules.h +++ b/kview/config/kviewconfmodules.h @@ -25,7 +25,7 @@ class TQVButtonGroup; class KViewGeneralConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KViewGeneralConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h index f326be83..6666f35d 100644 --- a/kview/config/plugins/kviewpluginsconfig.h +++ b/kview/config/plugins/kviewpluginsconfig.h @@ -25,7 +25,7 @@ class TDEConfig; class KViewPluginsConfig : public KSettings::PluginPage { - Q_OBJECT + TQ_OBJECT public: KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h index 81417c9f..b697c01e 100644 --- a/kview/kimageviewer/canvas.h +++ b/kview/kimageviewer/canvas.h @@ -29,7 +29,7 @@ class TQPoint; class TQWidget; #include <tqstring.h> -#include <tqobjdefs.h> +#include <tqobjectdefs.h> #include <kdemacros.h> namespace KImageViewer { @@ -55,8 +55,8 @@ namespace KImageViewer kapp->quit(); } setCentralWidget( widget ); - connect( widget, TQT_SIGNAL( contextPress( const TQPoint & ) ), TQT_SLOT( mySlot( const TQPoint & ) ) ); - connect( m_canvas->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ), TQT_SLOT( mySlot( const TQPoint & ) ) ); + connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ), TQ_SLOT( mySlot( const TQPoint & ) ) ); + connect( m_canvas->widget(), TQ_SIGNAL( contextPress( const TQPoint & ) ), TQ_SLOT( mySlot( const TQPoint & ) ) ); </pre> * * You can't connect signals or slots using KImageViewer::Canvas, because this interface diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h index 46e1a548..7334c16b 100644 --- a/kview/kimageviewer/viewer.h +++ b/kview/kimageviewer/viewer.h @@ -47,7 +47,7 @@ namespace KImageViewer */ class KDE_EXPORT Viewer : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: Viewer( TQObject * parent = 0, const char * name = 0 ); diff --git a/kview/kview.cpp b/kview/kview.cpp index 063a0e14..34dd83ee 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -59,12 +59,12 @@ KView::KView() : KParts::MainWindow( 0, "KView" ) , m_pViewer( 0 ) , m_pCanvas( 0 ) - , m_pWinModule( new KWinModule( TQT_TQOBJECT(this), KWinModule::INFO_DESKTOP ) ) + , m_pWinModule( new KWinModule( this, KWinModule::INFO_DESKTOP ) ) , m_bImageSizeChangedBlocked( false ) , m_bFullscreen( false ) { KParts::ReadWritePart * part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( - "libkviewviewer", this, "KViewViewer Widget", TQT_TQOBJECT(this), "KImageViewer Part" ); + "libkviewviewer", this, "KViewViewer Widget", this, "KImageViewer Part" ); if( part ) { m_pViewer = static_cast<KImageViewer::Viewer *>( part ); @@ -82,28 +82,28 @@ KView::KView() setStandardToolBarMenuEnabled( true ); - connect( part->widget(), TQT_SIGNAL( imageSizeChanged( const TQSize & ) ), - TQT_SLOT( imageSizeChanged( const TQSize & ) ) ); - connect( part->widget(), TQT_SIGNAL( selectionChanged( const TQRect & ) ), - TQT_SLOT( selectionChanged( const TQRect & ) ) ); - connect( part->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ), - TQT_SLOT( contextPress( const TQPoint & ) ) ); - - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( clipboardDataChanged() ) ); - - connect( m_pViewer, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( jobStarted( TDEIO::Job * ) ) ); - connect( m_pViewer, TQT_SIGNAL( completed() ), - this, TQT_SLOT( jobCompleted() ) ); - connect( m_pViewer, TQT_SIGNAL( completed( bool ) ), - this, TQT_SLOT( jobCompleted( bool ) ) ); - connect( m_pViewer, TQT_SIGNAL( canceled( const TQString & ) ), - this, TQT_SLOT( jobCanceled( const TQString & ) ) ); - connect( m_pViewer, TQT_SIGNAL( imageOpened( const KURL & ) ), - m_paRecent, TQT_SLOT( addURL( const KURL & ) ) ); - - connect( m_pCanvas->widget(), TQT_SIGNAL( cursorPos( const TQPoint & ) ), TQT_SLOT( cursorPos( const TQPoint & ) ) ); + connect( part->widget(), TQ_SIGNAL( imageSizeChanged( const TQSize & ) ), + TQ_SLOT( imageSizeChanged( const TQSize & ) ) ); + connect( part->widget(), TQ_SIGNAL( selectionChanged( const TQRect & ) ), + TQ_SLOT( selectionChanged( const TQRect & ) ) ); + connect( part->widget(), TQ_SIGNAL( contextPress( const TQPoint & ) ), + TQ_SLOT( contextPress( const TQPoint & ) ) ); + + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( clipboardDataChanged() ) ); + + connect( m_pViewer, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( jobStarted( TDEIO::Job * ) ) ); + connect( m_pViewer, TQ_SIGNAL( completed() ), + this, TQ_SLOT( jobCompleted() ) ); + connect( m_pViewer, TQ_SIGNAL( completed( bool ) ), + this, TQ_SLOT( jobCompleted( bool ) ) ); + connect( m_pViewer, TQ_SIGNAL( canceled( const TQString & ) ), + this, TQ_SLOT( jobCanceled( const TQString & ) ) ); + connect( m_pViewer, TQ_SIGNAL( imageOpened( const KURL & ) ), + m_paRecent, TQ_SLOT( addURL( const KURL & ) ) ); + + connect( m_pCanvas->widget(), TQ_SIGNAL( cursorPos( const TQPoint & ) ), TQ_SLOT( cursorPos( const TQPoint & ) ) ); m_paRecent->loadEntries( TDEGlobal::config() ); if (!initialGeometrySet()) @@ -112,7 +112,7 @@ KView::KView() m_pViewer->widget()->installEventFilter( this ); // reload configuration when it's changed by the conf dlg - KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this), TQT_SLOT( readSettings() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( readSettings() ) ); setPluginLoadingMode( LoadPluginsIfEnabled ); createGUI( part ); @@ -145,7 +145,7 @@ KView::KView() else { KMessageBox::error( this, i18n( "An error occurred while loading the KViewViewer KPart. Check your installation." ) ); - TQTimer::singleShot( 0, kapp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 0, kapp, TQ_SLOT( quit() ) ); } } @@ -251,7 +251,7 @@ void KView::readSettings() // TDEConfig * config ) bool KView::eventFilter( TQObject * obj, TQEvent * ev ) { - if( ev->type() == TQEvent::Resize && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) ) + if( ev->type() == TQEvent::Resize && obj == m_pViewer->widget() ) { if( m_nResizeMode == ResizeImage ) handleResize(); @@ -387,7 +387,7 @@ void KView::slotConfigureToolbars() { saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar dlg( factory() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } @@ -422,9 +422,9 @@ void KView::jobStarted( TDEIO::Job * job ) { if( job ) { - connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( loadingProgress( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( speedProgress( TDEIO::Job *, unsigned long ) ) ); - //connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT() ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( loadingProgress( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( speedProgress( TDEIO::Job *, unsigned long ) ) ); + //connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT() ); loadingProgress( job, 0 ); speedProgress( job, 0 ); } @@ -489,51 +489,51 @@ void KView::cursorPos( const TQPoint & pos ) 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() ); - TDEAction * aClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); + KStdAction::open( this, TQ_SLOT( slotOpenFile() ), actionCollection() ); + m_paRecent = KStdAction::openRecent( this, TQ_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); + TDEAction * aClose = KStdAction::close( this, TQ_SLOT( slotClose() ), actionCollection() ); aClose->setEnabled( false ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aClose, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), aClose, TQ_SLOT( setEnabled( bool ) ) ); TQObject * extension = partobject->child( 0, "KParts::BrowserExtension", false ); if( extension ) { TQStrList slotNames = extension->metaObject()->slotNames(); if( slotNames.contains( "print()" ) ) - KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" ); + KStdAction::print( extension, TQ_SLOT( print() ), actionCollection(), "print" ); if( slotNames.contains( "del()" ) ) ( void )new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, - extension, TQT_SLOT( del() ), actionCollection(), "del" ); - connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) ); + extension, TQ_SLOT( del() ), actionCollection(), "del" ); + connect( extension, TQ_SIGNAL( enableAction( const char *, bool ) ), TQ_SLOT( enableAction( const char *, bool ) ) ); } - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); // Edit - TDEAction * aCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); + TDEAction * aCopy = KStdAction::copy( this, TQ_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() ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), aCopy, TQ_SLOT( setEnabled( bool ) ) ); + m_paPaste = KStdAction::paste( this, TQ_SLOT( slotPaste() ), actionCollection() ); clipboardDataChanged(); //enable or disable paste - TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, TQT_TQOBJECT(this), TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); + TDEAction * aCrop = new TDEAction( i18n( "Cr&op" ), Key_C, this, TQ_SLOT( slotCrop() ), actionCollection(), "crop" ); aCrop->setEnabled( false ); TDEAction * aReload = new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), partobject, - TQT_SLOT( reload() ), actionCollection(), "reload" ); + TQ_SLOT( reload() ), actionCollection(), "reload" ); aReload->setEnabled( false ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aReload, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), aReload, TQ_SLOT( setEnabled( bool ) ) ); // Settings - m_paShowMenubar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + m_paShowMenubar = KStdAction::showMenubar( this, TQ_SLOT( slotToggleMenubar() ), actionCollection() ); createStandardStatusBarAction(); - m_paShowStatusBar = ::tqqt_cast<TDEToggleAction*>( action( "options_show_statusbar" ) ); + m_paShowStatusBar = ::tqt_cast<TDEToggleAction*>( action( "options_show_statusbar" ) ); if( m_paShowStatusBar ) - connect( m_paShowStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( statusbarToggled( bool ) ) ); + connect( m_paShowStatusBar, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( statusbarToggled( bool ) ) ); m_paShowFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); - connect( m_paShowFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), actionCollection() ); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + connect( m_paShowFullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); + KStdAction::preferences( this, TQ_SLOT( slotPreferences() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); } void KView::handleResize() @@ -595,7 +595,7 @@ void KView::fitWindowToImage() TQSize winsize = sizeForCentralWidgetSize( imagesize ); TQRect workarea = m_pWinModule->workArea(); - TQScrollBar * sb = new TQScrollBar( Qt::Horizontal, this ); + TQScrollBar * sb = new TQScrollBar( TQt::Horizontal, this ); int scrollbarwidth = sb->height(); delete sb; diff --git a/kview/kview.h b/kview/kview.h index 017a3132..c0749718 100644 --- a/kview/kview.h +++ b/kview/kview.h @@ -42,7 +42,7 @@ class KProgress; class KView : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KView(); diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index ec43813b..d9cf9669 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -56,17 +56,17 @@ KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQS m_items.append( item ); } - connect( m_pWidget->m_pListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, TQT_SLOT( configChanged() ) ); - - connect( m_pWidget->m_pSmoothScaling, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pKeepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pCenterImage, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_bgColor, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMinWidth, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMaxWidth, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMinHeight, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_pWidget->m_pMaxHeight, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); + connect( m_pWidget->m_pListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, TQ_SLOT( configChanged() ) ); + + connect( m_pWidget->m_pSmoothScaling, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pKeepRatio, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pCenterImage, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_bgColor, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMinWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMaxWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMinHeight, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_pWidget->m_pMaxHeight, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); load(); } diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h index 3d3b9e7f..8458c6b7 100644 --- a/kview/kviewcanvas/config/confmodules.h +++ b/kview/kviewcanvas/config/confmodules.h @@ -28,7 +28,7 @@ class TDEConfig; class KViewCanvasConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index 8c203478..95406913 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -71,19 +71,19 @@ KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQString setMinimumSize( 0, 0 ); setBgColor( Defaults::bgColor ); - connect( this, TQT_SIGNAL( imageChanged() ), this, TQT_SLOT( slotImageChanged() ) ); - connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( hideCursor() ) ); + connect( this, TQ_SIGNAL( imageChanged() ), this, TQ_SLOT( slotImageChanged() ) ); + connect( m_pTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( hideCursor() ) ); KSettings::Dispatcher::self()->registerInstance( - KImageCanvasFactory::instance(), TQT_TQOBJECT(this), - TQT_SLOT( loadSettings() ) ); + KImageCanvasFactory::instance(), this, + TQ_SLOT( loadSettings() ) ); viewport()->setFocusProxy( this ); clear(); TQWidget::setMouseTracking( true ); viewport()->setMouseTracking( true ); - m_cursor.setShape( Qt::CrossCursor ); + m_cursor.setShape( TQt::CrossCursor ); viewport()->setCursor( m_cursor ); m_pTimer->start( MOUSECURSORHIDETIME, true ); @@ -326,8 +326,8 @@ TQString KImageCanvas::blendEffectDescription( unsigned int idx ) const bool KImageCanvas::eventFilter( TQObject * obj, TQEvent * ev ) { - if( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_client) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_oldClient) ) && ev->type() == TQEvent::MouseMove ) - mouseMoveEvent( TQT_TQMOUSEEVENT( ev ) ); + if( ( obj == m_client || obj == m_oldClient ) && ev->type() == TQEvent::MouseMove ) + mouseMoveEvent( static_cast<TQMouseEvent*>( ev ) ); return TQScrollView::eventFilter( obj, ev ); } @@ -517,7 +517,7 @@ void KImageCanvas::updateImage() { kdDebug( 4620 ) << k_funcinfo << endl; if( ! m_bImageUpdateScheduled ) - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateImage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateImage() ) ); m_bImageUpdateScheduled = true; } @@ -589,7 +589,7 @@ void KImageCanvas::mouseMoveEvent( TQMouseEvent * ) { if( m_cursor.shape() == TQt::BlankCursor ) { - m_cursor.setShape( Qt::CrossCursor ); + m_cursor.setShape( TQt::CrossCursor ); viewport()->setCursor( m_cursor ); if( m_client ) m_client->setCursor( m_cursor ); @@ -607,7 +607,7 @@ void KImageCanvas::resizeEvent( TQResizeEvent * ev ) void KImageCanvas::contentsMousePressEvent( TQMouseEvent * ev ) { - if ( ev->button() == Qt::RightButton ) + if ( ev->button() == TQt::RightButton ) emit contextPress( ev->globalPos() ); TQScrollView::contentsMousePressEvent( ev ); } @@ -772,7 +772,7 @@ void KImageCanvas::timerEvent( TQTimerEvent * ev ) void KImageCanvas::hideCursor() { kdDebug( 4620 ) << k_funcinfo << endl; - m_cursor.setShape( Qt::BlankCursor ); + m_cursor.setShape( TQt::BlankCursor ); viewport()->setCursor( m_cursor ); if( m_client ) m_client->setCursor( m_cursor ); @@ -935,15 +935,15 @@ KImageHolder * KImageCanvas::createNewClient() client->setMouseTracking( true ); client->installEventFilter( this ); setFocusProxy( client ); - client->setFocusPolicy( TQ_StrongFocus ); + client->setFocusPolicy( TQWidget::StrongFocus ); client->setFocus(); addChild( client, 0, 0 ); - connect( client, TQT_SIGNAL( contextPress( const TQPoint& ) ), TQT_SIGNAL( contextPress( const TQPoint& ) ) ); - connect( client, TQT_SIGNAL( cursorPos( const TQPoint & ) ), TQT_SLOT( mapCursorPos( const TQPoint & ) ) ); - connect( client, TQT_SIGNAL( selected( const TQRect & ) ), TQT_SLOT( selected( const TQRect & ) ) ); - connect( client, TQT_SIGNAL( wannaScroll( int, int ) ), TQT_SLOT( scrollBy( int, int ) ) ); + connect( client, TQ_SIGNAL( contextPress( const TQPoint& ) ), TQ_SIGNAL( contextPress( const TQPoint& ) ) ); + connect( client, TQ_SIGNAL( cursorPos( const TQPoint & ) ), TQ_SLOT( mapCursorPos( const TQPoint & ) ) ); + connect( client, TQ_SIGNAL( selected( const TQRect & ) ), TQ_SLOT( selected( const TQRect & ) ) ); + connect( client, TQ_SIGNAL( wannaScroll( int, int ) ), TQ_SLOT( scrollBy( int, int ) ) ); return client; } diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h index 77cd4e19..f9ea3e73 100644 --- a/kview/kviewcanvas/kimagecanvas.h +++ b/kview/kviewcanvas/kimagecanvas.h @@ -41,7 +41,7 @@ class KPixmap; */ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas { - Q_OBJECT + TQ_OBJECT public: /** @@ -147,7 +147,7 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas /** * @return a pointer to the TQWidget interface of this object */ - TQWidget * widget() { return static_cast<TQWidget *>( this ); } + TQWidget * widget() { return this; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index 62eaeea2..7a0e35ba 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -64,7 +64,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) { //kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl; // if the right mouse button is pressed emit the contextPress signal - if ( ev->button() == Qt::RightButton ) + if ( ev->button() == TQt::RightButton ) { emit contextPress( mapToGlobal( ev->pos() ) ); return; @@ -73,7 +73,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) if( m_pPixmap == 0 ) return; - if( ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton ) + if( ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton ) { m_scrollpos = ev->globalPos(); m_selectionStartPoint = ev->pos(); @@ -83,13 +83,13 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) { //FIXME: when scrolling the cursorpos shouldn't change - if( TQT_TQRECT_OBJECT(this->rect()).contains( ev->pos(), false ) ) + if( this->rect().contains( ev->pos(), false ) ) emit cursorPos( ev->pos() ); //kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl; - if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton ) + if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton ) { // scroll when a modifier and left button or the middle button is pressed - if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & Qt::MidButton ) + if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & TQt::MidButton ) { TQPoint difference = m_scrollpos - ev->globalPos(); emit wannaScroll( difference.x(), difference.y() ); @@ -181,7 +181,7 @@ void KImageHolder::mouseReleaseEvent( TQMouseEvent * ev ) m_scrollTimerId = 0; } } - if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton ) + if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton ) if( m_bSelecting ) m_bSelecting = false; else diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index 347d9c74..ef28ad3b 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -34,7 +34,7 @@ class TQPoint; */ class KImageHolder : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KImageHolder( TQWidget *parent = 0, const char * name = 0 ); diff --git a/kview/kviewcanvas/test/test.h b/kview/kviewcanvas/test/test.h index e88ebd15..18dace8b 100644 --- a/kview/kviewcanvas/test/test.h +++ b/kview/kviewcanvas/test/test.h @@ -12,7 +12,7 @@ namespace KImageViewer { class Canvas; }; class KImageViewerTest : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KImageViewerTest(); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h index 492e5607..6beff0df 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h @@ -25,7 +25,7 @@ class TDEConfig; class KViewViewerPluginsConfig : public KSettings::PluginPage { - Q_OBJECT + TQ_OBJECT public: KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h index 683de123..9e48ff61 100644 --- a/kview/kviewviewer/imagesettings.h +++ b/kview/kviewviewer/imagesettings.h @@ -25,7 +25,7 @@ class TQCheckBox; class ImageSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: ImageSettings( TQWidget * parent = 0, const char * name = 0 ); diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index ca1c6ca3..e87c214a 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -80,7 +80,7 @@ void KViewKonqExtension::print() TQImage imagetoprint; if( printer.option( "app-kviewviewer-fitimage" ) == "1" ) - imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQ_ScaleMin ); + imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin ); else imagetoprint = *m_pCanvas->image(); diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h index ed4ba750..d73622aa 100644 --- a/kview/kviewviewer/kviewkonqextension.h +++ b/kview/kviewviewer/kviewkonqextension.h @@ -28,7 +28,7 @@ class KViewViewer; class KViewKonqExtension: public KParts::BrowserExtension { friend class KViewViewer; // it can emit our signals - Q_OBJECT + TQ_OBJECT public: KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, const char *name = 0 ); diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index dcafd750..a51d29e3 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -69,7 +69,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, KImageIO::registerFormats(); TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( - "KImageViewer/Canvas", TQString(), TQT_TQOBJECT(m_pParentWidget) ); + "KImageViewer/Canvas", TQString(), m_pParentWidget ); m_pCanvas = static_cast<KImageViewer::Canvas *>( widget->tqt_cast( "KImageViewer::Canvas" ) ); kdDebug( 4610 ) << "KImageViewer::Canvas at " << m_pCanvas << endl; if( ! ( widget && m_pCanvas ) ) @@ -104,21 +104,21 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, else setXMLFile( "kviewviewer_ro.rc" ); - connect( widget, TQT_SIGNAL( contextPress( const TQPoint & ) ), - this, TQT_SLOT( slotPopupMenu( const TQPoint & ) ) ); - connect( widget, TQT_SIGNAL( zoomChanged( double ) ), - this, TQT_SLOT( zoomChanged( double ) ) ); - connect( widget, TQT_SIGNAL( showingImageDone() ), - this, TQT_SLOT( switchBlendEffect() ) ); - connect( widget, TQT_SIGNAL( hasImage( bool ) ), - this, TQT_SLOT( hasImage( bool ) ) ); - connect( widget, TQT_SIGNAL( imageChanged() ), - this, TQT_SLOT( setModified() ) ); + connect( widget, TQ_SIGNAL( contextPress( const TQPoint & ) ), + this, TQ_SLOT( slotPopupMenu( const TQPoint & ) ) ); + connect( widget, TQ_SIGNAL( zoomChanged( double ) ), + this, TQ_SLOT( zoomChanged( double ) ) ); + connect( widget, TQ_SIGNAL( showingImageDone() ), + this, TQ_SLOT( switchBlendEffect() ) ); + connect( widget, TQ_SIGNAL( hasImage( bool ) ), + this, TQ_SLOT( hasImage( bool ) ) ); + connect( widget, TQ_SIGNAL( imageChanged() ), + this, TQ_SLOT( setModified() ) ); - connect( m_pFileWatch, TQT_SIGNAL( dirty( const TQString & ) ), - this, TQT_SLOT( slotFileDirty( const TQString & ) ) ); + connect( m_pFileWatch, TQ_SIGNAL( dirty( const TQString & ) ), + this, TQ_SLOT( slotFileDirty( const TQString & ) ) ); - KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( readSettings() ) ); // by default disable progress info (so it won't open the dialog in Konqueror) setProgressInfoEnabled( false ); @@ -202,8 +202,8 @@ bool KViewViewer::saveAs( const KURL & kurl ) TDEIO::Job * job = TDEIO::copy( KURL( m_file ), kurl, isProgressInfoEnabled() ); emit started( job ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResultSaveAs( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResultSaveAs( TDEIO::Job * ) ) ); return true; } kdDebug( 4610 ) << "call KParts::ReadWritePart::saveAs( " << kurl.prettyURL() << " )" << endl; @@ -268,8 +268,8 @@ bool KViewViewer::openURL( const KURL & url ) m_pJob = TDEIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() ); emit started( m_pJob ); - connect( m_pJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); - connect( m_pJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_pJob, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); + connect( m_pJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); return true; } } @@ -466,33 +466,33 @@ bool KViewViewer::saveFile() void KViewViewer::setupActions() { m_paZoomIn = new TDEAction( i18n( "Zoom In" ), "zoom-in", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ), this, - TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" ); + TQ_SLOT( slotZoomIn() ), actionCollection(), "zoomin" ); m_paZoomOut = new TDEAction( i18n( "Zoom Out" ), "zoom-out", TDEStdAccel::shortcut( TDEStdAccel::ZoomOut ), this, - TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" ); + TQ_SLOT( slotZoomOut() ), actionCollection(), "zoomout" ); 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 & ) ) ); + connect( m_paZoom, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_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 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_paFlipV = new TDEAction( i18n( "&Vertical" ), Key_V, this, TQ_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" ); + m_paFlipH = new TDEAction( i18n( "&Horizontal" ), Key_H, this, TQ_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" ); m_paFlipMenu->insert( m_paFlipV ); m_paFlipMenu->insert( m_paFlipH ); m_paRotateCCW = new TDEAction( i18n( "Ro&tate Counter-Clockwise" ), "object-rotate-left", 0, this, - TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" ); + TQ_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" ); m_paRotateCW = new TDEAction( i18n( "Rotate Clockwise" ), "object-rotate-right", 0, this, - TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" ); - m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() ); + TQ_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" ); + m_paSave = KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() ); m_paSave->setEnabled( false ); - m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveAs() ), actionCollection() ); + m_paSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotSaveAs() ), actionCollection() ); m_paFitToWin = new TDEAction( i18n( "Fit Image to Window" ), 0, 0, this, - TQT_SLOT( slotFitToWin() ), actionCollection(), "fittowin" ); + TQ_SLOT( slotFitToWin() ), actionCollection(), "fittowin" ); m_paZoomIn->setEnabled( false ); m_paZoomOut->setEnabled( false ); m_paZoom->setEnabled( false ); @@ -503,18 +503,18 @@ void KViewViewer::setupActions() m_paFlipMenu->setEnabled( false ); m_paFlipV->setEnabled( false ); m_paFlipH->setEnabled( false ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paZoom, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQT_SLOT( setEnabled( bool ) ) ); - connect( widget(), TQT_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQT_SLOT( setEnabled( bool ) ) ); - 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 TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ), + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomIn, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoomOut, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paZoom, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCCW, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paRotateCW, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paSaveAs, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFitToWin, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipMenu, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipV, TQ_SLOT( setEnabled( bool ) ) ); + connect( widget(), TQ_SIGNAL( hasImage( bool ) ), m_paFlipH, TQ_SLOT( setEnabled( bool ) ) ); + + m_paShowScrollbars = new TDEToggleAction( i18n( "Show Scrollbars" ), 0, this, TQ_SLOT( slotToggleScrollbars() ), actionCollection(), "show_scrollbars" ); m_paShowScrollbars->setCheckedState(i18n("Hide Scrollbars")); } @@ -754,7 +754,7 @@ void KViewViewer::slotPopupMenu( const TQPoint &pos ) { KXMLGUIClient *popupGUIClient = new PopupGUIClient( instance(), m_popupDoc ); - (void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ), + (void) new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveAs() ), popupGUIClient->actionCollection(), "saveimageas" ); // ### HACK treat the image as dir to get the back/fwd/reload buttons (Simon) @@ -773,7 +773,7 @@ void KViewViewer::slotResultSaveAs( TDEIO::Job *job ) else { emit completed(); - TDEIO::CopyJob * cjob = ::tqqt_cast<TDEIO::CopyJob*>( job ); + TDEIO::CopyJob * cjob = ::tqt_cast<TDEIO::CopyJob*>( job ); if( cjob ) { m_url = cjob->destURL(); @@ -818,9 +818,9 @@ void KViewViewer::slotFileDirty( const TQString & ) KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb ); layout->addWidget( no ); layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); - connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReloadUnmodified() ) ); - connect( yes, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) ); - connect( no, TQT_SIGNAL( clicked() ), pop, TQT_SLOT( hide() ) ); + connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReloadUnmodified() ) ); + connect( yes, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) ); + connect( no, TQ_SIGNAL( clicked() ), pop, TQ_SLOT( hide() ) ); pop->setView( vb ); pop->setTimeout( 0 ); pop->setAutoDelete( true ); diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index fa80a255..691b40c4 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -44,7 +44,7 @@ class TQCache; class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface { - Q_OBJECT + TQ_OBJECT friend class KViewKonqExtension; diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui index b33b7798..36f07649 100644 --- a/kview/kviewviewer/printimagesettings.ui +++ b/kview/kviewviewer/printimagesettings.ui @@ -180,10 +180,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">tqwidget.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tqwidget.h</includehint> -</includehints> </UI> diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h index 608ca4e9..189017bb 100644 --- a/kview/kviewviewer/test/test.h +++ b/kview/kviewviewer/test/test.h @@ -12,7 +12,7 @@ namespace KParts { class ReadWritePart; } class Test : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: Test(); diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index a8c2fed6..fff86dbb 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -45,9 +45,9 @@ KViewBrowser::KViewBrowser( TQObject* parent, const char* name, const TQStringLi m_pViewer = static_cast<KImageViewer::Viewer *>( parent ); if( m_pViewer ) { - m_paBack = KStdAction::back ( this, TQT_SLOT( slotBack() ), actionCollection(), "previous_image" ); + m_paBack = KStdAction::back ( this, TQ_SLOT( slotBack() ), actionCollection(), "previous_image" ); m_paBack->setShortcut( SHIFT+Key_Left ); - m_paForward = KStdAction::forward( this, TQT_SLOT( slotForward() ), actionCollection(), "next_image" ); + m_paForward = KStdAction::forward( this, TQ_SLOT( slotForward() ), actionCollection(), "next_image" ); m_paForward->setShortcut( SHIFT+Key_Right ); m_pExtension = m_pViewer->browserExtension(); } @@ -156,8 +156,8 @@ void KViewBrowser::setupDirLister() m_pDirLister = new KDirLister(); m_pDirLister->setMimeFilter( KImageIO::mimeTypes( KImageIO::Reading ) ); m_pDirLister->setShowingDotFiles( true ); - connect( m_pDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_pDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_pDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_pDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); } if( m_pDirLister->url() != KURL( m_pViewer->url().directory( true, false ) ) ) { diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h index 24aa3770..cb0a5c69 100644 --- a/kview/modules/browser/kviewbrowser.h +++ b/kview/modules/browser/kviewbrowser.h @@ -32,7 +32,7 @@ class KMyFileItemList; class KViewBrowser : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewBrowser( TQObject* parent, const char* name, const TQStringList & ); diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp index 4ae192a6..fd42504d 100644 --- a/kview/modules/effects/kvieweffects.cpp +++ b/kview/modules/effects/kvieweffects.cpp @@ -38,20 +38,20 @@ KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringLi if( m_pViewer ) { TDEAction * gammaaction = new TDEAction( i18n( "&Gamma Correction..." ), 0, 0, - this, TQT_SLOT( gamma() ), + this, TQ_SLOT( gamma() ), actionCollection(), "plugin_effects_gamma" ); TDEAction * blendaction = new TDEAction( i18n( "&Blend Color..." ), 0, 0, - this, TQT_SLOT( blend() ), + this, TQ_SLOT( blend() ), actionCollection(), "plugin_effects_blend" ); TDEAction * intensityaction = new TDEAction( i18n( "Change &Intensity (Brightness)..." ), 0, 0, - this, TQT_SLOT( intensity() ), + this, TQ_SLOT( intensity() ), actionCollection(), "plugin_effects_intensity" ); gammaaction->setEnabled( m_pViewer->canvas()->image() != 0 ); blendaction->setEnabled( m_pViewer->canvas()->image() != 0 ); intensityaction->setEnabled( m_pViewer->canvas()->image() != 0 ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), gammaaction, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), blendaction, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), intensityaction, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), gammaaction, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), blendaction, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQ_SIGNAL( hasImage( bool ) ), intensityaction, TQ_SLOT( setEnabled( bool ) ) ); } else kdWarning( 4630 ) << "no KImageViewer interface found - the effects plugin won't work" << endl; @@ -67,7 +67,7 @@ KViewEffects::~KViewEffects() void KViewEffects::intensity() { KDialogBase dlg( m_pViewer->widget(), "Intensity Dialog", true /*modal*/, i18n( "Change Intensity" ), KDialogBase::Ok | KDialogBase::Try | KDialogBase::Cancel ); - connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyIntensity() ) ); + connect( &dlg, TQ_SIGNAL( tryClicked() ), this, TQ_SLOT( applyIntensity() ) ); TQVBox * vbox = new TQVBox( &dlg ); vbox->setSpacing( KDialog::spacingHint() ); @@ -77,7 +77,7 @@ void KViewEffects::intensity() percent->setValue( m_intensity ); percent->setLabel( i18n( "&Intensity:" ) ); percent->setSuffix( TQString::fromAscii( "%" ) ); - connect( percent, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( setIntensity( int ) ) ); + connect( percent, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( setIntensity( int ) ) ); int result = dlg.exec(); if( result == TQDialog::Accepted ) @@ -117,7 +117,7 @@ void KViewEffects::applyIntensity() void KViewEffects::blend() { KDialogBase dlg( m_pViewer->widget(), "Blend Color Dialog", true /*modal*/, i18n( "Blend Color" ), KDialogBase::Ok | KDialogBase::Try | KDialogBase::Cancel ); - connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyBlend() ) ); + connect( &dlg, TQ_SIGNAL( tryClicked() ), this, TQ_SLOT( applyBlend() ) ); TQVBox * vbox = new TQVBox( &dlg ); vbox->setSpacing( KDialog::spacingHint() ); @@ -127,11 +127,11 @@ void KViewEffects::blend() opacity->setValue( m_opacity ); opacity->setLabel( i18n( "O&pacity:" ) ); opacity->setSuffix( TQString::fromAscii( "%" ) ); - connect( opacity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( setOpacity( int ) ) ); + connect( opacity, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( setOpacity( int ) ) ); TQLabel * label = new TQLabel( i18n( "Blend c&olor:" ), vbox ); KColorButton * color = new KColorButton( m_color, vbox, "Color Input Button" ); label->setBuddy( color ); - connect( color, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SLOT( setColor( const TQColor & ) ) ); + connect( color, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SLOT( setColor( const TQColor & ) ) ); int result = dlg.exec(); if( result == TQDialog::Accepted ) @@ -175,12 +175,12 @@ void KViewEffects::applyBlend() void KViewEffects::gamma() { KDialogBase dlg( m_pViewer->widget(), "Gamma Correction Dialog", true /*modal*/, i18n( "Gamma Correction" ), KDialogBase::Ok | KDialogBase::Try | KDialogBase::Cancel ); - connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyGammaCorrection() ) ); + connect( &dlg, TQ_SIGNAL( tryClicked() ), this, TQ_SLOT( applyGammaCorrection() ) ); // create dialog KDoubleNumInput * gammavalue = new KDoubleNumInput( 0.0, 1.0, 0.5, 0.01, 4, &dlg, "Gamma value input" ); gammavalue->setRange( 0.0, 1.0, 0.01, true ); - connect( gammavalue, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setGammaValue( double ) ) ); + connect( gammavalue, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( setGammaValue( double ) ) ); gammavalue->setLabel( i18n( "Gamma value:" ) ); dlg.setMainWidget( gammavalue ); diff --git a/kview/modules/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h index 93088317..ae817157 100644 --- a/kview/modules/effects/kvieweffects.h +++ b/kview/modules/effects/kvieweffects.h @@ -12,7 +12,7 @@ namespace KImageViewer { class Viewer; } class KViewEffects : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewEffects( TQObject* parent, const char* name, const TQStringList & ); diff --git a/kview/modules/presenter/DESIGN b/kview/modules/presenter/DESIGN index 3b187e78..034a3032 100644 --- a/kview/modules/presenter/DESIGN +++ b/kview/modules/presenter/DESIGN @@ -27,15 +27,15 @@ Presenter Plugin: - keep local copy of downloaded files - delete local copy on destruction - API: - QImage * image(); + TQImage * image(); KURL url(); - QString file(); //returns local filename or QString::null + TQString file(); //returns local filename or TQString::null - when loading an item from the playlist first ask for a - QImage, if that's not available ask for a local file, if + TQImage, if that's not available ask for a local file, if that's also not available take the url. - API: - QImage * image(); - QString file(); + TQImage * image(); + TQString file(); KURL url(); void setRandom(bool); void randomizeList(); diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index f88f09b1..1e1e091c 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -38,7 +38,7 @@ KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, con layout->setAutoAdd( true ); m_pCheckBox = new TQCheckBox( "This is only for testing...", this ); - connect( m_pCheckBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkChanged() ) ); + connect( m_pCheckBox, TQ_SIGNAL( clicked() ), this, TQ_SLOT( checkChanged() ) ); } KViewPresenterConfig::~KViewPresenterConfig() diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h index 8aaf462f..73742259 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.h +++ b/kview/modules/presenter/config/kviewpresenterconfig.h @@ -25,7 +25,7 @@ class TQCheckBox; class KViewPresenterConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KViewPresenterConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui index 547c0cf0..1f7a2435 100644 --- a/kview/modules/presenter/imagelistdialog.ui +++ b/kview/modules/presenter/imagelistdialog.ui @@ -254,31 +254,26 @@ </connections> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> + <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include> + <include location="local" impldecl="in implementation">imagelistitem.h</include> <include location="global" impldecl="in implementation">kdebug.h</include> <include location="global" impldecl="in implementation">kimageviewer/viewer.h</include> - <include location="global" impldecl="in implementation">tdeio/netaccess.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurl.h</include> <include location="global" impldecl="in implementation">tdefiledialog.h</include> - <include location="global" impldecl="in implementation">tqstring.h</include> + <include location="global" impldecl="in implementation">tdeio/netaccess.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> <include location="global" impldecl="in implementation">tdemessagebox.h</include> - <include location="local" impldecl="in implementation">imagelistitem.h</include> - <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include> + <include location="global" impldecl="in implementation">tqstring.h</include> </includes> <forwards> <forward>class KURL</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="private" specifier="non virtual">init()</slot> <slot specifier="non virtual">noSort()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includes> - <include location="global" impldecl="in implementation">knuminput.h</include> - <include location="global" impldecl="in implementation">kpushbutton.h</include> -</includes> -<includehints> - <includehint>kdialog.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> </UI> diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index c05490bb..96b3abbb 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -60,7 +60,6 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri , m_pSlideshowTimer( new TQTimer( this ) ) { kdDebug( 4630 ) << k_funcinfo << endl; - m_imagelist.setAutoDelete( true ); TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); @@ -68,18 +67,18 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri if( m_pViewer ) { ( void ) new TDEAction( i18n( "&Image List..." ), 0, 0, - this, TQT_SLOT( slotImageList() ), + this, TQ_SLOT( slotImageList() ), actionCollection(), "plugin_presenter_imageList" ); m_paSlideshow = new TDEToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" ); ( void ) new TDEAction( i18n( "&Previous Image in List" ), "go-previous", ALT+Key_Left, - this, TQT_SLOT( prev() ), + this, TQ_SLOT( prev() ), actionCollection(), "plugin_presenter_prev" ); ( void ) new TDEAction( i18n( "&Next Image in List" ), "go-next", ALT+Key_Right, - this, TQT_SLOT( next() ), + this, TQ_SLOT( next() ), actionCollection(), "plugin_presenter_next" ); - connect( m_paSlideshow, TQT_SIGNAL( toggled( bool ) ), m_pImageList->m_pSlideshow, TQT_SLOT( setOn( bool ) ) ); - connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), m_paSlideshow, TQT_SLOT( setChecked( bool ) ) ); + connect( m_paSlideshow, TQ_SIGNAL( toggled( bool ) ), m_pImageList->m_pSlideshow, TQ_SLOT( setOn( bool ) ) ); + connect( m_pImageList->m_pSlideshow, TQ_SIGNAL( toggled( bool ) ), m_paSlideshow, TQ_SLOT( setChecked( bool ) ) ); // search for file_open action KXMLGUIClient * parentClient = static_cast<KXMLGUIClient*>( parent->tqt_cast( "KXMLGUIClient" ) ); @@ -89,48 +88,48 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri m_paFileClose = parentClient->actionCollection()->action( "file_close" ); } if( m_paFileClose ) - connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) ); + connect( m_paFileClose, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotClose() ) ); if( m_paFileOpen ) { - disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), parent, TQT_SLOT( slotOpenFile() ) ); - connect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); + disconnect( m_paFileOpen, TQ_SIGNAL( activated() ), parent, TQ_SLOT( slotOpenFile() ) ); + connect( m_paFileOpen, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotOpenFiles() ) ); } else { (void) new TDEAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O, - this, TQT_SLOT( slotOpenFiles() ), + this, TQ_SLOT( slotOpenFiles() ), actionCollection(), "plugin_presenter_openFiles" ); } - connect( m_pViewer, TQT_SIGNAL( imageOpened( const KURL & ) ), - TQT_SLOT( slotImageOpened( const KURL & ) ) ); + connect( m_pViewer, TQ_SIGNAL( imageOpened( const KURL & ) ), + TQ_SLOT( slotImageOpened( const KURL & ) ) ); } else kdWarning( 4630 ) << "no KImageViewer interface found - the presenter plugin won't work" << endl; //( void )new KViewPresenterConfModule( this ); - connect( m_pImageList->m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( changeItem( TQListViewItem* ) ) ); - connect( m_pImageList->m_pPrevious, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( prev() ) ); - connect( m_pImageList->m_pNext, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( next() ) ); - connect( m_pImageList->m_pListView, TQT_SIGNAL( spacePressed( TQListViewItem* ) ), - this, TQT_SLOT( changeItem( TQListViewItem* ) ) ); - connect( m_pImageList->m_pListView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( changeItem( TQListViewItem* ) ) ); - connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slideshow( bool ) ) ); - connect( m_pImageList->m_pInterval, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setSlideshowInterval( int ) ) ); - connect( m_pImageList->m_pShuffle, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( shuffle() ) ); - connect( m_pImageList->m_pLoad, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( loadList() ) ); - connect( m_pImageList->m_pSave, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( saveList() ) ); - connect( m_pImageList->m_pCloseAll, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( closeAll() ) ); + connect( m_pImageList->m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( changeItem( TQListViewItem* ) ) ); + connect( m_pImageList->m_pPrevious, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( prev() ) ); + connect( m_pImageList->m_pNext, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( next() ) ); + connect( m_pImageList->m_pListView, TQ_SIGNAL( spacePressed( TQListViewItem* ) ), + this, TQ_SLOT( changeItem( TQListViewItem* ) ) ); + connect( m_pImageList->m_pListView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( changeItem( TQListViewItem* ) ) ); + connect( m_pImageList->m_pSlideshow, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slideshow( bool ) ) ); + connect( m_pImageList->m_pInterval, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setSlideshowInterval( int ) ) ); + connect( m_pImageList->m_pShuffle, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( shuffle() ) ); + connect( m_pImageList->m_pLoad, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( loadList() ) ); + connect( m_pImageList->m_pSave, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( saveList() ) ); + connect( m_pImageList->m_pCloseAll, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( closeAll() ) ); // allow drop on the dialog m_pImageList->installEventFilter( this ); @@ -140,8 +139,8 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri // grab drops on the main view m_pViewer->widget()->installEventFilter( this ); - connect( m_pSlideshowTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( next() ) ); + connect( m_pSlideshowTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( next() ) ); } KViewPresenter::~KViewPresenter() @@ -149,19 +148,19 @@ KViewPresenter::~KViewPresenter() kdDebug( 4630 ) << k_funcinfo << endl; if( m_paFileOpen ) { - disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); + disconnect( m_paFileOpen, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotOpenFiles() ) ); // If the parent() doesn't exist we either leave the "File Open" action // in an unusable state or KView was just shutting down and therefor we // can ignore this. I've only seen the second one happening and to get // rid of the TQObject::connect warning we do the parent() check. if( parent() ) - connect( m_paFileOpen, TQT_SIGNAL( activated() ), parent(), TQT_SLOT( slotOpenFile() ) ); + connect( m_paFileOpen, TQ_SIGNAL( activated() ), parent(), TQ_SLOT( slotOpenFile() ) ); } } bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev ) { - if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView->viewport()) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) ) + if( obj == m_pImageList || obj == m_pImageList->m_pListView || obj == m_pImageList->m_pListView->viewport() || obj == m_pViewer->widget() ) { switch( ev->type() ) { @@ -190,14 +189,12 @@ bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev ) { for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it ) { - ImageInfo * info = new ImageInfo( KURL( *it ) ); + ImageInfo info = ImageInfo( KURL( *it ) ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); ( void )new ImageListItem( m_pImageList->m_pListView, KURL( *it ) ); } - else - delete info; } return true; } @@ -217,15 +214,13 @@ void KViewPresenter::slotImageOpened( const KURL & url ) if( ! m_bDontAdd ) { kdDebug( 4630 ) << k_funcinfo << "imagelist:" << endl; - ImageInfo * info = new ImageInfo( url ); + ImageInfo info = ImageInfo( url ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); TQListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url ); makeCurrent( item ); } - else - delete info; } } @@ -247,14 +242,12 @@ void KViewPresenter::slotOpenFiles() m_pViewer->openURL( *it ); for( ++it; it != urls.end(); ++it ) { - ImageInfo * info = new ImageInfo( *it ); + ImageInfo info = ImageInfo( *it ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); ( void )new ImageListItem( m_pImageList->m_pListView, *it ); } - else - delete info; } } @@ -265,7 +258,7 @@ void KViewPresenter::slotClose() next = 0; ImageInfo info( m_pCurrentItem->url() ); - m_imagelist.remove( &info ); + m_imagelist.remove( info ); delete m_pCurrentItem; m_pCurrentItem = 0; @@ -285,7 +278,7 @@ void KViewPresenter::changeItem( TQListViewItem * qitem ) { kdDebug( 4630 ) << "file doesn't exist. removed." << endl; ImageInfo info( item->url() ); - m_imagelist.remove( &info ); + m_imagelist.remove( info ); if( m_pCurrentItem == item ) { TQListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); @@ -430,14 +423,12 @@ void KViewPresenter::loadList() while( ! t.eof() ) { KURL url ( t.readLine() ); - ImageInfo * info = new ImageInfo( url ); + ImageInfo info = ImageInfo( url ); if( ! m_imagelist.contains( info ) ) { - m_imagelist.inSort( info ); + m_imagelist.append( info ); ( void )new ImageListItem( m_pImageList->m_pListView, url ); } - else - delete info; } } else diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h index 4159abc5..865c9f86 100644 --- a/kview/modules/presenter/kviewpresenter.h +++ b/kview/modules/presenter/kviewpresenter.h @@ -24,7 +24,7 @@ #include <tdeparts/plugin.h> #include <kurl.h> -#include <tqsortedlist.h> +#include <tqvaluelist.h> namespace KImageViewer { class Viewer; } @@ -37,7 +37,7 @@ class TDEAction; class KViewPresenter : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewPresenter( TQObject* parent, const char* name, const TQStringList & ); @@ -47,6 +47,11 @@ protected: struct ImageInfo { KURL url; + + ImageInfo() + : url() + { + } ImageInfo( const KURL & url ) : url( url ) { @@ -57,7 +62,7 @@ protected: } bool operator!=( const ImageInfo & i1 ) { - return url.prettyURL() == i1.url.prettyURL(); + return url.prettyURL() != i1.url.prettyURL(); } bool operator>( const ImageInfo & i1 ) { @@ -94,7 +99,7 @@ private: TDEAction * m_paFileOpen; TDEAction * m_paFileClose; - TQSortedList<ImageInfo> m_imagelist; + TQValueList<ImageInfo> m_imagelist; bool m_bDontAdd; ImageListItem * m_pCurrentItem; TQTimer * m_pSlideshowTimer; diff --git a/kview/modules/presenter/kviewpresenterconfmodule.h b/kview/modules/presenter/kviewpresenterconfmodule.h index c4bd52e0..5787541f 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.h +++ b/kview/modules/presenter/kviewpresenterconfmodule.h @@ -27,7 +27,7 @@ class TQCheckBox; class KViewPresenterConfModule : public KPreferencesModule { - Q_OBJECT + TQ_OBJECT public: KViewPresenterConfModule( TQObject * parent ); diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index 0dc7fb33..cd30e1f3 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -42,7 +42,7 @@ KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsign , m_doselection( true ) { setRange( minValue, maxValue, step, precision ); - connect( this, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotValueChanged( int ) ) ); + connect( this, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotValueChanged( int ) ) ); } KFloatSpinBox::~KFloatSpinBox() diff --git a/kview/modules/scale/kfloatspinbox.h b/kview/modules/scale/kfloatspinbox.h index 7a84a06f..35c5ffd1 100644 --- a/kview/modules/scale/kfloatspinbox.h +++ b/kview/modules/scale/kfloatspinbox.h @@ -25,7 +25,7 @@ class KFloatSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent = 0, const char * name = 0 ); diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index 28298323..1813bac9 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -47,7 +47,7 @@ KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList & m_pCanvas = m_pViewer->canvas(); (void) new TDEAction( i18n( "&Scale Image..." ), 0, 0, - this, TQT_SLOT( slotScaleDlg() ), + this, TQ_SLOT( slotScaleDlg() ), actionCollection(), "plugin_scale" ); } else diff --git a/kview/modules/scale/kview_scale.h b/kview/modules/scale/kview_scale.h index 71550df1..af0d66e6 100644 --- a/kview/modules/scale/kview_scale.h +++ b/kview/modules/scale/kview_scale.h @@ -30,7 +30,7 @@ namespace KImageViewer { class KViewScale : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewScale( TQObject* parent, const char* name, const TQStringList & ); diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index 308546cd..d4c33262 100644 --- a/kview/modules/scale/scaledlg.cpp +++ b/kview/modules/scale/scaledlg.cpp @@ -157,16 +157,16 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name m_newsizeunit2 = 0; m_resolutionunit = 0; - connect( m_pNewWidth, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewWidth( float ) ) ); - connect( m_pNewHeight, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewHeight( float ) ) ); - connect( m_pNewWidth2, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewWidth2( float ) ) ); - connect( m_pNewHeight2, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotNewHeight2( float ) ) ); - connect( m_pResolutionX, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotResolutionX( float ) ) ); - connect( m_pResolutionY, TQT_SIGNAL( valueChanged( float ) ), TQT_SLOT( slotResolutionY( float ) ) ); - - connect( m_pNewSizeUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotChangeNewSizeUnit( int ) ) ); - connect( m_pNewSizeUnit2, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotChangeNewSizeUnit2( int ) ) ); - connect( m_pResolutionUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotChangeResolutionUnit( int ) ) ); + connect( m_pNewWidth, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewWidth( float ) ) ); + connect( m_pNewHeight, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewHeight( float ) ) ); + connect( m_pNewWidth2, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewWidth2( float ) ) ); + connect( m_pNewHeight2, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotNewHeight2( float ) ) ); + connect( m_pResolutionX, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotResolutionX( float ) ) ); + connect( m_pResolutionY, TQ_SIGNAL( valueChanged( float ) ), TQ_SLOT( slotResolutionY( float ) ) ); + + connect( m_pNewSizeUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotChangeNewSizeUnit( int ) ) ); + connect( m_pNewSizeUnit2, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotChangeNewSizeUnit2( int ) ) ); + connect( m_pResolutionUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotChangeResolutionUnit( int ) ) ); } ScaleDlg::~ScaleDlg() diff --git a/kview/modules/scale/scaledlg.h b/kview/modules/scale/scaledlg.h index 6b7d6dcd..66b352c5 100644 --- a/kview/modules/scale/scaledlg.h +++ b/kview/modules/scale/scaledlg.h @@ -32,7 +32,7 @@ class TQSize; class ScaleDlg : public TQObject { - Q_OBJECT + TQ_OBJECT public: ScaleDlg( const TQSize & originalsize, TQVBox * parent, const char * name = 0 ); diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp index 8f464522..ee964d4f 100644 --- a/kview/modules/scanner/kviewscanner.cpp +++ b/kview/modules/scanner/kviewscanner.cpp @@ -47,7 +47,7 @@ KViewScanner::KViewScanner( TQObject* parent, const char* name, if( m_pViewer ) { (void) new TDEAction( i18n( "&Scan Image..." ), "scanner", 0, - this, TQT_SLOT( slotScan() ), + this, TQ_SLOT( slotScan() ), actionCollection(), "plugin_scan" ); } else @@ -67,8 +67,8 @@ void KViewScanner::slotScan() { m_pScandlg->setMinimumSize( 300, 300 ); - connect( m_pScandlg, TQT_SIGNAL( finalImage( const TQImage &, int ) ), - this, TQT_SLOT( slotImgScanned( const TQImage & ) ) ); + connect( m_pScandlg, TQ_SIGNAL( finalImage( const TQImage &, int ) ), + this, TQ_SLOT( slotImgScanned( const TQImage & ) ) ); } else { diff --git a/kview/modules/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h index 09ac2dc7..59c335b8 100644 --- a/kview/modules/scanner/kviewscanner.h +++ b/kview/modules/scanner/kviewscanner.h @@ -30,7 +30,7 @@ namespace KImageViewer { class Viewer; } class KViewScanner : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewScanner( TQObject* parent, const char* name, const TQStringList & ); diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp index 023788c7..3a22d9df 100644 --- a/kview/modules/template/kviewtemplate.cpp +++ b/kview/modules/template/kviewtemplate.cpp @@ -24,7 +24,7 @@ KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQString if( m_pViewer ) { (void) new TDEAction( /*i18n(*/ "&Do Something" /*)*/, 0, 0, - this, TQT_SLOT( yourSlot() ), + this, TQ_SLOT( yourSlot() ), actionCollection(), "plugin_template" ); } else diff --git a/kview/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h index 6130d50d..ab67e408 100644 --- a/kview/modules/template/kviewtemplate.h +++ b/kview/modules/template/kviewtemplate.h @@ -11,7 +11,7 @@ namespace KImageViewer { class Viewer; } class KViewTemplate : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: KViewTemplate( TQObject* parent, const char* name, const TQStringList & ); diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index ed21f123..80a420f5 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -50,24 +50,24 @@ Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes) mPhotoBook = parent; mMimeTypes = mimetypes; - connect(&mDirLister, TQT_SIGNAL(clear()), TQT_SLOT(slotClearView())); - connect(&mDirLister, TQT_SIGNAL(completed()), TQT_SLOT(doneListing())); + connect(&mDirLister, TQ_SIGNAL(clear()), TQ_SLOT(slotClearView())); + connect(&mDirLister, TQ_SIGNAL(completed()), TQ_SLOT(doneListing())); connect( - &mDirLister, TQT_SIGNAL(newItems(const KFileItemList &)), - TQT_SLOT(insertNewFiles(const KFileItemList &)) + &mDirLister, TQ_SIGNAL(newItems(const KFileItemList &)), + TQ_SLOT(insertNewFiles(const KFileItemList &)) ); connect( - signaler(), TQT_SIGNAL(fileSelected(const KFileItem*)), - TQT_SLOT(open(const KFileItem*)) + signaler(), TQ_SIGNAL(fileSelected(const KFileItem*)), + TQ_SLOT(open(const KFileItem*)) ); connect( - &mDirLister, TQT_SIGNAL(deleteItem(KFileItem *)), - TQT_SLOT(removeItem(KFileItem *)) + &mDirLister, TQ_SIGNAL(deleteItem(KFileItem *)), + TQ_SLOT(removeItem(KFileItem *)) ); connect( - &mDirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) + &mDirLister, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); setFixedWidth(128); @@ -136,7 +136,7 @@ void Previews::open(const KFileItem *item) void Previews::doneListing() { // eep! -- this should not be necessary - TQTimer::singleShot(0, this, TQT_SLOT(goToFirst())); + TQTimer::singleShot(0, this, TQ_SLOT(goToFirst())); } void Previews::goToFirst() @@ -167,7 +167,7 @@ PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) { KService::Ptr service = *i; mViewer = KParts::ComponentFactory:: - createPartInstanceFromService<KParts::ReadOnlyPart>( service, this, 0, TQT_TQOBJECT(this) ); + createPartInstanceFromService<KParts::ReadOnlyPart>( service, this, 0, this ); // is this the correct way to get the supported mimetypes? if (mViewer) @@ -184,8 +184,8 @@ PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) mFit = mViewer->action("fittowin"); - connect(mList, TQT_SIGNAL(open(const KURL&)), mViewer, TQT_SLOT(openURL(const KURL&))); - connect(mViewer, TQT_SIGNAL(completed()), mFit, TQT_SLOT(activate())); + connect(mList, TQ_SIGNAL(open(const KURL&)), mViewer, TQ_SLOT(openURL(const KURL&))); + connect(mViewer, TQ_SIGNAL(completed()), mFit, TQ_SLOT(activate())); part->insertChildClient(mViewer); } @@ -233,11 +233,11 @@ PhotoBookPart::PhotoBookPart( setWidget(bv); connect( - bv, TQT_SIGNAL(emitUpdateButton(bool, bool)), - this, TQT_SLOT(slotUpdateButton(bool, bool)) + bv, TQ_SIGNAL(emitUpdateButton(bool, bool)), + this, TQ_SLOT(slotUpdateButton(bool, bool)) ); - m_pNextAction = KStdAction::next(TQT_TQOBJECT(bv), TQT_SLOT(next()), actionCollection(), "next"); - m_pPreviousAction = KStdAction::prior(TQT_TQOBJECT(bv), TQT_SLOT(previous()), actionCollection(), "previous"); + m_pNextAction = KStdAction::next(bv, TQ_SLOT(next()), actionCollection(), "next"); + m_pPreviousAction = KStdAction::prior(bv, TQ_SLOT(previous()), actionCollection(), "previous"); setXMLFile( "photobookui.rc" ); diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index e931ecf8..ab133808 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -52,7 +52,7 @@ class PhotoBookPart; class PhotoBook : public TQSplitter { -Q_OBJECT +TQ_OBJECT Previews *mList; TDEAction *mFit; @@ -73,7 +73,7 @@ signals: class Previews : public KFileIconView { - Q_OBJECT + TQ_OBJECT KDirLister mDirLister; @@ -107,7 +107,7 @@ private slots: class PhotoBookPart : public KParts::ReadOnlyPart { -Q_OBJECT +TQ_OBJECT PhotoBook *bv; TDEAction *m_pPreviousAction; @@ -133,7 +133,7 @@ typedef KParts::GenericFactory<PhotoBookPart> PhotoBookFactory; class PhotoBookBrowserExtension : public KParts::BrowserExtension { -Q_OBJECT +TQ_OBJECT public: PhotoBookBrowserExtension(PhotoBookPart *p); |