diff options
Diffstat (limited to 'kview')
52 files changed, 922 insertions, 922 deletions
diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index 23f6a1ef..e994d8ed 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -18,34 +18,34 @@ #include "kviewconfmodules.h" -#include <qlayout.h> -#include <qvbuttongroup.h> -#include <qradiobutton.h> +#include <tqlayout.h> +#include <tqvbuttongroup.h> +#include <tqradiobutton.h> #include <klocale.h> #include <kdialog.h> #include <kglobal.h> #include <kconfig.h> #include <kgenericfactory.h> -#include <qwhatsthis.h> +#include <tqwhatsthis.h> -typedef KGenericFactory<KViewGeneralConfig, QWidget> KViewGeneralConfigFactory; +typedef KGenericFactory<KViewGeneralConfig, TQWidget> KViewGeneralConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "kcm_kviewgeneralconfig" ) ) -KViewGeneralConfig::KViewGeneralConfig( QWidget * parent, const char * /*name*/, const QStringList & args ) +KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args ) : KCModule( KViewGeneralConfigFactory::instance(), parent, args ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - m_pResizeGroup = new QVButtonGroup( i18n( "Resizing" ), this ); - m_pResizeGroup->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) ); - connect( m_pResizeGroup, SIGNAL( clicked( int ) ), this, SLOT( resizeChanged( int ) ) ); + 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 ) ) ); layout->addWidget( m_pResizeGroup ); - ( void )new QRadioButton( i18n( "Only resize window" ), m_pResizeGroup ); - ( void )new QRadioButton( i18n( "Resize image to fit window" ), m_pResizeGroup ); - ( void )new QRadioButton( i18n( "Don't resize anything" ), m_pResizeGroup ); - QWhatsThis::add( new QRadioButton( i18n( "Best fit" ), m_pResizeGroup ), + ( void )new TQRadioButton( i18n( "Only resize window" ), m_pResizeGroup ); + ( void )new TQRadioButton( i18n( "Resize image to fit window" ), m_pResizeGroup ); + ( void )new TQRadioButton( i18n( "Don't resize anything" ), m_pResizeGroup ); + TQWhatsThis::add( new TQRadioButton( i18n( "Best fit" ), m_pResizeGroup ), i18n( "<p>KView will resize the window to fit the image. The image will never be scaled up but if it is too large for the screen the image will be scaled down.</p>" ) ); load(); diff --git a/kview/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h index d064b386..1c9c1e7f 100644 --- a/kview/config/kviewconfmodules.h +++ b/kview/config/kviewconfmodules.h @@ -21,13 +21,13 @@ #include <kcmodule.h> -class QVButtonGroup; +class TQVButtonGroup; class KViewGeneralConfig : public KCModule { Q_OBJECT public: - KViewGeneralConfig( QWidget * parent, const char * name = 0, const QStringList & args = QStringList() ); + KViewGeneralConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewGeneralConfig(); virtual void load(); @@ -38,7 +38,7 @@ class KViewGeneralConfig : public KCModule void resizeChanged( int ); private: - QVButtonGroup * m_pResizeGroup; + TQVButtonGroup * m_pResizeGroup; int m_savedPosition; }; diff --git a/kview/config/plugins/kviewpluginsconfig.cpp b/kview/config/plugins/kviewpluginsconfig.cpp index e093366c..bad5bd55 100644 --- a/kview/config/plugins/kviewpluginsconfig.cpp +++ b/kview/config/plugins/kviewpluginsconfig.cpp @@ -25,14 +25,14 @@ #include <ksimpleconfig.h> #include <kplugininfo.h> -typedef KGenericFactory<KViewPluginsConfig, QWidget> KViewPluginsConfigFactory; +typedef KGenericFactory<KViewPluginsConfig, TQWidget> KViewPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpluginsconfig, KViewPluginsConfigFactory( "kcm_kviewpluginsconfig" ) ) -KViewPluginsConfig::KViewPluginsConfig( QWidget * parent, const char *, const QStringList & args ) +KViewPluginsConfig::KViewPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) : KSettings::PluginPage( KViewPluginsConfigFactory::instance(), parent, args ) { m_config = new KSimpleConfig( "kviewrc" ); - pluginSelector()->addPlugins( QString::fromAscii( "kview" ), i18n( "Application" ), QString::null, m_config ); + pluginSelector()->addPlugins( TQString::fromAscii( "kview" ), i18n( "Application" ), TQString::null, m_config ); pluginSelector()->setShowEmptyConfigPage( false ); } diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h index 815a4de7..4095944d 100644 --- a/kview/config/plugins/kviewpluginsconfig.h +++ b/kview/config/plugins/kviewpluginsconfig.h @@ -27,7 +27,7 @@ class KViewPluginsConfig : public KSettings::PluginPage { Q_OBJECT public: - KViewPluginsConfig( QWidget * parent, const char * name = 0, const QStringList & args = QStringList() ); + KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewPluginsConfig(); private: KConfig * m_config; diff --git a/kview/kimageviewer/canvas.h b/kview/kimageviewer/canvas.h index 61b565b4..18aae3be 100644 --- a/kview/kimageviewer/canvas.h +++ b/kview/kimageviewer/canvas.h @@ -21,14 +21,14 @@ #ifndef KIMAGEVIEWER_CANVAS_H #define KIMAGEVIEWER_CANVAS_H -class QColor; -class QSize; -class QImage; -class QRect; -class QPoint; -class QWidget; - -#include <qstring.h> +class TQColor; +class TQSize; +class TQImage; +class TQRect; +class TQPoint; +class TQWidget; + +#include <tqstring.h> #include <qobjectdefs.h> #include <kdemacros.h> namespace KImageViewer @@ -47,7 +47,7 @@ namespace KImageViewer * your program: * * <pre> - QWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<QWidget>( "KImageViewer/Canvas", QString::null, this ); + TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( "KImageViewer/Canvas", TQString::null, this ); m_canvas = static_cast<KImageViewer::Canvas *>( widget->qt_cast( "KImageViewer::Canvas" ) ); if( ! ( widget && m_canvas ) ) { @@ -55,13 +55,13 @@ namespace KImageViewer kapp->quit(); } setCentralWidget( widget ); - connect( widget, SIGNAL( contextPress( const QPoint & ) ), SLOT( mySlot( const QPoint & ) ) ); - connect( m_canvas->widget(), SIGNAL( contextPress( const QPoint & ) ), SLOT( mySlot( const QPoint & ) ) ); + 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 & ) ) ); </pre> * * You can't connect signals or slots using KImageViewer::Canvas, because this interface - * doesn't inherit from QObject. But you can cast to QWidget and use that instead (or just - * keep the original pointer to QWidget around, like shown in the example). + * doesn't inherit from TQObject. But you can cast to TQWidget and use that instead (or just + * keep the original pointer to TQWidget around, like shown in the example). * * This interface is not guaranteed to be kept binary or source compatible * until it's finished. So if you're using this interface please get in contact @@ -73,12 +73,12 @@ class KDE_EXPORT Canvas /** * set the background color of the canvas */ - virtual void setBgColor( const QColor & ) = 0; + virtual void setBgColor( const TQColor & ) = 0; /** * returns the current background color */ - virtual const QColor & bgColor() const = 0; + virtual const TQColor & bgColor() const = 0; /** * the depth of the contained image @@ -88,12 +88,12 @@ class KDE_EXPORT Canvas /** * the size of the unzoomed image */ - virtual QSize imageSize() const = 0; + virtual TQSize imageSize() const = 0; /** * the size of the zoomed (current) image */ - virtual QSize currentSize() const = 0; + virtual TQSize currentSize() const = 0; /** * returns the zoom factor @@ -105,7 +105,7 @@ class KDE_EXPORT Canvas * Take care that the canas may delete the image so you probably need to * make a copy of the image if you want to keep it around. */ - virtual const QImage * image() const = 0; + virtual const TQImage * image() const = 0; /** * Scrolls the content so that the point (x, y) is in the top-left corner. @@ -136,7 +136,7 @@ class KDE_EXPORT Canvas * Return the selected rectangle. If nothing is selected the rectangle is * empty but doesn't have to be null. */ - virtual QRect selection() const = 0; + virtual TQRect selection() const = 0; /** * Returns whether the aspect ratio of the image is kept @@ -151,7 +151,7 @@ class KDE_EXPORT Canvas /** * @return the description of the blend effect */ - virtual QString blendEffectDescription( unsigned int ) const { return QString::null; } + virtual TQString blendEffectDescription( unsigned int ) const { return TQString::null; } /** * Sets the blending effect used to create a transition between images @@ -166,23 +166,23 @@ class KDE_EXPORT Canvas /** * @return the current maximum image size */ - virtual const QSize & maximumImageSize() const = 0; + virtual const TQSize & maximumImageSize() const = 0; /** * @return the current minimum image size */ - virtual const QSize & minimumImageSize() const = 0; + virtual const TQSize & minimumImageSize() const = 0; /** - * @return a pointer to the QWidget interface of this object + * @return a pointer to the TQWidget interface of this object */ - virtual QWidget * widget() = 0; + virtual TQWidget * widget() = 0; signals: /** * a mouse button was pressed and a context menu should be openend */ - virtual void contextPress( const QPoint & ) = 0; + virtual void contextPress( const TQPoint & ) = 0; /** * the size of the image has changed (a new image was loaded, or the @@ -190,7 +190,7 @@ class KDE_EXPORT Canvas * * it passes the new size of the image */ - virtual void imageSizeChanged( const QSize & ) = 0; + virtual void imageSizeChanged( const TQSize & ) = 0; /** * The zoom of the image has changed. @@ -201,7 +201,7 @@ class KDE_EXPORT Canvas * The selection has changed. Connect to this signal if you want to * do something with a selection of the image (e.g. crop). */ - virtual void selectionChanged( const QRect & ) = 0; + virtual void selectionChanged( const TQRect & ) = 0; /** * Emitted when an image is finished being shown. If a blend effect is being used @@ -227,7 +227,7 @@ class KDE_EXPORT Canvas /** * The current mouse cursor position on the image. */ - virtual void cursorPos( const QPoint & ) = 0; + virtual void cursorPos( const TQPoint & ) = 0; public slots: /** @@ -239,7 +239,7 @@ class KDE_EXPORT Canvas /** * Give the canvas a new image to show. The zoom level is kept. */ - virtual void setImage( const QImage & ) = 0; + virtual void setImage( const TQImage & ) = 0; /** * Give the canvas a new image to show. @@ -247,7 +247,7 @@ class KDE_EXPORT Canvas * You have to pass the size the image should have when it appears * on screen. */ - virtual void setImage( const QImage &, const QSize & ) = 0; + virtual void setImage( const TQImage &, const TQSize & ) = 0; /** * Set the zoom to be used when showing the image. @@ -257,7 +257,7 @@ class KDE_EXPORT Canvas /** * Fit the image into the requested width and height. */ - virtual void boundImageTo( const QSize & size ) = 0; + virtual void boundImageTo( const TQSize & size ) = 0; /** * Set the maximum size of the image. If this is set the image will @@ -265,7 +265,7 @@ class KDE_EXPORT Canvas * * If you set this to 0x0 the image size may be as big as possible */ - virtual void setMaximumImageSize( const QSize & ) = 0; + virtual void setMaximumImageSize( const TQSize & ) = 0; /** * Set the minimum size of the image. If this is set the image will @@ -273,14 +273,14 @@ class KDE_EXPORT Canvas * * If you set this to 0x0 the image size can be as small as possible */ - virtual void setMinimumImageSize( const QSize & ) = 0; + virtual void setMinimumImageSize( const TQSize & ) = 0; /** * Resize the image to the given size. It will keep the aspect ratio * as long as keepAspectRatio is true (default). The image will be as * large as possible within the given constraints. */ - virtual void resizeImage( const QSize & ) = 0; + virtual void resizeImage( const TQSize & ) = 0; /** * Hides the scrollbars of the canvas. It's still possible to scroll diff --git a/kview/kimageviewer/viewer.cpp b/kview/kimageviewer/viewer.cpp index a74e0de9..1a5890d6 100644 --- a/kview/kimageviewer/viewer.cpp +++ b/kview/kimageviewer/viewer.cpp @@ -22,7 +22,7 @@ namespace KImageViewer { - Viewer::Viewer( QObject * parent, const char * name ) + Viewer::Viewer( TQObject * parent, const char * name ) : KParts::ReadWritePart( parent, name ) { } diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h index 647fd9ba..995be8b9 100644 --- a/kview/kimageviewer/viewer.h +++ b/kview/kimageviewer/viewer.h @@ -49,7 +49,7 @@ class KDE_EXPORT Viewer : public KParts::ReadWritePart { Q_OBJECT public: - Viewer( QObject * parent = 0, const char * name = 0 ); + Viewer( TQObject * parent = 0, const char * name = 0 ); virtual ~Viewer(); @@ -77,7 +77,7 @@ class KDE_EXPORT Viewer : public KParts::ReadWritePart * So if you want to display a new image (not change the one shown) this * is the method to use. Else take a look at Canvas::setImage(). */ - virtual void newImage( const QImage & ) = 0; + virtual void newImage( const TQImage & ) = 0; /** * Tell the view to reload the current image. The host for this view diff --git a/kview/kview.cpp b/kview/kview.cpp index a9af213e..44d792df 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -42,15 +42,15 @@ #include <kstdaccel.h> #include <kprogress.h> -#include <qimage.h> -#include <qsize.h> -#include <qscrollbar.h> -#include <qstyle.h> -#include <qclipboard.h> -#include <qdragobject.h> -#include <qvaluelist.h> -#include <qtimer.h> -#include <qdockarea.h> +#include <tqimage.h> +#include <tqsize.h> +#include <tqscrollbar.h> +#include <tqstyle.h> +#include <tqclipboard.h> +#include <tqdragobject.h> +#include <tqvaluelist.h> +#include <tqtimer.h> +#include <tqdockarea.h> #include <assert.h> #include <kplugininfo.h> @@ -82,28 +82,28 @@ KView::KView() setStandardToolBarMenuEnabled( true ); - connect( part->widget(), SIGNAL( imageSizeChanged( const QSize & ) ), - SLOT( imageSizeChanged( const QSize & ) ) ); - connect( part->widget(), SIGNAL( selectionChanged( const QRect & ) ), - SLOT( selectionChanged( const QRect & ) ) ); - connect( part->widget(), SIGNAL( contextPress( const QPoint & ) ), - SLOT( contextPress( const QPoint & ) ) ); - - connect( QApplication::clipboard(), SIGNAL( dataChanged() ), - SLOT( clipboardDataChanged() ) ); - - connect( m_pViewer, SIGNAL( started( KIO::Job * ) ), - this, SLOT( jobStarted( KIO::Job * ) ) ); - connect( m_pViewer, SIGNAL( completed() ), - this, SLOT( jobCompleted() ) ); - connect( m_pViewer, SIGNAL( completed( bool ) ), - this, SLOT( jobCompleted( bool ) ) ); - connect( m_pViewer, SIGNAL( canceled( const QString & ) ), - this, SLOT( jobCanceled( const QString & ) ) ); - connect( m_pViewer, SIGNAL( imageOpened( const KURL & ) ), - m_paRecent, SLOT( addURL( const KURL & ) ) ); - - connect( m_pCanvas->widget(), SIGNAL( cursorPos( const QPoint & ) ), SLOT( cursorPos( const QPoint & ) ) ); + 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( KIO::Job * ) ), + this, TQT_SLOT( jobStarted( KIO::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 & ) ) ); m_paRecent->loadEntries( KGlobal::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(), this, SLOT( readSettings() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) ); setPluginLoadingMode( LoadPluginsIfEnabled ); createGUI( part ); @@ -126,7 +126,7 @@ KView::KView() statusBar()->insertItem( "", STATUSBAR_SIZE_ID, 0, true ); statusBar()->setItemFixed( STATUSBAR_SIZE_ID, 8 + fontMetrics().width( "8888 x 8888" ) ); - statusBar()->insertItem( QString::null, STATUSBAR_SELECTION_ID ); + statusBar()->insertItem( TQString::null, STATUSBAR_SELECTION_ID ); m_pProgressBar = new KProgress( statusBar() ); m_pProgressBar->setFixedSize( 140, fontMetrics().height() ); @@ -145,7 +145,7 @@ KView::KView() else { KMessageBox::error( this, i18n( "An error occurred while loading the KViewViewer KPart. Check your installation." ) ); - QTimer::singleShot( 0, kapp, SLOT( quit() ) ); + TQTimer::singleShot( 0, kapp, TQT_SLOT( quit() ) ); } } @@ -163,14 +163,14 @@ void KView::load( const KURL & url ) if( url.isLocalFile() ) { // XXX: this code is what - //KRecentDirs::add( QString::fromLatin1( ":load_image" ), url.directory() ); + //KRecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() ); // would do: - QString directory = url.directory(); - QString key = QString::fromLatin1( "load_image" ); + TQString directory = url.directory(); + TQString key = TQString::fromLatin1( "load_image" ); KConfig * config = KGlobal::config(); - config->setGroup( QString::fromLatin1( "Recent Dirs" ) ); - QStringList result = config->readPathListEntry( key ); + config->setGroup( TQString::fromLatin1( "Recent Dirs" ) ); + TQStringList result = config->readPathListEntry( key ); // make sure the dir is first in history result.remove( directory ); result.prepend( directory ); @@ -186,15 +186,15 @@ void KView::loadFromStdin() { if( m_pViewer ) { - QFile file; + TQFile file; file.open( IO_ReadOnly, stdin ); - QImage image( file.readAll() ); + TQImage image( file.readAll() ); file.close(); m_pViewer->newImage( image ); } } -QSize KView::sizeForCentralWidgetSize( QSize size ) +TQSize KView::sizeForCentralWidgetSize( TQSize size ) { // add size of the dockareas kdDebug( 4600 ) << "sizeForCentralWidgetSize " << size << endl; @@ -208,7 +208,7 @@ QSize KView::sizeForCentralWidgetSize( QSize size ) if( ! mb->isHidden() ) { size.rheight() += mb->heightForWidth( width() ); - if( style().styleHint( QStyle::SH_MainWindow_SpaceBelowMenuBar, this ) ) + if( style().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) ) size.rheight() += dockWindowsMovable() ? 1 : 2; } kdDebug( 4600 ) << "added Menubar: " << size << endl; @@ -249,9 +249,9 @@ void KView::readSettings() // KConfig * config ) loadPlugins(); } -bool KView::eventFilter( QObject * obj, QEvent * ev ) +bool KView::eventFilter( TQObject * obj, TQEvent * ev ) { - if( obj == m_pViewer->widget() && ev->type() == QEvent::Resize ) + if( obj == m_pViewer->widget() && ev->type() == TQEvent::Resize ) { if( m_nResizeMode == ResizeImage ) handleResize(); @@ -259,26 +259,26 @@ bool KView::eventFilter( QObject * obj, QEvent * ev ) return KParts::MainWindow::eventFilter( obj, ev ); } -void KView::imageSizeChanged( const QSize & /*size*/ ) +void KView::imageSizeChanged( const TQSize & /*size*/ ) { - QSize size = m_pCanvas->imageSize(); - statusBar()->changeItem( QString( "%1 x %2" ).arg( size.width() ).arg( size.height() ), STATUSBAR_SIZE_ID ); + TQSize size = m_pCanvas->imageSize(); + statusBar()->changeItem( TQString( "%1 x %2" ).arg( size.width() ).arg( size.height() ), STATUSBAR_SIZE_ID ); handleResize(); } -void KView::selectionChanged( const QRect & rect ) +void KView::selectionChanged( const TQRect & rect ) { kdDebug( 4600 ) << k_funcinfo << rect << endl; if( rect.isNull() ) - statusBar()->changeItem( QString::null, STATUSBAR_SELECTION_ID ); + statusBar()->changeItem( TQString::null, STATUSBAR_SELECTION_ID ); else - statusBar()->changeItem( QString( "%1, %2 - %3 x %4" ).arg( rect.x() ).arg( rect.y() ).arg( rect.width() ).arg( rect.height() ), STATUSBAR_SELECTION_ID ); + statusBar()->changeItem( TQString( "%1, %2 - %3 x %4" ).arg( rect.x() ).arg( rect.y() ).arg( rect.width() ).arg( rect.height() ), STATUSBAR_SELECTION_ID ); action( "crop" )->setEnabled( ! rect.isNull() ); } -void KView::contextPress( const QPoint & point ) +void KView::contextPress( const TQPoint & point ) { - QPopupMenu * pop = ( QPopupMenu* )factory()->container( "popupmenu", this ); + TQPopupMenu * pop = ( TQPopupMenu* )factory()->container( "popupmenu", this ); pop->popup( point ); } @@ -301,10 +301,10 @@ void KView::slotClose() void KView::slotCopy() { - QClipboard *cb = QApplication::clipboard(); + QClipboard *cb = TQApplication::clipboard(); cb->setSelectionMode( false ); - QRect selectarea = m_pCanvas->selection(); + TQRect selectarea = m_pCanvas->selection(); if( selectarea.isEmpty() ) { kdDebug( 4600 ) << k_funcinfo << " copy whole image" << endl; @@ -319,21 +319,21 @@ void KView::slotCopy() void KView::slotPaste() { - // Get QImage from clipboard and create a new image. - QClipboard *cb = QApplication::clipboard(); - QImage img = cb->image(); + // Get TQImage from clipboard and create a new image. + QClipboard *cb = TQApplication::clipboard(); + TQImage img = cb->image(); if( ! img.isNull() ) m_pViewer->newImage( img ); } void KView::slotCrop() { - QRect selectarea = m_pCanvas->selection(); + TQRect selectarea = m_pCanvas->selection(); kdDebug( 4600 ) << "Crop following area: " << selectarea.x() << ", " << selectarea.y() << ", " << selectarea.width() << ", " << selectarea.height() << endl; if( selectarea.isNull() ) return; - const QImage * origimg = m_pCanvas->image(); + const TQImage * origimg = m_pCanvas->image(); if( origimg == 0 ) return; @@ -387,7 +387,7 @@ void KView::slotConfigureToolbars() { saveMainWindowSettings( KGlobal::config(), "MainWindow" ); KEditToolbar dlg( factory() ); - connect( &dlg, SIGNAL( newToolbarConfig() ), SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } @@ -412,9 +412,9 @@ void KView::enableAction( const char * name, bool b ) void KView::clipboardDataChanged() { - QClipboard * cb = QApplication::clipboard(); + QClipboard * cb = TQApplication::clipboard(); cb->setSelectionMode( false ); - bool hasImage = QImageDrag::canDecode( cb->data( QClipboard::Clipboard ) ); + bool hasImage = TQImageDrag::canDecode( cb->data( QClipboard::Clipboard ) ); m_paPaste->setEnabled( hasImage ); } @@ -422,9 +422,9 @@ void KView::jobStarted( KIO::Job * job ) { if( job ) { - connect( job, SIGNAL( percent( KIO::Job *, unsigned long ) ), this, SLOT( loadingProgress( KIO::Job *, unsigned long ) ) ); - connect( job, SIGNAL( speed( KIO::Job *, unsigned long ) ), this, SLOT( speedProgress( KIO::Job *, unsigned long ) ) ); - //connect( job, SIGNAL( infoMessage( KIO::Job *, const QString & ) ), this, SLOT() ); + connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( loadingProgress( KIO::Job *, unsigned long ) ) ); + connect( job, TQT_SIGNAL( speed( KIO::Job *, unsigned long ) ), this, TQT_SLOT( speedProgress( KIO::Job *, unsigned long ) ) ); + //connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ), this, TQT_SLOT() ); loadingProgress( job, 0 ); speedProgress( job, 0 ); } @@ -441,7 +441,7 @@ void KView::jobCompleted( bool /*hasPending*/ ) statusBar()->changeItem( "", STATUSBAR_SPEED_ID ); } -void KView::jobCanceled( const QString & errorMsg ) +void KView::jobCanceled( const TQString & errorMsg ) { statusBar()->message( errorMsg ); jobCompleted(); @@ -463,7 +463,7 @@ void KView::loadingProgress( KIO::Job *, unsigned long percent ) void KView::speedProgress( KIO::Job *, unsigned long bytesPerSecond ) { - QString sizeStr; + TQString sizeStr; if( bytesPerSecond > 0 ) sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) ); @@ -473,7 +473,7 @@ void KView::speedProgress( KIO::Job *, unsigned long bytesPerSecond ) statusBar()->changeItem( sizeStr, STATUSBAR_SPEED_ID ); } -void KView::slotSetStatusBarText( const QString & msg ) +void KView::slotSetStatusBarText( const TQString & msg ) { kdDebug( 4600 ) << k_funcinfo << endl; statusBar()->message( msg ); @@ -481,59 +481,59 @@ void KView::slotSetStatusBarText( const QString & msg ) KMessageBox::information( this, msg ); } -void KView::cursorPos( const QPoint & pos ) +void KView::cursorPos( const TQPoint & pos ) { - statusBar()->changeItem( QString( "%1, %2" ).arg( pos.x() ).arg( pos.y() ), STATUSBAR_CURSOR_ID ); + statusBar()->changeItem( TQString( "%1, %2" ).arg( pos.x() ).arg( pos.y() ), STATUSBAR_CURSOR_ID ); } -void KView::setupActions( QObject * partobject ) +void KView::setupActions( TQObject * partobject ) { // File - KStdAction::open( this, SLOT( slotOpenFile() ), actionCollection() ); - m_paRecent = KStdAction::openRecent( this, SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); - KAction * aClose = KStdAction::close( this, SLOT( slotClose() ), actionCollection() ); + KStdAction::open( this, TQT_SLOT( slotOpenFile() ), actionCollection() ); + m_paRecent = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); + KAction * aClose = KStdAction::close( this, TQT_SLOT( slotClose() ), actionCollection() ); aClose->setEnabled( false ); - connect( m_pViewer->widget(), SIGNAL( hasImage( bool ) ), aClose, SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aClose, TQT_SLOT( setEnabled( bool ) ) ); - QObject * extension = partobject->child( 0, "KParts::BrowserExtension", false ); + TQObject * extension = partobject->child( 0, "KParts::BrowserExtension", false ); if( extension ) { - QStrList slotNames = extension->metaObject()->slotNames(); + TQStrList slotNames = extension->metaObject()->slotNames(); if( slotNames.contains( "print()" ) ) - KStdAction::print( extension, SLOT( print() ), actionCollection(), "print" ); + KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" ); if( slotNames.contains( "del()" ) ) ( void )new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, - extension, SLOT( del() ), actionCollection(), "del" ); - connect( extension, SIGNAL( enableAction( const char *, bool ) ), SLOT( enableAction( const char *, bool ) ) ); + extension, TQT_SLOT( del() ), actionCollection(), "del" ); + connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) ); } - KStdAction::quit( this, SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); // Edit - KAction * aCopy = KStdAction::copy( this, SLOT( slotCopy() ), actionCollection() ); + KAction * aCopy = KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); aCopy->setEnabled( false ); - connect( m_pViewer->widget(), SIGNAL( hasImage( bool ) ), aCopy, SLOT( setEnabled( bool ) ) ); - m_paPaste = KStdAction::paste( this, SLOT( slotPaste() ), actionCollection() ); + connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aCopy, TQT_SLOT( setEnabled( bool ) ) ); + m_paPaste = KStdAction::paste( this, TQT_SLOT( slotPaste() ), actionCollection() ); clipboardDataChanged(); //enable or disable paste - KAction * aCrop = new KAction( i18n( "Cr&op" ), Key_C, this, SLOT( slotCrop() ), actionCollection(), "crop" ); + KAction * aCrop = new KAction( i18n( "Cr&op" ), Key_C, this, TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); aCrop->setEnabled( false ); KAction * aReload = new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut( KStdAccel::Reload ), partobject, - SLOT( reload() ), actionCollection(), "reload" ); + TQT_SLOT( reload() ), actionCollection(), "reload" ); aReload->setEnabled( false ); - connect( m_pViewer->widget(), SIGNAL( hasImage( bool ) ), aReload, SLOT( setEnabled( bool ) ) ); + connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aReload, TQT_SLOT( setEnabled( bool ) ) ); // Settings - m_paShowMenubar = KStdAction::showMenubar( this, SLOT( slotToggleMenubar() ), actionCollection() ); + m_paShowMenubar = KStdAction::showMenubar( this, TQT_SLOT( slotToggleMenubar() ), actionCollection() ); createStandardStatusBarAction(); m_paShowStatusBar = ::qt_cast<KToggleAction*>( action( "options_show_statusbar" ) ); if( m_paShowStatusBar ) - connect( m_paShowStatusBar, SIGNAL( toggled( bool ) ), SLOT( statusbarToggled( bool ) ) ); + connect( m_paShowStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( statusbarToggled( bool ) ) ); m_paShowFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); - connect( m_paShowFullScreen, SIGNAL( toggled( bool )), this, SLOT( slotUpdateFullScreen( bool ))); - KStdAction::preferences( this, SLOT( slotPreferences() ), actionCollection() ); - KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), + connect( m_paShowFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars( this, SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); } void KView::handleResize() @@ -552,13 +552,13 @@ void KView::handleResize() m_pCanvas->boundImageTo( m_pViewer->widget()->size() ); break; case BestFit: - QSize imageSize = m_pCanvas->imageSize(); + TQSize imageSize = m_pCanvas->imageSize(); if( imageSize.isEmpty() ) return; // Compare the image size and the maximum available space in the // display canvas i.e. will the image fit without resizing ? - QSize maxCanvas = maxCanvasSize(); + TQSize maxCanvas = maxCanvasSize(); if( ( maxCanvas.height() >= imageSize.height() ) && ( maxCanvas.width() >= imageSize.width() ) ) { @@ -588,14 +588,14 @@ void KView::fitWindowToImage() bool centeredOrig = m_pCanvas->centered(); m_pCanvas->setCentered( false ); - QSize imagesize = m_pCanvas->currentSize(); + TQSize imagesize = m_pCanvas->currentSize(); if( imagesize.isEmpty() ) return; - QSize winsize = sizeForCentralWidgetSize( imagesize ); - QRect workarea = m_pWinModule->workArea(); + TQSize winsize = sizeForCentralWidgetSize( imagesize ); + TQRect workarea = m_pWinModule->workArea(); - QScrollBar * sb = new QScrollBar( Qt::Horizontal, this ); + TQScrollBar * sb = new TQScrollBar( Qt::Horizontal, this ); int scrollbarwidth = sb->height(); delete sb; @@ -614,7 +614,7 @@ void KView::fitWindowToImage() winsize.setWidth( workarea.width() ); } - QRect winrect( geometry() ); + TQRect winrect( geometry() ); winrect.setSize( winsize ); int xdiff = winrect.x() + winrect.width() - workarea.x() - workarea.width(); @@ -636,7 +636,7 @@ void KView::fitWindowToImage() m_pCanvas->setCentered( centeredOrig ); } -QSize KView::barSize( int mainwinwidth, BarSizeFrom from ) +TQSize KView::barSize( int mainwinwidth, BarSizeFrom from ) { int height = 0; int width = 0; @@ -653,7 +653,7 @@ QSize KView::barSize( int mainwinwidth, BarSizeFrom from ) width += toolBar()->width(); break; case KToolBar::Flat: - height += kapp->style().pixelMetric( QStyle::PM_DockWindowHandleExtent ); + height += kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ); break; case KToolBar::Floating: break; @@ -666,14 +666,14 @@ QSize KView::barSize( int mainwinwidth, BarSizeFrom from ) if( statusBar()->isVisibleTo( this ) ) height += statusBar()->height(); - return QSize( width, height ); + return TQSize( width, height ); } -QSize KView::maxCanvasSize() +TQSize KView::maxCanvasSize() { - QSize workarea = m_pWinModule->workArea().size(); - QSize framesize = frameSize() - size(); - QSize maxcanvassize = workarea - framesize - barSize( workarea.width() - framesize.width(), FromWidgetSize ); + TQSize workarea = m_pWinModule->workArea().size(); + TQSize framesize = frameSize() - size(); + TQSize maxcanvassize = workarea - framesize - barSize( workarea.width() - framesize.width(), FromWidgetSize ); kdDebug( 4600 ) << "maxcanvassize = " << maxcanvassize.width() << "x" << maxcanvassize.height() << endl; return maxcanvassize; } diff --git a/kview/kview.h b/kview/kview.h index 0f523efc..6726fb8b 100644 --- a/kview/kview.h +++ b/kview/kview.h @@ -31,13 +31,13 @@ namespace KImageViewer { class Canvas; class Viewer; } -class QSize; -class QRect; +class TQSize; +class TQRect; class KAction; class KToggleAction; class KRecentFilesAction; class KWinModule; -class QStringList; +class TQStringList; class KProgress; class KView : public KParts::MainWindow @@ -48,7 +48,7 @@ class KView : public KParts::MainWindow virtual ~KView(); void load( const KURL & url ); void loadFromStdin(); - QSize sizeForCentralWidgetSize( QSize ); + TQSize sizeForCentralWidgetSize( TQSize ); KImageViewer::Viewer * viewer() const { return m_pViewer; } protected: @@ -57,13 +57,13 @@ class KView : public KParts::MainWindow void readProperties( KConfig * ); void saveSettings( KConfig * ); - virtual bool eventFilter( QObject *, QEvent * ); + virtual bool eventFilter( TQObject *, TQEvent * ); protected slots: void readSettings(); //KConfig * ); - void imageSizeChanged( const QSize & ); - void selectionChanged( const QRect & ); - void contextPress( const QPoint & ); + void imageSizeChanged( const TQSize & ); + void selectionChanged( const TQRect & ); + void contextPress( const TQPoint & ); void slotOpenFile(); void slotOpenRecent( const KURL & ); void slotClose(); @@ -81,11 +81,11 @@ class KView : public KParts::MainWindow void jobStarted( KIO::Job * ); void jobCompleted(); void jobCompleted( bool ); - void jobCanceled( const QString & ); + void jobCanceled( const TQString & ); void loadingProgress( KIO::Job *, unsigned long ); void speedProgress( KIO::Job *, unsigned long ); - void slotSetStatusBarText( const QString & ); - void cursorPos( const QPoint & ); // write the cursor pos to the statusbar + void slotSetStatusBarText( const TQString & ); + void cursorPos( const TQPoint & ); // write the cursor pos to the statusbar void loadPlugins(); void statusbarToggled( bool ); @@ -93,11 +93,11 @@ class KView : public KParts::MainWindow enum BarSizeFrom { FromImageSize, FromWidgetSize }; enum ResizeMode { ResizeWindow = 0, ResizeImage = 1, NoResize = 2, BestFit = 3 }; enum StatusBarItem { STATUSBAR_SPEED_ID, STATUSBAR_CURSOR_ID, STATUSBAR_SIZE_ID, STATUSBAR_SELECTION_ID }; - void setupActions( QObject * ); + void setupActions( TQObject * ); void handleResize(); void fitWindowToImage(); - QSize barSize( int, BarSizeFrom ); - QSize maxCanvasSize(); + TQSize barSize( int, BarSizeFrom ); + TQSize maxCanvasSize(); KImageViewer::Viewer * m_pViewer; KImageViewer::Canvas * m_pCanvas; diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index c5e47dac..4ecf07b9 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -20,9 +20,9 @@ #include "generalconfigwidget.h" #include "defaults.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qframe.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqframe.h> #include <klocale.h> #include <ksimpleconfig.h> @@ -31,14 +31,14 @@ #include <knuminput.h> #include <kgenericfactory.h> -typedef KGenericFactory<KViewCanvasConfig, QWidget> KViewCanvasConfigFactory; +typedef KGenericFactory<KViewCanvasConfig, TQWidget> KViewCanvasConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewcanvasconfig, KViewCanvasConfigFactory( "kcm_kviewcanvasconfig" ) ) -KViewCanvasConfig::KViewCanvasConfig( QWidget * parent, const char *, const QStringList & args ) +KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQStringList & args ) : KCModule( KViewCanvasConfigFactory::instance(), parent, args ) , m_config( new KConfig( "kviewcanvasrc" ) ) { - QBoxLayout * layout = new QVBoxLayout( this ); + TQBoxLayout * layout = new TQVBoxLayout( this ); layout->setAutoAdd( true ); m_pWidget = new GeneralConfigWidget( this ); @@ -52,21 +52,21 @@ KViewCanvasConfig::KViewCanvasConfig( QWidget * parent, const char *, const QStr for( unsigned int i = 1; i <= Defaults::numOfBlendEffects; ++i ) { - QCheckListItem * item = new QCheckListItem( m_pWidget->m_pListView, i18n( Defaults::blendEffectDescription[ i ] ), QCheckListItem::CheckBox ); + TQCheckListItem * item = new TQCheckListItem( m_pWidget->m_pListView, i18n( Defaults::blendEffectDescription[ i ] ), TQCheckListItem::CheckBox ); m_items.append( item ); } - connect( m_pWidget->m_pListView, SIGNAL( clicked( QListViewItem * ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_pListView, SIGNAL( spacePressed( QListViewItem * ) ), this, SLOT( configChanged() ) ); + 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, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_pKeepRatio, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_pCenterImage, SIGNAL( toggled( bool ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_bgColor, SIGNAL( changed( const QColor & ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_pMinWidth, SIGNAL( valueChanged( int ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_pMaxWidth, SIGNAL( valueChanged( int ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_pMinHeight, SIGNAL( valueChanged( int ) ), this, SLOT( configChanged() ) ); - connect( m_pWidget->m_pMaxHeight, SIGNAL( valueChanged( int ) ), this, 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() ) ); load(); } @@ -90,9 +90,9 @@ void KViewCanvasConfig::save() cfgGroup.writeEntry( "Maximum Height", m_pWidget->m_pMaxHeight->value() ); KConfigGroup cfgGroup2( m_config, "Blend Effects" ); - QCheckListItem *item = m_items.first(); + TQCheckListItem *item = m_items.first(); for( int i = 1; item; item = m_items.next(), ++i ) - cfgGroup2.writeEntry( QString::number( i ), item->isOn() ); + cfgGroup2.writeEntry( TQString::number( i ), item->isOn() ); m_config->sync(); } @@ -111,9 +111,9 @@ void KViewCanvasConfig::load() m_pWidget->m_pMaxHeight->setValue( cfgGroup.readNumEntry( "Maximum Height", Defaults::maxSize.height() ) ); KConfigGroup cfgGroup2( m_config, "Blend Effects" ); - QCheckListItem * item = m_items.first(); + TQCheckListItem * item = m_items.first(); for( int i = 1; item; item = m_items.next(), ++i ) - item->setOn( cfgGroup2.readBoolEntry( QString::number( i ), false ) ); + item->setOn( cfgGroup2.readBoolEntry( TQString::number( i ), false ) ); } void KViewCanvasConfig::defaults() @@ -129,7 +129,7 @@ void KViewCanvasConfig::defaults() m_pWidget->m_pMaxWidth ->setValue( Defaults::maxSize.width() ); m_pWidget->m_pMaxHeight->setValue( Defaults::maxSize.height() ); - QCheckListItem * item = m_items.first(); + TQCheckListItem * item = m_items.first(); for( int i = 1; item; item = m_items.next(), ++i ) item->setOn( false ); emit changed( true ); diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h index f7dfe262..e513a9cd 100644 --- a/kview/kviewcanvas/config/confmodules.h +++ b/kview/kviewcanvas/config/confmodules.h @@ -20,17 +20,17 @@ #define CONFMODULES_H #include <kcmodule.h> -#include <qptrlist.h> +#include <tqptrlist.h> class GeneralConfigWidget; -class QCheckListItem; +class TQCheckListItem; class KConfig; class KViewCanvasConfig : public KCModule { Q_OBJECT public: - KViewCanvasConfig( QWidget * parent, const char * name = 0, const QStringList & args = QStringList() ); + KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewCanvasConfig(); void load(); @@ -43,7 +43,7 @@ class KViewCanvasConfig : public KCModule private: KConfig * m_config; GeneralConfigWidget * m_pWidget; - QPtrList<QCheckListItem> m_items; + TQPtrList<TQCheckListItem> m_items; }; // vim:sw=4:ts=4 diff --git a/kview/kviewcanvas/config/defaults.h b/kview/kviewcanvas/config/defaults.h index 0a92d651..02abbb19 100644 --- a/kview/kviewcanvas/config/defaults.h +++ b/kview/kviewcanvas/config/defaults.h @@ -20,16 +20,16 @@ #define DEFAULTS_H #include <klocale.h> -#include <qsize.h> -#include <qcolor.h> +#include <tqsize.h> +#include <tqcolor.h> namespace Defaults { static const bool smoothScaling = false; static const bool keepAspectRatio = true; static const bool centerImage = true; - static const QColor bgColor( Qt::black ); - static const QSize minSize( 1, 1 ); - static const QSize maxSize( 10000, 10000 ); + static const TQColor bgColor( Qt::black ); + static const TQSize minSize( 1, 1 ); + static const TQSize maxSize( 10000, 10000 ); static const unsigned int numOfBlendEffects = 4; static const char * blendEffectDescription[ 6 ] = { I18N_NOOP( "No Blending" ), diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index 6c54850f..97001670 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -21,11 +21,11 @@ #include "version.h" #include "config/defaults.h" -#include <qcolor.h> -#include <qimage.h> -#include <qapplication.h> -#include <qwmatrix.h> -#include <qtimer.h> +#include <tqcolor.h> +#include <tqimage.h> +#include <tqapplication.h> +#include <tqwmatrix.h> +#include <tqtimer.h> #include <kpixmap.h> #include <kdebug.h> @@ -43,14 +43,14 @@ typedef KGenericFactory<KImageCanvas> KImageCanvasFactory; K_EXPORT_COMPONENT_FACTORY( libkviewcanvas, KImageCanvasFactory( "kviewcanvas" ) ) -KImageCanvas::KImageCanvas( QWidget * parent, const char * name, const QStringList & ) - : QScrollView( parent, name, WResizeNoErase | WStaticContents ) +KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQStringList & ) + : TQScrollView( parent, name, WResizeNoErase | WStaticContents ) , m_client( 0 ) , m_oldClient( 0 ) , m_image( 0 ) , m_imageTransformed( 0 ) , m_pixmap( 0 ) - , m_pTimer( new QTimer( this, "KImageCanvas/Timer" ) ) + , m_pTimer( new TQTimer( this, "KImageCanvas/Timer" ) ) , m_maxsize( Defaults::maxSize ) , m_minsize( Defaults::minSize ) , m_currentsize( 0, 0 ) @@ -66,22 +66,22 @@ KImageCanvas::KImageCanvas( QWidget * parent, const char * name, const QStringLi , m_iBlendTimerId( 0 ) { kdDebug( 4620 ) << k_funcinfo << endl; - setFrameStyle( QFrame::NoFrame ); - setResizePolicy( QScrollView::Manual ); + setFrameStyle( TQFrame::NoFrame ); + setResizePolicy( TQScrollView::Manual ); setMinimumSize( 0, 0 ); setBgColor( Defaults::bgColor ); - connect( this, SIGNAL( imageChanged() ), this, SLOT( slotImageChanged() ) ); - connect( m_pTimer, SIGNAL( timeout() ), this, SLOT( hideCursor() ) ); + connect( this, TQT_SIGNAL( imageChanged() ), this, TQT_SLOT( slotImageChanged() ) ); + connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( hideCursor() ) ); KSettings::Dispatcher::self()->registerInstance( KImageCanvasFactory::instance(), this, - SLOT( loadSettings() ) ); + TQT_SLOT( loadSettings() ) ); viewport()->setFocusProxy( this ); clear(); - QWidget::setMouseTracking( true ); + TQWidget::setMouseTracking( true ); viewport()->setMouseTracking( true ); m_cursor.setShape( Qt::CrossCursor ); viewport()->setCursor( m_cursor ); @@ -97,7 +97,7 @@ KImageCanvas::~KImageCanvas() delete m_pixmap; m_pixmap = 0; } -void KImageCanvas::setBgColor( const QColor & color ) +void KImageCanvas::setBgColor( const TQColor & color ) { kdDebug( 4620 ) << k_funcinfo << endl; viewport()->setPaletteBackgroundColor( color ); @@ -105,7 +105,7 @@ void KImageCanvas::setBgColor( const QColor & color ) m_client->setPaletteBackgroundColor( color ); } -const QColor & KImageCanvas::bgColor() const +const TQColor & KImageCanvas::bgColor() const { kdDebug( 4620 ) << k_funcinfo << endl; return viewport()->paletteBackgroundColor(); @@ -120,38 +120,38 @@ int KImageCanvas::imageDepth() const return m_image->depth(); } -QSize KImageCanvas::imageSize() const +TQSize KImageCanvas::imageSize() const { //kdDebug( 4620 ) << k_funcinfo << endl; if( ! m_image ) - return QSize( 0, 0 ); + return TQSize( 0, 0 ); - return m_matrix.isIdentity() ? m_image->size() : m_matrix.mapRect( QRect( QPoint(), m_image->size() ) ).size(); + return m_matrix.isIdentity() ? m_image->size() : m_matrix.mapRect( TQRect( TQPoint(), m_image->size() ) ).size(); } -QSize KImageCanvas::currentSize() const +TQSize KImageCanvas::currentSize() const { kdDebug( 4620 ) << k_funcinfo << endl; if( ! m_image ) - return QSize( 0, 0 ); + return TQSize( 0, 0 ); return m_currentsize; } -const QImage * KImageCanvas::image() const +const TQImage * KImageCanvas::image() const { if( m_imageTransformed ) return m_imageTransformed; return m_image; } -QRect KImageCanvas::selection() const +TQRect KImageCanvas::selection() const { kdDebug( 4620 ) << k_funcinfo << endl; if( m_client ) return m_selection; else - return QRect(); + return TQRect(); } void KImageCanvas::setCentered( bool centered ) @@ -164,13 +164,13 @@ void KImageCanvas::setCentered( bool centered ) } } -void KImageCanvas::setImage( const QImage & newimage ) +void KImageCanvas::setImage( const TQImage & newimage ) { bool emitHasImage = m_image ? false : true; m_matrix.reset(); matrixChanged(); delete m_image; - m_image = new QImage( newimage ); + m_image = new TQImage( newimage ); m_bNewImage = true; // don't emit the signal here - call the slot directly slotImageChanged(); @@ -181,14 +181,14 @@ void KImageCanvas::setImage( const QImage & newimage ) emit hasImage( true ); } -void KImageCanvas::setImage( const QImage & newimage, const QSize & size ) +void KImageCanvas::setImage( const TQImage & newimage, const TQSize & size ) { kdDebug( 4620 ) << k_funcinfo << size << endl; bool emitHasImage = m_image ? false : true; m_matrix.reset(); matrixChanged(); delete m_image; - m_image = new QImage( newimage ); + m_image = new TQImage( newimage ); m_bNewImage = true; // don't emit the signal here - call the slot directly slotImageChanged(); @@ -214,7 +214,7 @@ void KImageCanvas::setZoom( double zoom ) } } -void KImageCanvas::boundImageTo( const QSize & size ) +void KImageCanvas::boundImageTo( const TQSize & size ) { bool keepAspectRatio = m_keepaspectratio; m_keepaspectratio = true; @@ -222,7 +222,7 @@ void KImageCanvas::boundImageTo( const QSize & size ) m_keepaspectratio = keepAspectRatio; } -void KImageCanvas::setMaximumImageSize( const QSize & maxsize ) +void KImageCanvas::setMaximumImageSize( const TQSize & maxsize ) { kdDebug( 4620 ) << k_funcinfo << maxsize << endl; if( ( ! m_minsize.isEmpty() ) && @@ -237,7 +237,7 @@ void KImageCanvas::setMaximumImageSize( const QSize & maxsize ) resizeImage( m_currentsize ); } -void KImageCanvas::setMinimumImageSize( const QSize & minsize ) +void KImageCanvas::setMinimumImageSize( const TQSize & minsize ) { kdDebug( 4620 ) << k_funcinfo << minsize << endl; if( ( ! m_maxsize.isEmpty() ) && @@ -252,13 +252,13 @@ void KImageCanvas::setMinimumImageSize( const QSize & minsize ) resizeImage( m_currentsize ); } -void KImageCanvas::resizeImage( const QSize & newsize ) +void KImageCanvas::resizeImage( const TQSize & newsize ) { kdDebug( 4620 ) << k_funcinfo << endl; if( m_image == 0 ) return; - QSize size = newsize; + TQSize size = newsize; // check that it fits into min and max sizes checkBounds( size ); @@ -301,7 +301,7 @@ unsigned int KImageCanvas::numOfBlendEffects() const return Defaults::numOfBlendEffects; } -QString KImageCanvas::blendEffectDescription( unsigned int idx ) const +TQString KImageCanvas::blendEffectDescription( unsigned int idx ) const { kdDebug( 4620 ) << k_funcinfo << endl; switch( idx ) @@ -321,14 +321,14 @@ QString KImageCanvas::blendEffectDescription( unsigned int idx ) const return i18n( Defaults::blendEffectDescription[ 4 ] ); } kdError( 4620 ) << "Effect description for effect with index " << idx << " doesn't exist\n"; - return QString::null; + return TQString::null; } -bool KImageCanvas::eventFilter( QObject * obj, QEvent * ev ) +bool KImageCanvas::eventFilter( TQObject * obj, TQEvent * ev ) { - if( ( obj == m_client || obj == m_oldClient ) && ev->type() == QEvent::MouseMove ) - mouseMoveEvent( static_cast<QMouseEvent*>( ev ) ); - return QScrollView::eventFilter( obj, ev ); + if( ( obj == m_client || obj == m_oldClient ) && ev->type() == TQEvent::MouseMove ) + mouseMoveEvent( static_cast<TQMouseEvent*>( ev ) ); + return TQScrollView::eventFilter( obj, ev ); } void KImageCanvas::setFastScale( bool fastscale ) @@ -370,7 +370,7 @@ void KImageCanvas::flipHorizontal( bool change ) if( change ) { - QWMatrix matrix( 1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F ); + TQWMatrix matrix( 1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F ); *m_image = m_image->xForm( matrix ); emit imageChanged(); } @@ -391,7 +391,7 @@ void KImageCanvas::flipVertical( bool change ) if( change ) { - QWMatrix matrix( -1.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F ); + TQWMatrix matrix( -1.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F ); *m_image = m_image->xForm( matrix ); emit imageChanged(); } @@ -412,7 +412,7 @@ void KImageCanvas::rotate( double a, bool change ) if( change ) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate( a ); *m_image = m_image->xForm( matrix ); emit imageChanged(); @@ -427,13 +427,13 @@ void KImageCanvas::rotate( double a, bool change ) updateImage(); } -void KImageCanvas::checkBounds( QSize & newsize ) +void KImageCanvas::checkBounds( TQSize & newsize ) { kdDebug( 4620 ) << k_funcinfo << endl; if( m_keepaspectratio ) { // check that the new size has the same aspect ratio the original image had - QSize origsize = imageSize(); + TQSize origsize = imageSize(); double x1 = double( origsize.height() ) / double( newsize.height() ); double x2 = double( origsize.width() ) / double( newsize.width() ); if( ( newsize * x1 != origsize ) || ( newsize * x2 != origsize ) ) @@ -485,13 +485,13 @@ void KImageCanvas::checkBounds( QSize & newsize ) } } -void KImageCanvas::zoomFromSize( const QSize & newsize ) +void KImageCanvas::zoomFromSize( const TQSize & newsize ) { kdDebug( 4620 ) << k_funcinfo << endl; if( ! m_image ) return; - QSize originalsize = imageSize(); + TQSize originalsize = imageSize(); double widthzoom = double( newsize.width() ) / double( originalsize.width() ); double heightzoom = double( newsize.height() ) / double( originalsize.height() ); double zoom = ( widthzoom + heightzoom ) / 2; @@ -508,7 +508,7 @@ void KImageCanvas::sizeFromZoom( double zoom ) if( ! m_image ) return; - QSize newsize = zoom * imageSize(); + TQSize newsize = zoom * imageSize(); kdDebug( 4620 ) << "change size from " << imageSize() << " to " << newsize << endl; resizeImage( newsize ); } @@ -517,7 +517,7 @@ void KImageCanvas::updateImage() { kdDebug( 4620 ) << k_funcinfo << endl; if( ! m_bImageUpdateScheduled ) - QTimer::singleShot( 0, this, SLOT( slotUpdateImage() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateImage() ) ); m_bImageUpdateScheduled = true; } @@ -532,7 +532,7 @@ void KImageCanvas::slotUpdateImage() if( m_bImageChanged || m_bSizeChanged || m_bMatrixChanged ) { kdDebug( 4620 ) << "actually updating the image now" << endl; - QApplication::setOverrideCursor( WaitCursor ); + TQApplication::setOverrideCursor( WaitCursor ); if( m_bNewImage || ! m_client ) { finishNewClient(); @@ -543,14 +543,14 @@ void KImageCanvas::slotUpdateImage() if( m_bSizeChanged || m_bNewImage ) { - QSize sh = m_client->sizeHint(); + TQSize sh = m_client->sizeHint(); if( ! sh.isValid() ) - sh = QSize( 0, 0 ); + sh = TQSize( 0, 0 ); m_client->resize( sh ); resizeContents( sh.width(), sh.height() ); center(); } - QRect drawRect = m_client->drawRect(); + TQRect drawRect = m_client->drawRect(); switch( m_iBlendEffect ) { case NoBlending: @@ -576,7 +576,7 @@ void KImageCanvas::slotUpdateImage() } m_client->update(); m_iBlendTimerId = startTimer( 5 ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } m_bNewImage = false; @@ -585,7 +585,7 @@ void KImageCanvas::slotUpdateImage() m_bMatrixChanged = false; } -void KImageCanvas::mouseMoveEvent( QMouseEvent * ) +void KImageCanvas::mouseMoveEvent( TQMouseEvent * ) { if( m_cursor.shape() == Qt::BlankCursor ) { @@ -598,21 +598,21 @@ void KImageCanvas::mouseMoveEvent( QMouseEvent * ) } -void KImageCanvas::resizeEvent( QResizeEvent * ev ) +void KImageCanvas::resizeEvent( TQResizeEvent * ev ) { kdDebug( 4620 ) << "KImageCanvas resized to " << ev->size() << endl; - QScrollView::resizeEvent( ev ); + TQScrollView::resizeEvent( ev ); center(); } -void KImageCanvas::contentsMousePressEvent( QMouseEvent * ev ) +void KImageCanvas::contentsMousePressEvent( TQMouseEvent * ev ) { if ( ev->button() == RightButton ) emit contextPress( ev->globalPos() ); - QScrollView::contentsMousePressEvent( ev ); + TQScrollView::contentsMousePressEvent( ev ); } -void KImageCanvas::contentsWheelEvent( QWheelEvent * ev ) +void KImageCanvas::contentsWheelEvent( TQWheelEvent * ev ) { //kdDebug( 4620 ) << k_funcinfo << endl; // Ctrl+Wheelmouse changes the zoom. @@ -673,10 +673,10 @@ void KImageCanvas::contentsWheelEvent( QWheelEvent * ev ) setFastScale( oldscale ); } else - QScrollView::contentsWheelEvent( ev ); + TQScrollView::contentsWheelEvent( ev ); } -void KImageCanvas::keyPressEvent( QKeyEvent * ev ) +void KImageCanvas::keyPressEvent( TQKeyEvent * ev ) { //kdDebug( 4620 ) << k_funcinfo << endl; switch( ev->key() ) @@ -711,11 +711,11 @@ void KImageCanvas::keyPressEvent( QKeyEvent * ev ) } } -void KImageCanvas::timerEvent( QTimerEvent * ev ) +void KImageCanvas::timerEvent( TQTimerEvent * ev ) { if( ev->timerId() == m_iBlendTimerId ) { - QRect drawRect = m_client->drawRect(); + TQRect drawRect = m_client->drawRect(); switch( m_iBlendEffect ) { case NoBlending: @@ -795,7 +795,7 @@ const KPixmap KImageCanvas::pixmap() { delete m_imageTransformed; // we create a new image transformed by the matrix - m_imageTransformed = new QImage( m_matrix.isIdentity() ? *m_image : m_image->xForm( m_matrix ) ); + m_imageTransformed = new TQImage( m_matrix.isIdentity() ? *m_image : m_image->xForm( m_matrix ) ); kdDebug( 4620 ) << "Size of m_image: " << m_image->size() << endl; kdDebug( 4620 ) << "Size of m_imageTransformed: " << m_imageTransformed->size() << endl; } @@ -806,7 +806,7 @@ const KPixmap KImageCanvas::pixmap() if( m_fastscale ) { // fast scaling is needed so we need to scale now - QWMatrix matrix( m_matrix ); + TQWMatrix matrix( m_matrix ); matrix.scale( m_zoom, m_zoom ); if( ! matrix.isIdentity() ) return m_pixmap->xForm( matrix ); @@ -832,10 +832,10 @@ void KImageCanvas::loadSettings() setBgColor( cfgGroup.readColorEntry( "Background Color", &bgColor() ) ); - setMinimumImageSize( QSize( cfgGroup.readNumEntry( "Minimum Width", + setMinimumImageSize( TQSize( cfgGroup.readNumEntry( "Minimum Width", minimumImageSize().width() ), cfgGroup.readNumEntry( "Minimum Height", minimumImageSize().height() ) ) ); - setMaximumImageSize( QSize( cfgGroup.readNumEntry( "Maximum Width", + setMaximumImageSize( TQSize( cfgGroup.readNumEntry( "Maximum Width", maximumImageSize().width() ), cfgGroup.readNumEntry( "Maximum Height", maximumImageSize().height() ) ) ); @@ -845,7 +845,7 @@ void KImageCanvas::loadSettings() m_vEffects.clear(); for( unsigned int i = 1; i <= numOfBlendEffects(); ++i ) { - if( blendConfig.readBoolEntry( QString::number( i ), false ) ) + if( blendConfig.readBoolEntry( TQString::number( i ), false ) ) m_vEffects.push_back( i ); } // and now tell the canvas what blend effect to use @@ -853,7 +853,7 @@ void KImageCanvas::loadSettings() */ } -void KImageCanvas::selected( const QRect & rect ) +void KImageCanvas::selected( const TQRect & rect ) { //kdDebug( 4620 ) << k_funcinfo << rect << endl; m_selection = rect; @@ -868,9 +868,9 @@ void KImageCanvas::selected( const QRect & rect ) emit selectionChanged( m_selection ); } -void KImageCanvas::mapCursorPos( const QPoint & pos ) +void KImageCanvas::mapCursorPos( const TQPoint & pos ) { - QPoint mapped( static_cast<int>( ( pos.x() + 0.5 ) / m_zoom ), static_cast<int>( ( pos.y() + 0.5 ) / m_zoom ) ); + TQPoint mapped( static_cast<int>( ( pos.x() + 0.5 ) / m_zoom ), static_cast<int>( ( pos.y() + 0.5 ) / m_zoom ) ); //kdDebug( 4620 ) << k_funcinfo << pos << " -> " << mapped << endl; emit cursorPos( mapped ); } @@ -935,15 +935,15 @@ KImageHolder * KImageCanvas::createNewClient() client->setMouseTracking( true ); client->installEventFilter( this ); setFocusProxy( client ); - client->setFocusPolicy( QWidget::StrongFocus ); + client->setFocusPolicy( TQWidget::StrongFocus ); client->setFocus(); addChild( client, 0, 0 ); - connect( client, SIGNAL( contextPress( const QPoint& ) ), SIGNAL( contextPress( const QPoint& ) ) ); - connect( client, SIGNAL( cursorPos( const QPoint & ) ), SLOT( mapCursorPos( const QPoint & ) ) ); - connect( client, SIGNAL( selected( const QRect & ) ), SLOT( selected( const QRect & ) ) ); - connect( client, SIGNAL( wannaScroll( int, int ) ), SLOT( scrollBy( int, int ) ) ); + 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 ) ) ); return client; } diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h index 8a0bffda..04934c74 100644 --- a/kview/kviewcanvas/kimagecanvas.h +++ b/kview/kviewcanvas/kimagecanvas.h @@ -22,16 +22,16 @@ #include "kimageviewer/canvas.h" -#include <qscrollview.h> -#include <qwmatrix.h> -#include <qcursor.h> -#include <qrect.h> +#include <tqscrollview.h> +#include <tqwmatrix.h> +#include <tqcursor.h> +#include <tqrect.h> #include <kdemacros.h> class KImageHolder; -class QColor; -class QImage; +class TQColor; +class TQImage; class KPixmap; /** @@ -39,14 +39,14 @@ class KPixmap; * @author Matthias Kretz <kretz@kde.org> * @version $Id$ */ -class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas +class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas { Q_OBJECT public: /** * KImageCanvas Constructor */ - KImageCanvas( QWidget * parent, const char * name, const QStringList & args ); + KImageCanvas( TQWidget * parent, const char * name, const TQStringList & args ); /** * KImageCanvas Destructor @@ -56,12 +56,12 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * set the background color of the canvas */ - void setBgColor( const QColor & ); + void setBgColor( const TQColor & ); /** * returns the current background color */ - const QColor & bgColor() const; + const TQColor & bgColor() const; /** * the depth of the contained image @@ -71,12 +71,12 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * the size of the unzoomed image */ - QSize imageSize() const; + TQSize imageSize() const; /** * the size of the zoomed (current) image */ - QSize currentSize() const; + TQSize currentSize() const; /** * returns the zoom factor @@ -86,7 +86,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * returns the current (unzoomed) image */ - const QImage * image() const; + const TQImage * image() const; /** * Scrolls the content so that the point (x, y) is in the top-left corner. @@ -116,7 +116,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * Return the selected rectangle */ - QRect selection() const; + TQRect selection() const; /** * Returns whether the aspect ratio of the image is kept @@ -131,30 +131,30 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * @return the description of the blend effect */ - QString blendEffectDescription( unsigned int ) const; + TQString blendEffectDescription( unsigned int ) const; /** * @return the current maximum image size */ - const QSize & maximumImageSize() const { return m_maxsize; } + const TQSize & maximumImageSize() const { return m_maxsize; } /** * @return the current minimum image size */ - const QSize & minimumImageSize() const { return m_minsize; } + const TQSize & minimumImageSize() const { return m_minsize; } /** - * @return a pointer to the QWidget interface of this object + * @return a pointer to the TQWidget interface of this object */ - QWidget * widget() { return static_cast<QWidget *>( this ); } + TQWidget * widget() { return static_cast<TQWidget *>( this ); } - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); signals: /** * a mouse button was pressed and a context menu should be openend */ - void contextPress( const QPoint& ); + void contextPress( const TQPoint& ); /** * the size of the image has changed (a new image was loaded, or the @@ -162,7 +162,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas * * it passes the new size of the image */ - void imageSizeChanged( const QSize & ); + void imageSizeChanged( const TQSize & ); /** * The zoom of the image has changed. @@ -173,7 +173,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas * The selection has changed. Connect to this signal if you want to * do something with a selection of the image (e.g. crop). */ - void selectionChanged( const QRect & ); + void selectionChanged( const TQRect & ); /** * Emitted when an image is finished being shown. If a blend effect is being used @@ -199,7 +199,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * The current mouse cursor position on the image. */ - void cursorPos( const QPoint & ); + void cursorPos( const TQPoint & ); public slots: /** @@ -211,7 +211,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * give the canvas a new image to show. The zoom level is kept. */ - void setImage( const QImage & ); + void setImage( const TQImage & ); /** * Give the canvas a new image to show. @@ -219,7 +219,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas * You have to pass the size the image should have when it appears * on screen. */ - void setImage( const QImage &, const QSize & ); + void setImage( const TQImage &, const TQSize & ); /** * set the zoom to be used when showing the image @@ -229,7 +229,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas /** * Fit the image into the requested width and height. */ - void boundImageTo( const QSize & size ); + void boundImageTo( const TQSize & size ); /** * Set the maximum size of the image. If this is set the image will @@ -237,7 +237,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas * * If you set this to 0x0 the image size may be as big as possible */ - void setMaximumImageSize( const QSize & ); + void setMaximumImageSize( const TQSize & ); /** * Set the minimum size of the image. If this is set the image will @@ -245,14 +245,14 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas * * If you set this to 0x0 the image size can be as small as possible */ - void setMinimumImageSize( const QSize & ); + void setMinimumImageSize( const TQSize & ); /** * Resize the image to the given size. It will keep the aspect ratio * as long as keepAspectRatio is true (default). The image will be as * large as possible within the given constraints. */ - void resizeImage( const QSize & ); + void resizeImage( const TQSize & ); /** * Hides the scrollbars of the canvas. It's still possible to scroll @@ -295,17 +295,17 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas void rotate( double a, bool change = false ); protected: - void checkBounds( QSize & newsize ); - void zoomFromSize( const QSize & ); + void checkBounds( TQSize & newsize ); + void zoomFromSize( const TQSize & ); void sizeFromZoom( double ); void updateImage(); - void mouseMoveEvent( QMouseEvent * ); - void resizeEvent( QResizeEvent * ); - void contentsMousePressEvent( QMouseEvent * ); - void contentsWheelEvent( QWheelEvent * ); - void keyPressEvent( QKeyEvent * ); - void timerEvent( QTimerEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void resizeEvent( TQResizeEvent * ); + void contentsMousePressEvent( TQMouseEvent * ); + void contentsWheelEvent( TQWheelEvent * ); + void keyPressEvent( TQKeyEvent * ); + void timerEvent( TQTimerEvent * ); protected slots: void slotUpdateImage(); @@ -314,8 +314,8 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas void loadSettings(); private slots: - void selected( const QRect & ); // map rect to unzoomed rect - void mapCursorPos( const QPoint & ); + void selected( const TQRect & ); // map rect to unzoomed rect + void mapCursorPos( const TQPoint & ); private: enum BlendEffect { @@ -335,16 +335,16 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas KImageHolder * m_client; KImageHolder * m_oldClient; - QImage * m_image; //unzoomed copy of the current image - QImage * m_imageTransformed; //xForm( m_matrix ) copy of the current image + TQImage * m_image; //unzoomed copy of the current image + TQImage * m_imageTransformed; //xForm( m_matrix ) copy of the current image KPixmap * m_pixmap; //copy of the current pixmap (if ( m_fastscale ) it's unzoomed else it's m_imageTransformed.smoothScale()d) - QTimer * m_pTimer; // timer for single shot to hide the cursor - QCursor m_cursor; // the cursor show in the canvas (for auto-hiding) + TQTimer * m_pTimer; // timer for single shot to hide the cursor + TQCursor m_cursor; // the cursor show in the canvas (for auto-hiding) - QWMatrix m_matrix; // the current transformation matrix - QSize m_maxsize, m_minsize; - QSize m_currentsize; + TQWMatrix m_matrix; // the current transformation matrix + TQSize m_maxsize, m_minsize; + TQSize m_currentsize; double m_zoom; bool m_fastscale; @@ -358,7 +358,7 @@ class KDE_EXPORT KImageCanvas : public QScrollView, public KImageViewer::Canvas bool m_bNewImage; int m_iBlendTimerId; - QRect m_selection; //unzoomed selection rect + TQRect m_selection; //unzoomed selection rect }; // vim:sw=4:ts=4 diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index 9009c7fc..6ca63698 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -20,32 +20,32 @@ #include <assert.h> -#include <qcolor.h> -#include <qwidget.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpen.h> -#include <qmovie.h> -#include <qpixmap.h> +#include <tqcolor.h> +#include <tqwidget.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqmovie.h> +#include <tqpixmap.h> #include <kpixmap.h> #include <kdebug.h> #include "kimageholder.h" -KImageHolder::KImageHolder( QWidget * parent, const char * name ) - : QWidget( parent, name, Qt::WResizeNoErase | Qt::WRepaintNoErase ) +KImageHolder::KImageHolder( TQWidget * parent, const char * name ) + : TQWidget( parent, name, Qt::WResizeNoErase | Qt::WRepaintNoErase ) , m_selected( false ) , m_bSelecting( false ) , m_scrollTimerId( 0 ) , m_xOffset( 0 ) , m_yOffset( 0 ) - , m_pen( new QPen( QColor( 255, 255, 255 ), 0, DashLine ) ) + , m_pen( new TQPen( TQColor( 255, 255, 255 ), 0, DashLine ) ) , m_pPixmap( 0 ) , m_pDoubleBuffer( 0 ) , m_pCheckboardPixmap( 0 ) { - setBackgroundMode( QWidget::NoBackground ); + setBackgroundMode( TQWidget::NoBackground ); } KImageHolder::~KImageHolder() @@ -60,7 +60,7 @@ KImageHolder::~KImageHolder() m_pCheckboardPixmap = 0; } -void KImageHolder::mousePressEvent( QMouseEvent *ev ) +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 @@ -80,7 +80,7 @@ void KImageHolder::mousePressEvent( QMouseEvent *ev ) } } -void KImageHolder::mouseMoveEvent( QMouseEvent *ev ) +void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) { //FIXME: when scrolling the cursorpos shouldn't change if( this->rect().contains( ev->pos(), false ) ) @@ -91,12 +91,12 @@ void KImageHolder::mouseMoveEvent( QMouseEvent *ev ) // 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() & MidButton ) { - QPoint difference = m_scrollpos - ev->globalPos(); + TQPoint difference = m_scrollpos - ev->globalPos(); emit wannaScroll( difference.x(), difference.y() ); } else // create a selection { - QWidget * parentwidget = ( QWidget* )parent(); + TQWidget * parentwidget = ( TQWidget* )parent(); if( ! m_bSelecting ) { m_bSelecting = true; @@ -161,7 +161,7 @@ void KImageHolder::mouseMoveEvent( QMouseEvent *ev ) m_selection.setBottom( b ); emit selected( m_selection.normalize() ); - QPainter painter( this ); + TQPainter painter( this ); drawSelect( painter ); } } @@ -170,7 +170,7 @@ void KImageHolder::mouseMoveEvent( QMouseEvent *ev ) } } -void KImageHolder::mouseReleaseEvent( QMouseEvent * ev ) +void KImageHolder::mouseReleaseEvent( TQMouseEvent * ev ) { if( m_bSelecting ) { @@ -188,7 +188,7 @@ void KImageHolder::mouseReleaseEvent( QMouseEvent * ev ) clearSelection(); } -void KImageHolder::drawSelect( QPainter & painter ) +void KImageHolder::drawSelect( TQPainter & painter ) { painter.save(); painter.setRasterOp( XorROP ); @@ -199,15 +199,15 @@ void KImageHolder::drawSelect( QPainter & painter ) void KImageHolder::eraseSelect() { - QRegion r( m_selection.normalize() ); - QRect inner = m_selection.normalize(); + TQRegion r( m_selection.normalize() ); + TQRect inner = m_selection.normalize(); inner.rLeft() += 1; inner.rTop() += 1; inner.rRight() -= 1; inner.rBottom() -= 1; r -= inner; - QMemArray<QRect> rects = r.rects(); + TQMemArray<TQRect> rects = r.rects(); if( m_pDoubleBuffer ) for( unsigned int i = 0; i < rects.size(); ++i ) @@ -224,7 +224,7 @@ void KImageHolder::clearSelection() eraseSelect(); m_selected = false; } - m_selection.setSize( QSize( 0, 0 ) ); + m_selection.setSize( TQSize( 0, 0 ) ); emit selected( m_selection ); } @@ -235,7 +235,7 @@ void KImageHolder::setImage( const KPixmap & pix ) setPixmap( pix ); } -void KImageHolder::setImage( const QImage & image ) +void KImageHolder::setImage( const TQImage & image ) { clearSelection(); kdDebug( 4620 ) << "converting Image to Pixmap" << endl; @@ -244,11 +244,11 @@ void KImageHolder::setImage( const QImage & image ) setPixmap( pix ); } -void KImageHolder::setImage( const QMovie & /*movie*/ ) +void KImageHolder::setImage( const TQMovie & /*movie*/ ) { clearSelection(); //setMovie( movie ); - kdWarning( 4620 ) << "setImage( QMovie ) not implemented" << endl; + kdWarning( 4620 ) << "setImage( TQMovie ) not implemented" << endl; } void KImageHolder::clear() @@ -261,24 +261,24 @@ void KImageHolder::clear() clearSelection(); } -QRect KImageHolder::selection() const +TQRect KImageHolder::selection() const { if( m_selected ) return m_selection.normalize(); else - return QRect(); + return TQRect(); } -QSize KImageHolder::sizeHint() const +TQSize KImageHolder::sizeHint() const { if( m_pPixmap ) return m_pPixmap->size(); - return QSize( 0, 0 ); + return TQSize( 0, 0 ); } -void KImageHolder::paintEvent( QPaintEvent *ev ) +void KImageHolder::paintEvent( TQPaintEvent *ev ) { - QPainter painter( this ); + TQPainter painter( this ); painter.setClipRegion( ev->region().intersect( m_drawRect ) ); if( m_pPixmap ) { @@ -287,10 +287,10 @@ void KImageHolder::paintEvent( QPaintEvent *ev ) if( ! m_pDoubleBuffer ) { m_pDoubleBuffer = new KPixmap( m_pPixmap->size() ); - QPainter p( m_pDoubleBuffer ); + TQPainter p( m_pDoubleBuffer ); p.drawTiledPixmap( m_pDoubleBuffer->rect(), checkboardPixmap() ); p.end(); - bitBlt( m_pDoubleBuffer, QPoint( 0, 0 ), m_pPixmap, m_pPixmap->rect() ); + bitBlt( m_pDoubleBuffer, TQPoint( 0, 0 ), m_pPixmap, m_pPixmap->rect() ); } painter.drawPixmap( 0, 0, *m_pDoubleBuffer ); } @@ -301,7 +301,7 @@ void KImageHolder::paintEvent( QPaintEvent *ev ) drawSelect( painter ); } -void KImageHolder::timerEvent( QTimerEvent * ev ) +void KImageHolder::timerEvent( TQTimerEvent * ev ) { if( ev->timerId() != m_scrollTimerId ) return; diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index 780ce372..73148cbf 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -20,13 +20,13 @@ #ifndef _KIMAGEHOLDER_H #define _KIMAGEHOLDER_H -#include <qwidget.h> -class QRect; -class QPainter; -class QPen; -class QPixmap; +#include <tqwidget.h> +class TQRect; +class TQPainter; +class TQPen; +class TQPixmap; class KPixmap; -class QPoint; +class TQPoint; /** * @short Image widget @@ -36,15 +36,15 @@ class KImageHolder : public QWidget { Q_OBJECT public: - KImageHolder( QWidget *parent = 0, const char * name = 0 ); + KImageHolder( TQWidget *parent = 0, const char * name = 0 ); virtual ~KImageHolder(); void clearSelection(); void setImage( const KPixmap & ); - void setImage( const QImage & ); - void setImage( const QMovie & ); + void setImage( const TQImage & ); + void setImage( const TQMovie & ); /** * clears the ImageHolder @@ -54,37 +54,37 @@ class KImageHolder : public QWidget /** * the selected rect */ - QRect selection() const; + TQRect selection() const; - QSize sizeHint() const; + TQSize sizeHint() const; - void setDrawRect( const QRect & rect ) { m_drawRect = rect; } - const QRect & drawRect() const { return m_drawRect; } + void setDrawRect( const TQRect & rect ) { m_drawRect = rect; } + const TQRect & drawRect() const { return m_drawRect; } signals: - void contextPress( const QPoint& ); - void selected( const QRect & ); + void contextPress( const TQPoint& ); + void selected( const TQRect & ); void wannaScroll( int dx, int dy ); - void cursorPos( const QPoint & ); + void cursorPos( const TQPoint & ); protected: - void mousePressEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void paintEvent( QPaintEvent * ); - virtual void timerEvent( QTimerEvent * ); + void mousePressEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); + void paintEvent( TQPaintEvent * ); + virtual void timerEvent( TQTimerEvent * ); private: - void drawSelect( QPainter & ); + void drawSelect( TQPainter & ); void eraseSelect(); void setPixmap( const KPixmap & ); private: - QRect m_selection; - QRect m_drawRect; - QPoint m_scrollpos; - QPoint m_selectionStartPoint; + TQRect m_selection; + TQRect m_drawRect; + TQPoint m_scrollpos; + TQPoint m_selectionStartPoint; const KPixmap & checkboardPixmap(); @@ -93,7 +93,7 @@ class KImageHolder : public QWidget int m_scrollTimerId; int m_xOffset, m_yOffset; - QPen *m_pen; + TQPen *m_pen; KPixmap * m_pPixmap; KPixmap * m_pDoubleBuffer; diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp index 8422f944..e913ab59 100644 --- a/kview/kviewcanvas/test/test.cpp +++ b/kview/kviewcanvas/test/test.cpp @@ -11,13 +11,13 @@ #include <kmessagebox.h> #include <kparts/componentfactory.h> -#include <qimage.h> +#include <tqimage.h> KImageViewerTest::KImageViewerTest() : KParts::MainWindow( 0L, "KImageViewerTest" ) { - QWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<QWidget>( - "KImageViewer/Canvas", QString::null, this ); + TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( + "KImageViewer/Canvas", TQString::null, this ); if( widget ) { m_part = dynamic_cast<KImageViewer::Canvas *>( widget ); @@ -36,7 +36,7 @@ KImageViewerTest::~KImageViewerTest() void KImageViewerTest::load(const KURL& url) { - QImage image( url.fileName() ); + TQImage image( url.fileName() ); if( m_part ) m_part->setImage( image ); else diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp index 04b9e982..ea876950 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp @@ -25,16 +25,16 @@ #include <ksimpleconfig.h> #include <kplugininfo.h> -#include <qstring.h> +#include <tqstring.h> -typedef KGenericFactory<KViewViewerPluginsConfig, QWidget> KViewViewerPluginsConfigFactory; +typedef KGenericFactory<KViewViewerPluginsConfig, TQWidget> KViewViewerPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewviewerpluginsconfig, KViewViewerPluginsConfigFactory( "kcm_kviewviewerpluginsconfig" ) ) -KViewViewerPluginsConfig::KViewViewerPluginsConfig( QWidget * parent, const char *, const QStringList & args ) +KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) : KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), parent, args ) { m_config = new KSimpleConfig( "kviewviewerrc" ); - pluginSelector()->addPlugins( QString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), QString::null, m_config ); + pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString::null, m_config ); pluginSelector()->setShowEmptyConfigPage( false ); } diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h index 4f2b30ab..1dbe39c3 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h @@ -27,7 +27,7 @@ class KViewViewerPluginsConfig : public KSettings::PluginPage { Q_OBJECT public: - KViewViewerPluginsConfig( QWidget * parent, const char * name = 0, const QStringList & args = QStringList() ); + KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewViewerPluginsConfig(); private: KConfig * m_config; diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp index 4f483db7..0ee58b78 100644 --- a/kview/kviewviewer/imagesettings.cpp +++ b/kview/kviewviewer/imagesettings.cpp @@ -18,23 +18,23 @@ #include "imagesettings.h" -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <klocale.h> #include <kdialog.h> -ImageSettings::ImageSettings( QWidget * parent, const char * name ) +ImageSettings::ImageSettings( TQWidget * parent, const char * name ) : KPrintDialogPage( parent, name ) , m_pFitImage( 0 ) { setTitle( i18n( "Image Settings" ) ); - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - m_pFitImage = new QCheckBox( i18n( "Fit image to page size" ), this ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + m_pFitImage = new TQCheckBox( i18n( "Fit image to page size" ), this ); m_pFitImage->setChecked( true ); layout->addWidget( m_pFitImage ); - m_pCenter = new QCheckBox( i18n( "Center image on page" ), this ); + m_pCenter = new TQCheckBox( i18n( "Center image on page" ), this ); m_pCenter->setChecked( true ); layout->addWidget( m_pCenter ); layout->insertStretch( -1, 0 ); @@ -44,13 +44,13 @@ ImageSettings::~ImageSettings() { } -void ImageSettings::setOptions( const QMap<QString, QString> & opts ) +void ImageSettings::setOptions( const TQMap<TQString, TQString> & opts ) { m_pFitImage->setChecked( opts[ "app-kviewviewer-fitimage" ] == "1" ); m_pCenter->setChecked( opts[ "app-kviewviewer-center" ] == "1" ); } -void ImageSettings::getOptions( QMap<QString, QString> & opts, bool include_def ) +void ImageSettings::getOptions( TQMap<TQString, TQString> & opts, bool include_def ) { if( m_pFitImage->isChecked() ) opts[ "app-kviewviewer-fitimage" ] = "1"; @@ -63,7 +63,7 @@ void ImageSettings::getOptions( QMap<QString, QString> & opts, bool include_def opts[ "app-kviewviewer-center" ] = "0"; } -bool ImageSettings::isValid( QString & /*msg*/ ) +bool ImageSettings::isValid( TQString & /*msg*/ ) { return true; } diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h index 5d7bf88e..f627cbac 100644 --- a/kview/kviewviewer/imagesettings.h +++ b/kview/kviewviewer/imagesettings.h @@ -21,22 +21,22 @@ #include <kdeprint/kprintdialogpage.h> -class QCheckBox; +class TQCheckBox; class ImageSettings : public KPrintDialogPage { Q_OBJECT public: - ImageSettings( QWidget * parent = 0, const char * name = 0 ); + ImageSettings( TQWidget * parent = 0, const char * name = 0 ); ~ImageSettings(); - void setOptions( const QMap<QString, QString> & opts ); - void getOptions( QMap<QString, QString> & opts, bool include_def = false ); - bool isValid( QString & msg ); + void setOptions( const TQMap<TQString, TQString> & opts ); + void getOptions( TQMap<TQString, TQString> & opts, bool include_def = false ); + bool isValid( TQString & msg ); private: - QCheckBox * m_pFitImage; - QCheckBox * m_pCenter; + TQCheckBox * m_pFitImage; + TQCheckBox * m_pCenter; }; // vim:sw=4:ts=4 diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index 40876b7c..b3f16a93 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -23,9 +23,9 @@ #include "kimageviewer/canvas.h" #include "imagesettings.h" -#include <qpainter.h> -#include <qimage.h> -#include <qpaintdevicemetrics.h> +#include <tqpainter.h> +#include <tqimage.h> +#include <tqpaintdevicemetrics.h> #include <kprinter.h> #include <kdebug.h> @@ -64,23 +64,23 @@ void KViewKonqExtension::print() return; } - KPrinter printer;//( true, QPrinter::ScreenResolution ); + KPrinter printer;//( true, TQPrinter::ScreenResolution ); printer.addDialogPage( new ImageSettings ); printer.setDocName( "KView: " + m_pViewer->url().fileName( false ) ); if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").arg(m_pViewer->url().fileName( false )) ) ) return; - QPainter painter; + TQPainter painter; painter.begin( &printer ); - QPaintDeviceMetrics metrics( painter.device() ); + TQPaintDeviceMetrics metrics( painter.device() ); kdDebug( 4610 ) << "metrics: " << metrics.width() << "x" << metrics.height() << endl; - QPoint pos( 0, 0 ); + TQPoint pos( 0, 0 ); - QImage imagetoprint; + TQImage imagetoprint; if( printer.option( "app-kviewviewer-fitimage" ) == "1" ) - imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), QImage::ScaleMin ); + imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin ); else imagetoprint = *m_pCanvas->image(); diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index bab325ec..06dd1716 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -28,11 +28,11 @@ #include <unistd.h> #include <assert.h> -#include <qbuffer.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qregexp.h> +#include <tqbuffer.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqregexp.h> #include <kpushbutton.h> #include <kpassivepopup.h> @@ -55,8 +55,8 @@ typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory; K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory ) -KViewViewer::KViewViewer( QWidget *parentWidget, const char * /*widgetName*/, - QObject *parent, const char *name, const QStringList & ) +KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, + TQObject *parent, const char *name, const TQStringList & ) : KImageViewer::Viewer( parent, name ) , m_pParentWidget( parentWidget ) , m_pJob( 0 ) @@ -68,8 +68,8 @@ KViewViewer::KViewViewer( QWidget *parentWidget, const char * /*widgetName*/, { KImageIO::registerFormats(); - QWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<QWidget>( - "KImageViewer/Canvas", QString::null, m_pParentWidget ); + TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( + "KImageViewer/Canvas", TQString::null, m_pParentWidget ); m_pCanvas = static_cast<KImageViewer::Canvas *>( widget->qt_cast( "KImageViewer::Canvas" ) ); kdDebug( 4610 ) << "KImageViewer::Canvas at " << m_pCanvas << endl; if( ! ( widget && m_pCanvas ) ) @@ -88,7 +88,7 @@ KViewViewer::KViewViewer( QWidget *parentWidget, const char * /*widgetName*/, setInstance( KViewViewerFactory::instance() ); // m_url isn't set from ReadOnlyPart so we set it here to the CWD - m_url = QDir::currentDirPath() + "/"; + m_url = TQDir::currentDirPath() + "/"; m_sCaption = i18n( "Title caption when no image loaded", "no image loaded" ); setWidget( widget ); @@ -104,21 +104,21 @@ KViewViewer::KViewViewer( QWidget *parentWidget, const char * /*widgetName*/, else setXMLFile( "kviewviewer_ro.rc" ); - connect( widget, SIGNAL( contextPress( const QPoint & ) ), - this, SLOT( slotPopupMenu( const QPoint & ) ) ); - connect( widget, SIGNAL( zoomChanged( double ) ), - this, SLOT( zoomChanged( double ) ) ); - connect( widget, SIGNAL( showingImageDone() ), - this, SLOT( switchBlendEffect() ) ); - connect( widget, SIGNAL( hasImage( bool ) ), - this, SLOT( hasImage( bool ) ) ); - connect( widget, SIGNAL( imageChanged() ), - this, SLOT( setModified() ) ); + 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( m_pFileWatch, SIGNAL( dirty( const QString & ) ), - this, SLOT( slotFileDirty( const QString & ) ) ); + connect( m_pFileWatch, TQT_SIGNAL( dirty( const TQString & ) ), + this, TQT_SLOT( slotFileDirty( const TQString & ) ) ); - KSettings::Dispatcher::self()->registerInstance( instance(), this, SLOT( readSettings() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( readSettings() ) ); // by default disable progress info (so it won't open the dialog in Konqueror) setProgressInfoEnabled( false ); @@ -148,10 +148,10 @@ KViewViewer::~KViewViewer() int res = m_url.isEmpty() ? KMessageBox::warningYesNo( widget(), i18n( "This is a new document.\nDo you want to save it ?" ), - QString::null, KStdGuiItem::saveAs(), KStdGuiItem::discard() ): + TQString::null, KStdGuiItem::saveAs(), KStdGuiItem::discard() ): KMessageBox::warningYesNo( widget(), i18n( "The document has been modified.\nDo you want to save it ?" ), - QString::null, KStdGuiItem::saveAs(), KStdGuiItem::dontSave() ); + TQString::null, KStdGuiItem::saveAs(), KStdGuiItem::dontSave() ); if( res == KMessageBox::Yes ) { @@ -195,15 +195,15 @@ bool KViewViewer::saveAs( const KURL & kurl ) return KParts::ReadWritePart::saveAs( kurl ); // sets m_bClosing = false // if the image wasn't modified and should be saved in the same format we just copy the file - no need - // to lose some quality or information by calling QImage::save() + // to lose some quality or information by calling TQImage::save() if( ! ( isModified() && isReadWrite() ) && m_mimeType == m_newMimeType ) { kdDebug( 4610 ) << "copy image from " << m_file << " to " << kurl.prettyURL() << endl; KIO::Job * job = KIO::copy( KURL( m_file ), kurl, isProgressInfoEnabled() ); emit started( job ); - connect( job, SIGNAL( result( KIO::Job * ) ), - this, SLOT( slotResultSaveAs( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( slotResultSaveAs( KIO::Job * ) ) ); return true; } kdDebug( 4610 ) << "call KParts::ReadWritePart::saveAs( " << kurl.prettyURL() << " )" << endl; @@ -257,19 +257,19 @@ bool KViewViewer::openURL( const KURL & url ) emit setWindowCaption( m_sCaption ); m_bTemp = true; // Use same extension as remote file. This is important for mimetype-determination (e.g. koffice) - QString extension; - QString fileName = url.fileName(); + TQString extension; + TQString fileName = url.fileName(); int extensionPos = fileName.findRev( '.' ); if ( extensionPos != -1 ) extension = fileName.mid( extensionPos ); // keep the '.' delete m_pTempFile; - m_pTempFile = new KTempFile( QString::null, extension ); + m_pTempFile = new KTempFile( TQString::null, extension ); m_file = m_pTempFile->name(); m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() ); emit started( m_pJob ); - connect( m_pJob, SIGNAL( result( KIO::Job * ) ), SLOT( slotJobFinished ( KIO::Job * ) ) ); - connect( m_pJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ), SLOT( slotData( KIO::Job *, const QByteArray & ) ) ); + connect( m_pJob, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotJobFinished ( KIO::Job * ) ) ); + connect( m_pJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); return true; } } @@ -278,7 +278,7 @@ bool KViewViewer::closeURL() { kdDebug( 4610 ) << k_funcinfo << endl; abortLoad(); - QString file = m_file; + TQString file = m_file; bool ret = KParts::ReadWritePart::closeURL(); if( ret ) if( ! file.isEmpty() ) @@ -289,12 +289,12 @@ bool KViewViewer::closeURL() return ret; } -void KViewViewer::newImage( const QImage & newimg ) +void KViewViewer::newImage( const TQImage & newimg ) { if( closeURL() ) { m_url = ""; - m_file = QString::null; + m_file = TQString::null; m_sCaption = i18n( "Title caption when new image selected", "new image" ); m_pCanvas->setImage( newimg ); if( isReadWrite() ) @@ -311,12 +311,12 @@ void KViewViewer::reload() return; //load from file - QImage image( m_file ); + TQImage image( m_file ); m_pCanvas->setImage( image ); setModified( false ); } -bool KViewViewer::eventFilter( QObject * o, QEvent * e ) +bool KViewViewer::eventFilter( TQObject * o, TQEvent * e ) { KImageViewer::Canvas * canvas = static_cast<KImageViewer::Canvas*>( o->qt_cast( "KImageViewer::Canvas" ) ); if( canvas ) @@ -324,24 +324,24 @@ bool KViewViewer::eventFilter( QObject * o, QEvent * e ) // intercept drops onto the Canvas switch( e->type() ) { - case QEvent::DragEnter: + case TQEvent::DragEnter: { - QDragEnterEvent * ev = static_cast<QDragEnterEvent*>( e ); + TQDragEnterEvent * ev = static_cast<TQDragEnterEvent*>( e ); kdDebug( 4610 ) << "DragEnter Event in the Canvas: " << endl; for( int i = 0; ev->format( i ); ++i ) kdDebug( 4610 ) << " - " << ev->format( i ) << endl; - ev->accept( KURLDrag::canDecode( ev ) || QImageDrag::canDecode( ev ) ); + ev->accept( KURLDrag::canDecode( ev ) || TQImageDrag::canDecode( ev ) ); return true; } - case QEvent::Drop: + case TQEvent::Drop: { - QDropEvent * ev = static_cast<QDropEvent*>( e ); + TQDropEvent * ev = static_cast<TQDropEvent*>( e ); kdDebug( 4610 ) << "Drop Event in the Canvas" << endl; - QStringList l; - QImage image; + TQStringList l; + TQImage image; if( KURLDrag::decodeToUnicodeUris( ev, l ) ) openURL( KURL( l.first() ) ); - else if( QImageDrag::decode( ev, image ) ) + else if( TQImageDrag::decode( ev, image ) ) newImage( image ); return true; } @@ -363,7 +363,7 @@ void KViewViewer::abortLoad() bool KViewViewer::openFile() { - //m_pCanvas->setMaximumImageSize( QSize( widget()->width(), widget()->height() ) ); + //m_pCanvas->setMaximumImageSize( TQSize( widget()->width(), widget()->height() ) ); if( m_pBuffer ) { kdDebug( 4610 ) << k_funcinfo << " load from buffer\n"; @@ -387,12 +387,12 @@ bool KViewViewer::openFile() } } - QImage image( m_pBuffer->buffer() ); + TQImage image( m_pBuffer->buffer() ); delete m_pBuffer; m_pBuffer = 0; if( ! image.isNull() ) { - QSize size = image.size(); + TQSize size = image.size(); m_pCanvas->setImage( image, size ); } else @@ -404,12 +404,12 @@ bool KViewViewer::openFile() else { //load from local file kdDebug( 4610 ) << k_funcinfo << " load from file: " << m_file << endl; - if( ! QFile::exists( m_file ) ) + if( ! TQFile::exists( m_file ) ) { emit setStatusBarText( i18n( "No such file: %1" ).arg( m_file ) ); return false; } - if( QImage::imageFormat( m_file ) == 0 ) + if( TQImage::imageFormat( m_file ) == 0 ) { emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_file ) ); return false; @@ -422,8 +422,8 @@ bool KViewViewer::openFile() } //load from file - QImage image( m_file ); - QSize size = image.size(); + TQImage image( m_file ); + TQSize size = image.size(); m_pCanvas->setImage( image, size ); } m_pFileWatch->addFile( m_file ); @@ -443,16 +443,16 @@ bool KViewViewer::saveFile() // 2. The image should be saved in a different format or was modified, so // that copying isn't possible anymore. - const QImage * image = m_pCanvas->image(); + const TQImage * image = m_pCanvas->image(); if( ! image ) return false; if( ! m_newMimeType.isNull() ) { m_mimeType = m_newMimeType; - m_newMimeType = QString::null; + m_newMimeType = TQString::null; } - QString type = KImageIO::typeForMime( m_mimeType ); + TQString type = KImageIO::typeForMime( m_mimeType ); kdDebug( 4610 ) << "save m_pCanvas->image() to " << m_file << " as " << type << endl; int quality = 100; // TODO: ask user for quality. Keep it at 100 so that our // users don't lose quality when working with KView. @@ -466,33 +466,33 @@ bool KViewViewer::saveFile() void KViewViewer::setupActions() { m_paZoomIn = new KAction( i18n( "Zoom In" ), "viewmag+", KStdAccel::shortcut( KStdAccel::ZoomIn ), this, - SLOT( slotZoomIn() ), actionCollection(), "zoomin" ); + TQT_SLOT( slotZoomIn() ), actionCollection(), "zoomin" ); m_paZoomOut = new KAction( i18n( "Zoom Out" ), "viewmag-", KStdAccel::shortcut( KStdAccel::ZoomOut ), this, - SLOT( slotZoomOut() ), actionCollection(), "zoomout" ); + TQT_SLOT( slotZoomOut() ), actionCollection(), "zoomout" ); m_paZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); - connect( m_paZoom, SIGNAL( activated( const QString & ) ), this, SLOT( setZoom( const QString & ) ) ); + connect( m_paZoom, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( setZoom( const TQString & ) ) ); m_paZoom->setEditable( true ); m_paZoom->clear(); - m_paZoom->setItems( QStringList::split( '|', "20%|25%|33%|50%|75%|100%|125%|150%|200%|250%|300%|350%|400%|450%|500%" ) ); + m_paZoom->setItems( TQStringList::split( '|', "20%|25%|33%|50%|75%|100%|125%|150%|200%|250%|300%|350%|400%|450%|500%" ) ); m_paZoom->setCurrentItem( 5 ); m_paFlipMenu = new KActionMenu( i18n( "&Flip" ), actionCollection(), "flip" ); - m_paFlipV = new KAction( i18n( "&Vertical" ), Key_V, this, SLOT( slotFlipV() ), actionCollection(), "flip_vertical" ); - m_paFlipH = new KAction( i18n( "&Horizontal" ), Key_H, this, SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" ); + m_paFlipV = new KAction( i18n( "&Vertical" ), Key_V, this, TQT_SLOT( slotFlipV() ), actionCollection(), "flip_vertical" ); + m_paFlipH = new KAction( i18n( "&Horizontal" ), Key_H, this, TQT_SLOT( slotFlipH() ), actionCollection(), "flip_horizontal" ); m_paFlipMenu->insert( m_paFlipV ); m_paFlipMenu->insert( m_paFlipH ); m_paRotateCCW = new KAction( i18n( "Ro&tate Counter-Clockwise" ), "rotate_ccw", 0, this, - SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" ); + TQT_SLOT( slotRotateCCW() ), actionCollection(), "rotateCCW" ); m_paRotateCW = new KAction( i18n( "Rotate Clockwise" ), "rotate_cw", 0, this, - SLOT( slotRotateCW() ), actionCollection(), "rotateCW" ); - m_paSave = KStdAction::save( this, SLOT( slotSave() ), actionCollection() ); + TQT_SLOT( slotRotateCW() ), actionCollection(), "rotateCW" ); + m_paSave = KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() ); m_paSave->setEnabled( false ); - m_paSaveAs = KStdAction::saveAs( this, SLOT( slotSaveAs() ), actionCollection() ); + m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveAs() ), actionCollection() ); m_paFitToWin = new KAction( i18n( "Fit Image to Window" ), 0, 0, this, - SLOT( slotFitToWin() ), actionCollection(), "fittowin" ); + TQT_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(), SIGNAL( hasImage( bool ) ), m_paZoomIn, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paZoomOut, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paZoom, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paRotateCCW, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paRotateCW, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paSaveAs, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paFitToWin, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paFlipMenu, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paFlipV, SLOT( setEnabled( bool ) ) ); - connect( widget(), SIGNAL( hasImage( bool ) ), m_paFlipH, SLOT( setEnabled( bool ) ) ); - - m_paShowScrollbars = new KToggleAction( i18n( "Show Scrollbars" ), 0, this, SLOT( slotToggleScrollbars() ), + 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 KToggleAction( i18n( "Show Scrollbars" ), 0, this, TQT_SLOT( slotToggleScrollbars() ), actionCollection(), "show_scrollbars" ); m_paShowScrollbars->setCheckedState(i18n("Hide Scrollbars")); } @@ -541,16 +541,16 @@ void KViewViewer::readSettings() m_pCanvas->setBgColor( cfgGroup.readColorEntry( "Background Color", &m_pCanvas->bgColor() ) ); - m_pCanvas->setMinimumImageSize( QSize( cfgGroup.readNumEntry( "Minimum Width", m_pCanvas->minimumImageSize().width() ), + m_pCanvas->setMinimumImageSize( TQSize( cfgGroup.readNumEntry( "Minimum Width", m_pCanvas->minimumImageSize().width() ), cfgGroup.readNumEntry( "Minimum Height", m_pCanvas->minimumImageSize().height() ) ) ); - m_pCanvas->setMaximumImageSize( QSize( cfgGroup.readNumEntry( "Maximum Width", m_pCanvas->maximumImageSize().width() ), + m_pCanvas->setMaximumImageSize( TQSize( cfgGroup.readNumEntry( "Maximum Width", m_pCanvas->maximumImageSize().width() ), cfgGroup.readNumEntry( "Maximum Height", m_pCanvas->maximumImageSize().height() ) ) ); KConfigGroup blendConfig( instance()->config(), "Blend Effects" ); m_vEffects.clear(); for( unsigned int i = 1; i <= m_pCanvas->numOfBlendEffects(); ++i ) { - if( blendConfig.readBoolEntry( QString::number( i ), false ) ) + if( blendConfig.readBoolEntry( TQString::number( i ), false ) ) m_vEffects.push_back( i ); } // and now tell the canvas what blend effect to use @@ -567,7 +567,7 @@ void KViewViewer::writeSettings() void KViewViewer::zoomChanged( double zoom ) { kdDebug( 4610 ) << k_funcinfo << endl; - emit setWindowCaption( m_sCaption + QString( " (%1%)" ).arg( zoom * 100, 0, 'f', 0 ) ); + emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).arg( zoom * 100, 0, 'f', 0 ) ); updateZoomMenu( zoom ); } @@ -584,11 +584,11 @@ void KViewViewer::slotJobFinished( KIO::Job * job ) } } -void KViewViewer::slotData( KIO::Job *, const QByteArray & data ) +void KViewViewer::slotData( KIO::Job *, const TQByteArray & data ) { if( ! m_pBuffer ) { - m_pBuffer = new QBuffer(); + m_pBuffer = new TQBuffer(); m_pBuffer->open( IO_ReadWrite ); } m_pBuffer->writeBlock( data.data(), data.size() ); @@ -597,7 +597,7 @@ void KViewViewer::slotData( KIO::Job *, const QByteArray & data ) //No. :) It takes forever like this. //OK. So I really have to look at khtml... //later... - //m_pCanvas->setImage( QImage( m_pBuffer->buffer() ) ); + //m_pCanvas->setImage( TQImage( m_pBuffer->buffer() ) ); } void KViewViewer::slotSave() @@ -610,7 +610,7 @@ void KViewViewer::slotSave() void KViewViewer::slotSaveAs() { kdDebug( 4610 ) << k_funcinfo << endl; - KFileDialog dlg( QString::null, QString::null, widget(), "filedialog", true ); + KFileDialog dlg( TQString::null, TQString::null, widget(), "filedialog", true ); dlg.setMimeFilter( KImageIO::mimeTypes( KImageIO::Writing ) ); dlg.setSelection( m_url.fileName() ); dlg.setCaption( i18n( "Save As" ) ); @@ -640,11 +640,11 @@ void KViewViewer::slotZoomOut() m_pCanvas->setZoom( zoom ); } -void KViewViewer::setZoom( const QString & newZoom ) +void KViewViewer::setZoom( const TQString & newZoom ) { kdDebug( 4610 ) << k_funcinfo << newZoom << endl; double zoom; - QString z = newZoom; + TQString z = newZoom; z.remove( z.find( '%' ), 1 ); if( newZoom == "33%" ) zoom = 1.0 / 3.0; @@ -656,37 +656,37 @@ void KViewViewer::setZoom( const QString & newZoom ) void KViewViewer::updateZoomMenu( double zoom ) { - QStringList lst; + TQStringList lst; if( zoom > 0.0 ) { //lst << i18n( "Maxpect" ); - QValueList<int> list; - QString z; + TQValueList<int> list; + TQString z; int val; bool ok; - QStringList itemsList = m_paZoom->items(); - for( QStringList::Iterator it = itemsList.begin(); it != itemsList.end(); ++it ) + TQStringList itemsList = m_paZoom->items(); + for( TQStringList::Iterator it = itemsList.begin(); it != itemsList.end(); ++it ) { - z = ( *it ).replace( QRegExp( "%" ), "" ); + z = ( *it ).replace( TQRegExp( "%" ), "" ); z = z.simplifyWhiteSpace(); val = z.toInt( &ok ); if( ok && val > 0 && list.contains( val ) == 0 ) list << val; } - val = QString::number( zoom * 100, 'f', 0 ).toInt(); // round/lround from math.h doesn't work - dunno + val = TQString::number( zoom * 100, 'f', 0 ).toInt(); // round/lround from math.h doesn't work - dunno if( list.contains( val ) == 0 ) list.append( val ); qHeapSort( list ); - for( QValueList<int>::Iterator it = list.begin(); it != list.end(); ++it ) - lst << QString::number( *it ) + '%'; + for( TQValueList<int>::Iterator it = list.begin(); it != list.end(); ++it ) + lst << TQString::number( *it ) + '%'; m_paZoom->setItems( lst ); } // first look if it's a new value (not in the list yet) - QString z = QString( "%1%" ).arg( zoom * 100, 0, 'f', 0 ); - QStringList items = m_paZoom->items(); + TQString z = TQString( "%1%" ).arg( zoom * 100, 0, 'f', 0 ); + TQStringList items = m_paZoom->items(); int idx = items.findIndex( z ); if( -1 == idx ) { @@ -743,18 +743,18 @@ void KViewViewer::slotDel() class PopupGUIClient : public KXMLGUIClient { public: - PopupGUIClient( KInstance *inst, const QString &doc ) + PopupGUIClient( KInstance *inst, const TQString &doc ) { setInstance( inst ); setXML( doc ); } }; -void KViewViewer::slotPopupMenu( const QPoint &pos ) +void KViewViewer::slotPopupMenu( const TQPoint &pos ) { KXMLGUIClient *popupGUIClient = new PopupGUIClient( instance(), m_popupDoc ); - (void) new KAction( i18n( "Save Image As..." ), 0, this, SLOT( slotSaveAs() ), + (void) new KAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveAs() ), popupGUIClient->actionCollection(), "saveimageas" ); // ### HACK treat the image as dir to get the back/fwd/reload buttons (Simon) @@ -791,36 +791,36 @@ void KViewViewer::slotResultSaveAs( KIO::Job *job ) { if( m_bTemp ) { - unlink( QFile::encodeName( m_file ) ); + unlink( TQFile::encodeName( m_file ) ); m_bTemp = false; } m_file = m_url.path(); } } -void KViewViewer::slotFileDirty( const QString & ) +void KViewViewer::slotFileDirty( const TQString & ) { if( isModified() && isReadWrite() ) { KPassivePopup * pop = new KPassivePopup( m_pParentWidget ); - QVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ), - QString::null, kapp->miniIcon() ); - ( void )new QLabel( i18n( "The image %1 which you have modified has changed on disk.\n" + TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ), + TQString::null, kapp->miniIcon() ); + ( void )new TQLabel( i18n( "The image %1 which you have modified has changed on disk.\n" "Do you want to reload the file and lose your changes?\n" "If you don't and subsequently save the image, you will lose the\n" "changes that have already been saved." ).arg( url().fileName() ), vb ); - QWidget * hb = new QWidget( vb ); - QHBoxLayout * layout = new QHBoxLayout( hb ); - layout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum ) ); + TQWidget * hb = new TQWidget( vb ); + TQHBoxLayout * layout = new TQHBoxLayout( hb ); + layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); KPushButton * yes = new KPushButton( i18n("Reload"), hb ); layout->addWidget( yes ); - layout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum ) ); + layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb ); layout->addWidget( no ); - layout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum ) ); - connect( yes, SIGNAL( clicked() ), this, SLOT( slotReloadUnmodified() ) ); - connect( yes, SIGNAL( clicked() ), pop, SLOT( hide() ) ); - connect( no, SIGNAL( clicked() ), pop, SLOT( hide() ) ); + 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() ) ); pop->setView( vb ); pop->setTimeout( 0 ); pop->setAutoDelete( true ); @@ -848,7 +848,7 @@ void KViewViewer::loadPlugins() KImageViewer::Viewer::loadPlugins( this, this, instance() ); if( factory() ) { - QPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( this ); + TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects( this ); KParts::Plugin * plugin; for( plugin = plugins.first(); plugin; plugin = plugins.next() ) factory()->addClient( plugin ); diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index 4c5f13a0..0dc5d6a3 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -23,7 +23,7 @@ #include "kimageviewer/viewer.h" #include "kviewkonqextension.h" -#include <qvaluevector.h> +#include <tqvaluevector.h> #include "kviewvieweriface.h" #include <kdemacros.h> @@ -36,11 +36,11 @@ class KActionMenu; class KToggleAction; class KSelectAction; class KAboutData; -class QBuffer; -class QSize; +class TQBuffer; +class TQSize; class KDirWatch; template<class T> -class QCache; +class TQCache; class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface { @@ -48,8 +48,8 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf friend class KViewKonqExtension; public: - KViewViewer( QWidget * parentWidget, const char * widgetName, - QObject * parent, const char * name, const QStringList & ); + KViewViewer( TQWidget * parentWidget, const char * widgetName, + TQObject * parent, const char * name, const TQStringList & ); virtual ~KViewViewer(); KImageViewer::Canvas * canvas() const { return m_pCanvas; } @@ -63,11 +63,11 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf public slots: virtual bool openURL( const KURL & ); virtual bool closeURL(); - virtual void newImage( const QImage & ); + virtual void newImage( const TQImage & ); virtual void reload(); protected: - bool eventFilter( QObject *, QEvent * ); // for DnD + bool eventFilter( TQObject *, TQEvent * ); // for DnD void abortLoad(); virtual bool openFile(); virtual bool saveFile(); @@ -81,13 +81,13 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf void readSettings(); void zoomChanged( double ); void slotJobFinished( KIO::Job * ); - void slotData( KIO::Job *, const QByteArray & ); + void slotData( KIO::Job *, const TQByteArray & ); void slotSave(); void slotSaveAs(); void slotZoomIn(); void slotZoomOut(); - void setZoom( const QString & ); + void setZoom( const TQString & ); void updateZoomMenu( double zoom ); void slotFlipH(); void slotFlipV(); @@ -96,10 +96,10 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf void slotFitToWin(); void slotDel(); - void slotPopupMenu( const QPoint & ); + void slotPopupMenu( const TQPoint & ); void slotResultSaveAs( KIO::Job * ); - void slotFileDirty( const QString & ); + void slotFileDirty( const TQString & ); void slotReloadUnmodified(); void slotToggleScrollbars(); @@ -110,12 +110,12 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf void hasImage( bool ); private: - QWidget * m_pParentWidget; + TQWidget * m_pParentWidget; KIO::Job * m_pJob; KViewKonqExtension * m_pExtension; KImageViewer::Canvas * m_pCanvas; KTempFile * m_pTempFile; - QBuffer * m_pBuffer; + TQBuffer * m_pBuffer; KDirWatch * m_pFileWatch; // Actions: @@ -132,12 +132,12 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf KAction * m_paFitToWin; KToggleAction * m_paShowScrollbars; - QString m_popupDoc; - QString m_mimeType; - QString m_newMimeType; - QString m_sCaption; + TQString m_popupDoc; + TQString m_mimeType; + TQString m_newMimeType; + TQString m_sCaption; - QValueVector<unsigned int> m_vEffects; + TQValueVector<unsigned int> m_vEffects; }; // vim:sw=4:ts=4 diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp index d4659e6c..2bc20372 100644 --- a/kview/kviewviewer/test/test.cpp +++ b/kview/kviewviewer/test/test.cpp @@ -11,7 +11,7 @@ #include <kparts/componentfactory.h> #include <kapplication.h> -#include <qimage.h> +#include <tqimage.h> Test::Test() : KParts::MainWindow( 0, "KView Viewer Test" ), diff --git a/kview/main.cpp b/kview/main.cpp index e84bc65d..80e752be 100644 --- a/kview/main.cpp +++ b/kview/main.cpp @@ -56,7 +56,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) // to tell the presenter plugin to add those urls to it's list if( args->count() > 0 ) { - if( args->url( 0 ) == QString( "-" ) ) + if( args->url( 0 ) == TQString( "-" ) ) kview->loadFromStdin(); else kview->load( args->url( 0 ) ); diff --git a/kview/modules/browser/kmyfileitemlist.cpp b/kview/modules/browser/kmyfileitemlist.cpp index 534e0876..28c3cb08 100644 --- a/kview/modules/browser/kmyfileitemlist.cpp +++ b/kview/modules/browser/kmyfileitemlist.cpp @@ -21,14 +21,14 @@ #include <kfileitem.h> KMyFileItemList::KMyFileItemList() {} -KMyFileItemList::KMyFileItemList( const QPtrList<KFileItem> & l ) : QPtrList<KFileItem>( l ) {} +KMyFileItemList::KMyFileItemList( const TQPtrList<KFileItem> & l ) : TQPtrList<KFileItem>( l ) {} -KMyFileItemList & KMyFileItemList::operator=( const QPtrList<KFileItem> & l ) +KMyFileItemList & KMyFileItemList::operator=( const TQPtrList<KFileItem> & l ) { - return (KMyFileItemList &)QPtrList<KFileItem>::operator=( l ); + return (KMyFileItemList &)TQPtrList<KFileItem>::operator=( l ); } -int KMyFileItemList::compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 ) +int KMyFileItemList::compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { KFileItem * fileitem1 = static_cast<KFileItem *>( item1 ); KFileItem * fileitem2 = static_cast<KFileItem *>( item2 ); diff --git a/kview/modules/browser/kmyfileitemlist.h b/kview/modules/browser/kmyfileitemlist.h index 052fce53..80f01013 100644 --- a/kview/modules/browser/kmyfileitemlist.h +++ b/kview/modules/browser/kmyfileitemlist.h @@ -20,18 +20,18 @@ #ifndef __kmyfileitemlist_h__ #define __kmyfileitemlist_h__ -#include <qptrlist.h> +#include <tqptrlist.h> class KFileItem; -class KMyFileItemList : public QPtrList<KFileItem> +class KMyFileItemList : public TQPtrList<KFileItem> { public: KMyFileItemList(); - KMyFileItemList( const QPtrList<KFileItem> & ); - KMyFileItemList & operator=( const QPtrList<KFileItem> & ); + KMyFileItemList( const TQPtrList<KFileItem> & ); + KMyFileItemList & operator=( const TQPtrList<KFileItem> & ); protected: - virtual int compareItems( QPtrCollection::Item item1, QPtrCollection::Item item2 ); + virtual int compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ); }; // vim:sw=4:ts=4 diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index 6da318b7..936061eb 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -20,7 +20,7 @@ #include "kviewbrowser.h" #include "kmyfileitemlist.h" -#include <qcursor.h> +#include <tqcursor.h> #include <kdirlister.h> #include <kaction.h> @@ -36,7 +36,7 @@ typedef KGenericFactory<KViewBrowser> KViewBrowserFactory; K_EXPORT_COMPONENT_FACTORY( kview_browserplugin, KViewBrowserFactory( "kviewbrowserplugin" ) ) -KViewBrowser::KViewBrowser( QObject* parent, const char* name, const QStringList & ) +KViewBrowser::KViewBrowser( TQObject* parent, const char* name, const TQStringList & ) : Plugin( parent, name ) , m_pDirLister( 0 ) , m_pFileItemList( 0 ) @@ -45,9 +45,9 @@ KViewBrowser::KViewBrowser( QObject* parent, const char* name, const QStringList m_pViewer = static_cast<KImageViewer::Viewer *>( parent ); if( m_pViewer ) { - m_paBack = KStdAction::back ( this, SLOT( slotBack() ), actionCollection(), "previous_image" ); + m_paBack = KStdAction::back ( this, TQT_SLOT( slotBack() ), actionCollection(), "previous_image" ); m_paBack->setShortcut( SHIFT+Key_Left ); - m_paForward = KStdAction::forward( this, SLOT( slotForward() ), actionCollection(), "next_image" ); + m_paForward = KStdAction::forward( this, TQT_SLOT( slotForward() ), actionCollection(), "next_image" ); m_paForward->setShortcut( SHIFT+Key_Right ); m_pExtension = m_pViewer->browserExtension(); } @@ -156,13 +156,13 @@ void KViewBrowser::setupDirLister() m_pDirLister = new KDirLister(); m_pDirLister->setMimeFilter( KImageIO::mimeTypes( KImageIO::Reading ) ); m_pDirLister->setShowingDotFiles( true ); - connect( m_pDirLister, SIGNAL( newItems( const KFileItemList & ) ), SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_pDirLister, SIGNAL( deleteItem( KFileItem * ) ), SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_pDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_pDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); } if( m_pDirLister->url() != KURL( m_pViewer->url().directory( true, false ) ) ) { - QApplication::setOverrideCursor( WaitCursor ); - QString url = m_pViewer->url().prettyURL(); + TQApplication::setOverrideCursor( WaitCursor ); + TQString url = m_pViewer->url().prettyURL(); int pos = url.findRev( "/" ); url = url.left( (unsigned int)pos ); kdDebug( 4630 ) << "open KDirLister for " << url << endl; @@ -171,7 +171,7 @@ void KViewBrowser::setupDirLister() kapp->processEvents(); //while( ! m_pFileItemList ) //kapp->processEvents(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h index 3ed918b6..96e8b17f 100644 --- a/kview/modules/browser/kviewbrowser.h +++ b/kview/modules/browser/kviewbrowser.h @@ -34,7 +34,7 @@ class KViewBrowser : public KParts::Plugin { Q_OBJECT public: - KViewBrowser( QObject* parent, const char* name, const QStringList & ); + KViewBrowser( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewBrowser(); private slots: diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp index 9295c876..a2e57327 100644 --- a/kview/modules/effects/kvieweffects.cpp +++ b/kview/modules/effects/kvieweffects.cpp @@ -4,7 +4,7 @@ #include "kvieweffects.h" -#include <qobjectlist.h> +#include <tqobjectlist.h> #include <kaction.h> #include <klocale.h> @@ -15,16 +15,16 @@ #include <kdialogbase.h> #include <knuminput.h> #include <kiconeffect.h> -#include <qvbox.h> +#include <tqvbox.h> #include <kcolorbutton.h> #include <kimageeffect.h> -#include <qlabel.h> +#include <tqlabel.h> #include <assert.h> typedef KGenericFactory<KViewEffects> KViewEffectsFactory; K_EXPORT_COMPONENT_FACTORY( kview_effectsplugin, KViewEffectsFactory( "kvieweffectsplugin" ) ) -KViewEffects::KViewEffects( QObject* parent, const char* name, const QStringList & ) +KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringList & ) : Plugin( parent, name ) , m_gamma( 0.5 ), m_lastgamma( -1.0 ) , m_opacity( 50 ), m_lastopacity( -1 ) @@ -32,26 +32,26 @@ KViewEffects::KViewEffects( QObject* parent, const char* name, const QStringList , m_color( white ) , m_image( 0 ) { - QObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) { KAction * gammaaction = new KAction( i18n( "&Gamma Correction..." ), 0, 0, - this, SLOT( gamma() ), + this, TQT_SLOT( gamma() ), actionCollection(), "plugin_effects_gamma" ); KAction * blendaction = new KAction( i18n( "&Blend Color..." ), 0, 0, - this, SLOT( blend() ), + this, TQT_SLOT( blend() ), actionCollection(), "plugin_effects_blend" ); KAction * intensityaction = new KAction( i18n( "Change &Intensity (Brightness)..." ), 0, 0, - this, SLOT( intensity() ), + this, TQT_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(), SIGNAL( hasImage( bool ) ), gammaaction, SLOT( setEnabled( bool ) ) ); - connect( m_pViewer->widget(), SIGNAL( hasImage( bool ) ), blendaction, SLOT( setEnabled( bool ) ) ); - connect( m_pViewer->widget(), SIGNAL( hasImage( bool ) ), intensityaction, SLOT( setEnabled( bool ) ) ); + 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 ) ) ); } else kdWarning( 4630 ) << "no KImageViewer interface found - the effects plugin won't work" << endl; @@ -67,20 +67,20 @@ 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, SIGNAL( tryClicked() ), this, SLOT( applyIntensity() ) ); + connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyIntensity() ) ); - QVBox * vbox = new QVBox( &dlg ); + TQVBox * vbox = new TQVBox( &dlg ); vbox->setSpacing( KDialog::spacingHint() ); dlg.setMainWidget( vbox ); KIntNumInput * percent = new KIntNumInput( vbox, "Intensity Input" ); percent->setRange( 0, 100, 1, true ); percent->setValue( m_intensity ); percent->setLabel( i18n( "&Intensity:" ) ); - percent->setSuffix( QString::fromAscii( "%" ) ); - connect( percent, SIGNAL( valueChanged( int ) ), this, SLOT( setIntensity( int ) ) ); + percent->setSuffix( TQString::fromAscii( "%" ) ); + connect( percent, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( setIntensity( int ) ) ); int result = dlg.exec(); - if( result == QDialog::Accepted ) + if( result == TQDialog::Accepted ) { applyIntensity(); m_pViewer->setModified( true ); @@ -104,7 +104,7 @@ void KViewEffects::applyIntensity() if( m_intensity == m_lastintensity ) return; // nothing to do - QImage * work = workImage(); + TQImage * work = workImage(); if( work ) { KImageEffect::intensity( *work, m_intensity * 0.01 ); @@ -117,24 +117,24 @@ 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, SIGNAL( tryClicked() ), this, SLOT( applyBlend() ) ); + connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_SLOT( applyBlend() ) ); - QVBox * vbox = new QVBox( &dlg ); + TQVBox * vbox = new TQVBox( &dlg ); vbox->setSpacing( KDialog::spacingHint() ); dlg.setMainWidget( vbox ); KIntNumInput * opacity = new KIntNumInput( vbox, "Opacity Input" ); opacity->setRange( 0, 100, 1, true ); opacity->setValue( m_opacity ); opacity->setLabel( i18n( "O&pacity:" ) ); - opacity->setSuffix( QString::fromAscii( "%" ) ); - connect( opacity, SIGNAL( valueChanged( int ) ), this, SLOT( setOpacity( int ) ) ); - QLabel * label = new QLabel( i18n( "Blend c&olor:" ), vbox ); + opacity->setSuffix( TQString::fromAscii( "%" ) ); + connect( opacity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_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, SIGNAL( changed( const QColor & ) ), this, SLOT( setColor( const QColor & ) ) ); + connect( color, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SLOT( setColor( const TQColor & ) ) ); int result = dlg.exec(); - if( result == QDialog::Accepted ) + if( result == TQDialog::Accepted ) { applyBlend(); m_pViewer->setModified( true ); @@ -152,7 +152,7 @@ void KViewEffects::setOpacity( int opacity ) m_opacity = opacity; } -void KViewEffects::setColor( const QColor & color ) +void KViewEffects::setColor( const TQColor & color ) { m_color = color; } @@ -162,7 +162,7 @@ void KViewEffects::applyBlend() if( m_opacity == m_lastopacity ) return; // nothing to do - QImage * work = workImage(); + TQImage * work = workImage(); if( work ) { KImageEffect::blend( m_color, *work, m_opacity * 0.01 ); @@ -175,17 +175,17 @@ 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, SIGNAL( tryClicked() ), this, SLOT( applyGammaCorrection() ) ); + connect( &dlg, TQT_SIGNAL( tryClicked() ), this, TQT_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, SIGNAL( valueChanged( double ) ), this, SLOT( setGammaValue( double ) ) ); + connect( gammavalue, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( setGammaValue( double ) ) ); gammavalue->setLabel( i18n( "Gamma value:" ) ); dlg.setMainWidget( gammavalue ); int result = dlg.exec(); - if( result == QDialog::Accepted ) + if( result == TQDialog::Accepted ) { // apply gamma correction applyGammaCorrection(); @@ -213,7 +213,7 @@ void KViewEffects::applyGammaCorrection() if( m_gamma == m_lastgamma ) return; // nothing to do - QImage * corrected = workImage(); + TQImage * corrected = workImage(); if( corrected ) { KIconEffect::toGamma( *corrected, m_gamma ); @@ -223,17 +223,17 @@ void KViewEffects::applyGammaCorrection() } } -inline QImage * KViewEffects::workImage() +inline TQImage * KViewEffects::workImage() { if( ! m_image ) { - const QImage * canvasimage = m_pViewer->canvas()->image(); + const TQImage * canvasimage = m_pViewer->canvas()->image(); if( canvasimage ) - m_image = new QImage( *canvasimage ); + m_image = new TQImage( *canvasimage ); } if( m_image ) { - QImage * changed = new QImage( *m_image ); + TQImage * changed = new TQImage( *m_image ); changed->detach(); return changed; } diff --git a/kview/modules/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h index 0bf92a8e..821b99c8 100644 --- a/kview/modules/effects/kvieweffects.h +++ b/kview/modules/effects/kvieweffects.h @@ -6,7 +6,7 @@ #define KVIEWEFFECTS_H #include <kparts/plugin.h> -#include <qcolor.h> +#include <tqcolor.h> namespace KImageViewer { class Viewer; } @@ -14,7 +14,7 @@ class KViewEffects : public KParts::Plugin { Q_OBJECT public: - KViewEffects( QObject* parent, const char* name, const QStringList & ); + KViewEffects( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewEffects(); private slots: @@ -24,7 +24,7 @@ private slots: void blend(); void setOpacity( int ); - void setColor( const QColor & ); + void setColor( const TQColor & ); void applyBlend(); void gamma(); @@ -32,14 +32,14 @@ private slots: void applyGammaCorrection(); private: - QImage * workImage(); + TQImage * workImage(); KImageViewer::Viewer * m_pViewer; double m_gamma, m_lastgamma; int m_opacity, m_lastopacity; int m_intensity, m_lastintensity; - QColor m_color; - QImage * m_image; + TQColor m_color; + TQImage * m_image; }; // vim:sw=4:ts=4:cindent diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index 92dd8627..e44889ed 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -18,9 +18,9 @@ #include "kviewpresenterconfig.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qframe.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqframe.h> #include <klocale.h> #include <kdialog.h> @@ -28,17 +28,17 @@ #include <kconfig.h> #include <kgenericfactory.h> -typedef KGenericFactory<KViewPresenterConfig, QWidget> KViewPresenterConfigFactory; +typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactory( "kcm_kviewpresenterconfig" ) ) -KViewPresenterConfig::KViewPresenterConfig( QWidget * parent, const char *, const QStringList & args ) +KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args ) : KCModule( KViewPresenterConfigFactory::instance(), parent, args ) { - QBoxLayout * layout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); - m_pCheckBox = new QCheckBox( "This is only for testing...", this ); - connect( m_pCheckBox, SIGNAL( clicked() ), this, SLOT( checkChanged() ) ); + m_pCheckBox = new TQCheckBox( "This is only for testing...", this ); + connect( m_pCheckBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkChanged() ) ); } KViewPresenterConfig::~KViewPresenterConfig() diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h index c839690a..ae257cea 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.h +++ b/kview/modules/presenter/config/kviewpresenterconfig.h @@ -21,13 +21,13 @@ #include <kcmodule.h> -class QCheckBox; +class TQCheckBox; class KViewPresenterConfig : public KCModule { Q_OBJECT public: - KViewPresenterConfig( QWidget * parent, const char * name = 0, const QStringList & args = QStringList() ); + KViewPresenterConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewPresenterConfig(); virtual void load(); @@ -38,7 +38,7 @@ class KViewPresenterConfig : public KCModule void checkChanged(); private: - QCheckBox * m_pCheckBox; + TQCheckBox * m_pCheckBox; }; // vim:sw=4:ts=4 diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp index 4236dfe7..547de656 100644 --- a/kview/modules/presenter/imagelistitem.cpp +++ b/kview/modules/presenter/imagelistitem.cpp @@ -20,14 +20,14 @@ #include "imagelistitem.h" -#include <qimage.h> +#include <tqimage.h> #include <klistview.h> ImageListItem::ImageListItem( KListView * parent, const KURL & url ) : KListViewItem( parent, parent->lastItem(), url.prettyURL() ) , m_pImage( 0 ) - , m_filename( QString::null ) + , m_filename( TQString::null ) , m_url( url ) { setDragEnabled( true ); @@ -39,13 +39,13 @@ ImageListItem::ImageListItem( KListView * parent, const KURL & url ) { // download file /* - QString extension; - QString fileName = m_url.fileName(); + TQString extension; + TQString fileName = m_url.fileName(); int extensionPos = fileName.findRev( '.' ); if ( extensionPos != -1 ) extension = fileName.mid( extensionPos ); // keep the '.' delete m_pTempFile; - m_pTempFile = new KTempFile( QString::null, extension ); + m_pTempFile = new KTempFile( TQString::null, extension ); m_filename = m_pTempFile->name(); m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, false ); @@ -62,15 +62,15 @@ ImageListItem::~ImageListItem() } } -const QImage * ImageListItem::image() const +const TQImage * ImageListItem::image() const { return m_pImage; } -const QString & ImageListItem::file() const +const TQString & ImageListItem::file() const { if( m_url.isLocalFile() ) - return QString::null; + return TQString::null; return m_filename; } diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h index 63761af8..ee143a90 100644 --- a/kview/modules/presenter/imagelistitem.h +++ b/kview/modules/presenter/imagelistitem.h @@ -23,9 +23,9 @@ #include <klistview.h> #include <kurl.h> -#include <qstring.h> +#include <tqstring.h> -class QImage; +class TQImage; class ImageListItem : public KListViewItem { @@ -33,15 +33,15 @@ class ImageListItem : public KListViewItem ImageListItem( KListView * parent, const KURL & url ); ~ImageListItem(); - const QImage * image() const; - const QString & file() const; + const TQImage * image() const; + const TQString & file() const; const KURL & url() const; virtual int rtti() const { return 48294; } private: - QImage * m_pImage; - QString m_filename; + TQImage * m_pImage; + TQString m_filename; KURL m_url; }; diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index bbc5e8eb..3cf54d15 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -22,13 +22,13 @@ #include "imagelistdialog.h" #include "imagelistitem.h" -#include <qvbox.h> -#include <qobjectlist.h> -#include <qsignalslotimp.h> -#include <qtimer.h> -#include <qevent.h> -#include <qdragobject.h> -#include <qstringlist.h> +#include <tqvbox.h> +#include <tqobjectlist.h> +#include <tqsignalslotimp.h> +#include <tqtimer.h> +#include <tqevent.h> +#include <tqdragobject.h> +#include <tqstringlist.h> #include <kpushbutton.h> #include <kapplication.h> @@ -51,35 +51,35 @@ typedef KGenericFactory<KViewPresenter> KViewPresenterFactory; K_EXPORT_COMPONENT_FACTORY( kview_presenterplugin, KViewPresenterFactory( "kviewpresenterplugin" ) ) -KViewPresenter::KViewPresenter( QObject* parent, const char* name, const QStringList & ) +KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStringList & ) : Plugin( parent, name ) , m_pImageList( new ImageListDialog() ) , m_paFileOpen( 0 ) , m_bDontAdd( false ) , m_pCurrentItem( 0 ) - , m_pSlideshowTimer( new QTimer( this ) ) + , m_pSlideshowTimer( new TQTimer( this ) ) { kdDebug( 4630 ) << k_funcinfo << endl; m_imagelist.setAutoDelete( true ); - QObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) { ( void ) new KAction( i18n( "&Image List..." ), 0, 0, - this, SLOT( slotImageList() ), + this, TQT_SLOT( slotImageList() ), actionCollection(), "plugin_presenter_imageList" ); m_paSlideshow = new KToggleAction( i18n( "Start &Slideshow" ), Key_S, actionCollection(), "plugin_presenter_slideshow" ); ( void ) new KAction( i18n( "&Previous Image in List" ), "previous", ALT+Key_Left, - this, SLOT( prev() ), + this, TQT_SLOT( prev() ), actionCollection(), "plugin_presenter_prev" ); ( void ) new KAction( i18n( "&Next Image in List" ), "next", ALT+Key_Right, - this, SLOT( next() ), + this, TQT_SLOT( next() ), actionCollection(), "plugin_presenter_next" ); - connect( m_paSlideshow, SIGNAL( toggled( bool ) ), m_pImageList->m_pSlideshow, SLOT( setOn( bool ) ) ); - connect( m_pImageList->m_pSlideshow, SIGNAL( toggled( bool ) ), m_paSlideshow, SLOT( setChecked( bool ) ) ); + 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 ) ) ); // search for file_open action KXMLGUIClient * parentClient = static_cast<KXMLGUIClient*>( parent->qt_cast( "KXMLGUIClient" ) ); @@ -89,48 +89,48 @@ KViewPresenter::KViewPresenter( QObject* parent, const char* name, const QString m_paFileClose = parentClient->actionCollection()->action( "file_close" ); } if( m_paFileClose ) - connect( m_paFileClose, SIGNAL( activated() ), this, SLOT( slotClose() ) ); + connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) ); if( m_paFileOpen ) { - disconnect( m_paFileOpen, SIGNAL( activated() ), parent, SLOT( slotOpenFile() ) ); - connect( m_paFileOpen, SIGNAL( activated() ), this, SLOT( slotOpenFiles() ) ); + disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), parent, TQT_SLOT( slotOpenFile() ) ); + connect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); } else { (void) new KAction( i18n( "Open &Multiple Files..." ), "queue", CTRL+SHIFT+Key_O, - this, SLOT( slotOpenFiles() ), + this, TQT_SLOT( slotOpenFiles() ), actionCollection(), "plugin_presenter_openFiles" ); } - connect( m_pViewer, SIGNAL( imageOpened( const KURL & ) ), - SLOT( slotImageOpened( const KURL & ) ) ); + connect( m_pViewer, TQT_SIGNAL( imageOpened( const KURL & ) ), + TQT_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, SIGNAL( executed( QListViewItem* ) ), - this, SLOT( changeItem( QListViewItem* ) ) ); - connect( m_pImageList->m_pPrevious, SIGNAL( clicked() ), - this, SLOT( prev() ) ); - connect( m_pImageList->m_pNext, SIGNAL( clicked() ), - this, SLOT( next() ) ); - connect( m_pImageList->m_pListView, SIGNAL( spacePressed( QListViewItem* ) ), - this, SLOT( changeItem( QListViewItem* ) ) ); - connect( m_pImageList->m_pListView, SIGNAL( returnPressed( QListViewItem* ) ), - this, SLOT( changeItem( QListViewItem* ) ) ); - connect( m_pImageList->m_pSlideshow, SIGNAL( toggled( bool ) ), - this, SLOT( slideshow( bool ) ) ); - connect( m_pImageList->m_pInterval, SIGNAL( valueChanged( int ) ), - this, SLOT( setSlideshowInterval( int ) ) ); - connect( m_pImageList->m_pShuffle, SIGNAL( clicked() ), - this, SLOT( shuffle() ) ); - connect( m_pImageList->m_pLoad, SIGNAL( clicked() ), - this, SLOT( loadList() ) ); - connect( m_pImageList->m_pSave, SIGNAL( clicked() ), - this, SLOT( saveList() ) ); - connect( m_pImageList->m_pCloseAll, SIGNAL( clicked() ), - this, SLOT( closeAll() ) ); + 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() ) ); // allow drop on the dialog m_pImageList->installEventFilter( this ); @@ -140,8 +140,8 @@ KViewPresenter::KViewPresenter( QObject* parent, const char* name, const QString // grab drops on the main view m_pViewer->widget()->installEventFilter( this ); - connect( m_pSlideshowTimer, SIGNAL( timeout() ), - this, SLOT( next() ) ); + connect( m_pSlideshowTimer, TQT_SIGNAL( timeout() ), + this, TQT_SLOT( next() ) ); } KViewPresenter::~KViewPresenter() @@ -149,46 +149,46 @@ KViewPresenter::~KViewPresenter() kdDebug( 4630 ) << k_funcinfo << endl; if( m_paFileOpen ) { - disconnect( m_paFileOpen, SIGNAL( activated() ), this, SLOT( slotOpenFiles() ) ); + disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_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 QObject::connect warning we do the parent() check. + // rid of the TQObject::connect warning we do the parent() check. if( parent() ) - connect( m_paFileOpen, SIGNAL( activated() ), parent(), SLOT( slotOpenFile() ) ); + connect( m_paFileOpen, TQT_SIGNAL( activated() ), parent(), TQT_SLOT( slotOpenFile() ) ); } } -bool KViewPresenter::eventFilter( QObject *obj, QEvent *ev ) +bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev ) { if( obj == m_pImageList || obj == m_pImageList->m_pListView || obj == m_pImageList->m_pListView->viewport() || obj == m_pViewer->widget() ) { switch( ev->type() ) { - case QEvent::DragEnter: - case QEvent::DragMove: + case TQEvent::DragEnter: + case TQEvent::DragMove: { // drag enter event in the image list //kdDebug( 4630 ) << "DragEnterEvent in the image list: " << obj->className() << endl; - QDragEnterEvent * e = static_cast<QDragEnterEvent*>( ev ); + TQDragEnterEvent * e = static_cast<TQDragEnterEvent*>( ev ); //for( int i = 0; e->format( i ); ++i ) //kdDebug( 4630 ) << " - " << e->format( i ) << endl; - if( KURLDrag::canDecode( e ) )// || QImageDrag::canDecode( e ) ) + if( KURLDrag::canDecode( e ) )// || TQImageDrag::canDecode( e ) ) { e->accept(); return true; } } - case QEvent::Drop: + case TQEvent::Drop: { // drop event in the image list kdDebug( 4630 ) << "DropEvent in the image list: " << obj->className() << endl; - QDropEvent * e = static_cast<QDropEvent*>( ev ); - QStringList l; - //QImage image; + TQDropEvent * e = static_cast<TQDropEvent*>( ev ); + TQStringList l; + //TQImage image; if( KURLDrag::decodeToUnicodeUris( e, l ) ) { - for( QStringList::const_iterator it = l.begin(); it != l.end(); ++it ) + for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it ) { ImageInfo * info = new ImageInfo( KURL( *it ) ); if( ! m_imagelist.contains( info ) ) @@ -201,7 +201,7 @@ bool KViewPresenter::eventFilter( QObject *obj, QEvent *ev ) } return true; } - //else if( QImageDrag::decode( e, image ) ) + //else if( TQImageDrag::decode( e, image ) ) //newImage( image ); } default: // do nothing @@ -221,7 +221,7 @@ void KViewPresenter::slotImageOpened( const KURL & url ) if( ! m_imagelist.contains( info ) ) { m_imagelist.inSort( info ); - QListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url ); + TQListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url ); makeCurrent( item ); } else @@ -260,7 +260,7 @@ void KViewPresenter::slotOpenFiles() void KViewPresenter::slotClose() { - QListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); + TQListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); if( next == m_pCurrentItem ) next = 0; @@ -273,7 +273,7 @@ void KViewPresenter::slotClose() changeItem( next ); } -void KViewPresenter::changeItem( QListViewItem * qitem ) +void KViewPresenter::changeItem( TQListViewItem * qitem ) { kdDebug( 4630 ) << k_funcinfo << endl; if( qitem->rtti() == 48294 ) @@ -281,14 +281,14 @@ void KViewPresenter::changeItem( QListViewItem * qitem ) ImageListItem * item = static_cast<ImageListItem*>( qitem ); if( ! item->url().isEmpty() ) { - if( item->url().isLocalFile() && ! QFile::exists( item->url().path() ) ) + if( item->url().isLocalFile() && ! TQFile::exists( item->url().path() ) ) { kdDebug( 4630 ) << "file doesn't exist. removed." << endl; ImageInfo info( item->url() ); m_imagelist.remove( &info ); if( m_pCurrentItem == item ) { - QListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); + TQListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); if( next->rtti() != 48294 ) kdWarning( 4630 ) << "unknown ListView item" << endl; else @@ -327,7 +327,7 @@ void KViewPresenter::prev() kdDebug( 4630 ) << k_funcinfo << endl; if( m_pCurrentItem ) { - QListViewItem * prev = m_pCurrentItem->itemAbove() ? m_pCurrentItem->itemAbove() : m_pImageList->m_pListView->lastItem(); + TQListViewItem * prev = m_pCurrentItem->itemAbove() ? m_pCurrentItem->itemAbove() : m_pImageList->m_pListView->lastItem(); if( prev ) changeItem( prev ); } @@ -338,16 +338,16 @@ void KViewPresenter::next() kdDebug( 4630 ) << k_funcinfo << endl; if( m_pCurrentItem ) { - QListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); + TQListViewItem * next = m_pCurrentItem->itemBelow() ? m_pCurrentItem->itemBelow() : m_pImageList->m_pListView->firstChild(); if( next ) changeItem( next ); } } -void KViewPresenter::makeCurrent( QListViewItem * item ) +void KViewPresenter::makeCurrent( TQListViewItem * item ) { if( m_pCurrentItem ) - m_pCurrentItem->setPixmap( 0, QPixmap() ); + m_pCurrentItem->setPixmap( 0, TQPixmap() ); if( item->rtti() != 48294 ) kdWarning( 4630 ) << "unknown ListView item" << endl; else @@ -384,8 +384,8 @@ void KViewPresenter::shuffle() { m_pImageList->noSort(); KListView * listview = m_pImageList->m_pListView; - QPtrList<QListViewItem> items; - for( QListViewItem * item = listview->firstChild(); item; item = listview->firstChild() ) + TQPtrList<TQListViewItem> items; + for( TQListViewItem * item = listview->firstChild(); item; item = listview->firstChild() ) { items.append( item ); listview->takeItem( item ); @@ -405,26 +405,26 @@ void KViewPresenter::closeAll() void KViewPresenter::loadList() { - KURL url = KFileDialog::getOpenURL( ":load_list", QString::null, m_pImageList ); + KURL url = KFileDialog::getOpenURL( ":load_list", TQString::null, m_pImageList ); if( url.isEmpty() ) return; - QString tempfile; + TQString tempfile; if( ! KIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) ) { KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).arg( url.prettyURL() ) ); return; } - QFile file( tempfile ); + TQFile file( tempfile ); if( file.open( IO_ReadOnly ) ) { - QTextStream t( &file ); + TQTextStream t( &file ); if( t.readLine() == "[KView Image List]" ) { //clear old image list closeAll(); - QStringList list; + TQStringList list; if( ! t.eof() ) m_pViewer->openURL( KURL( t.readLine() ) ); while( ! t.eof() ) @@ -451,12 +451,12 @@ void KViewPresenter::loadList() void KViewPresenter::saveList() { - KURL url = KFileDialog::getSaveURL( ":save_list", QString::null, m_pImageList ); + KURL url = KFileDialog::getSaveURL( ":save_list", TQString::null, m_pImageList ); if( url.isEmpty() ) return; - QString tempfile; + TQString tempfile; if( url.isLocalFile() ) tempfile = url.path(); else @@ -465,13 +465,13 @@ void KViewPresenter::saveList() tempfile = ktempf.name(); } - QFile file( tempfile ); + TQFile file( tempfile ); if( file.open( IO_WriteOnly ) ) { - QTextStream t( &file ); + TQTextStream t( &file ); // write header t << "[KView Image List]" << endl; - QListViewItem * item = m_pImageList->m_pListView->firstChild(); + TQListViewItem * item = m_pImageList->m_pListView->firstChild(); while( item ) { if( item->rtti() == 48294 ) diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h index 29fc106b..e607f92b 100644 --- a/kview/modules/presenter/kviewpresenter.h +++ b/kview/modules/presenter/kviewpresenter.h @@ -24,14 +24,14 @@ #include <kparts/plugin.h> #include <kurl.h> -#include <qsortedlist.h> +#include <tqsortedlist.h> namespace KImageViewer { class Viewer; } class ImageListDialog; class ImageListItem; -class QListViewItem; -class QTimer; +class TQListViewItem; +class TQTimer; class KToggleAction; class KAction; @@ -39,7 +39,7 @@ class KViewPresenter : public KParts::Plugin { Q_OBJECT public: - KViewPresenter( QObject* parent, const char* name, const QStringList & ); + KViewPresenter( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewPresenter(); protected: @@ -67,14 +67,14 @@ protected: return url.prettyURL() < i1.url.prettyURL(); } }; - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); private slots: void slotImageOpened( const KURL & ); void slotImageList(); void slotOpenFiles(); void slotClose(); - void changeItem( QListViewItem * ); + void changeItem( TQListViewItem * ); void prev(); void next(); void slideshow( bool ); @@ -85,7 +85,7 @@ private slots: void saveList(); private: - void makeCurrent( QListViewItem * ); + void makeCurrent( TQListViewItem * ); KImageViewer::Viewer * m_pViewer; ImageListDialog * m_pImageList; @@ -93,10 +93,10 @@ private: KAction * m_paFileOpen; KAction * m_paFileClose; - QSortedList<ImageInfo> m_imagelist; + TQSortedList<ImageInfo> m_imagelist; bool m_bDontAdd; ImageListItem * m_pCurrentItem; - QTimer * m_pSlideshowTimer; + TQTimer * m_pSlideshowTimer; }; // vim:sw=4:ts=4:cindent diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp index a39ea378..1c79ee15 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.cpp +++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp @@ -20,16 +20,16 @@ #include "kviewpresenterconfmodule.h" -#include <qlayout.h> -#include <qcheckbox.h> -#include <qframe.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqframe.h> #include <klocale.h> #include <kdialog.h> #include <kglobal.h> #include <kconfig.h> -KViewPresenterConfModule::KViewPresenterConfModule( QObject * parent ) +KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent ) : KPreferencesModule( "kviewpresenter", parent, "KView Presenter Config Module" ) { } @@ -47,12 +47,12 @@ void KViewPresenterConfModule::reset() { } -void KViewPresenterConfModule::createPage( QFrame * page ) +void KViewPresenterConfModule::createPage( TQFrame * page ) { - QBoxLayout * layout = new QVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * layout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() ); layout->setAutoAdd( true ); - m_pCheckBox = new QCheckBox( "This is only for testing...", page ); + m_pCheckBox = new TQCheckBox( "This is only for testing...", page ); } // vim:sw=4:ts=4 diff --git a/kview/modules/presenter/kviewpresenterconfmodule.h b/kview/modules/presenter/kviewpresenterconfmodule.h index dd7e5cf2..6e3dcb46 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.h +++ b/kview/modules/presenter/kviewpresenterconfmodule.h @@ -23,13 +23,13 @@ #include "kpreferencesmodule.h" -class QCheckBox; +class TQCheckBox; class KViewPresenterConfModule : public KPreferencesModule { Q_OBJECT public: - KViewPresenterConfModule( QObject * parent ); + KViewPresenterConfModule( TQObject * parent ); ~KViewPresenterConfModule(); signals: @@ -38,10 +38,10 @@ class KViewPresenterConfModule : public KPreferencesModule protected: virtual void applyChanges(); virtual void reset(); - virtual void createPage( QFrame * page ); + virtual void createPage( TQFrame * page ); private: - QCheckBox * m_pCheckBox; + TQCheckBox * m_pCheckBox; }; // vim:sw=4:ts=4 diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index e5ce8465..936713f6 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -21,7 +21,7 @@ #include "kfloatspinbox.h" #if defined(QT_ACCESSIBILITY_SUPPORT) -#include <qaccessible.h> +#include <tqaccessible.h> #endif #include <knumvalidator.h> @@ -37,12 +37,12 @@ int pow( int a, int b ) return ret; } -KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, QWidget * parent, const char * name ) - : QSpinBox( parent, name ) +KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent, const char * name ) + : TQSpinBox( parent, name ) , m_doselection( true ) { setRange( minValue, maxValue, step, precision ); - connect( this, SIGNAL( valueChanged( int ) ), this, SLOT( slotValueChanged( int ) ) ); + connect( this, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotValueChanged( int ) ) ); } KFloatSpinBox::~KFloatSpinBox() @@ -55,7 +55,7 @@ void KFloatSpinBox::setRange( float minValue, float maxValue, float step, unsign m_min = (int)( minValue * m_factor ); m_max = (int)( maxValue * m_factor ); m_step = (int)( step * m_factor ); - QSpinBox::setRange( m_min, m_max ); + TQSpinBox::setRange( m_min, m_max ); setSteps( m_step, m_step * 10 ); if( precision == 0 ) setValidator( new KIntValidator( m_min, m_max, this, 10, "KFloatValidator::KIntValidator" ) ); @@ -65,14 +65,14 @@ void KFloatSpinBox::setRange( float minValue, float maxValue, float step, unsign float KFloatSpinBox::value() const { - float ret = (float)QSpinBox::value() / m_factor; + float ret = (float)TQSpinBox::value() / m_factor; kdDebug( 4630 ) << ret << endl; return ret; } void KFloatSpinBox::setValue( float value ) { - QSpinBox::setValue( (int)( value * m_factor ) ); + TQSpinBox::setValue( (int)( value * m_factor ) ); } void KFloatSpinBox::setValueBlocking( float value ) @@ -84,7 +84,7 @@ void KFloatSpinBox::setValueBlocking( float value ) m_doselection = true; } -QString KFloatSpinBox::mapValueToText( int value ) +TQString KFloatSpinBox::mapValueToText( int value ) { return KGlobal::locale()->formatNumber( (float)value / (float)m_factor, 4 ); } @@ -97,13 +97,13 @@ int KFloatSpinBox::mapTextToValue( bool * ok ) void KFloatSpinBox::valueChange() { if( m_doselection ) - QSpinBox::valueChange(); + TQSpinBox::valueChange(); else { updateDisplay(); emit valueChanged( value() ); #if defined(QT_ACCESSIBILITY_SUPPORT) - QAccessible::updateAccessibility( this, 0, QAccessible::ValueChanged ); + TQAccessible::updateAccessibility( this, 0, TQAccessible::ValueChanged ); #endif } } diff --git a/kview/modules/scale/kfloatspinbox.h b/kview/modules/scale/kfloatspinbox.h index 9407a0f1..6424df38 100644 --- a/kview/modules/scale/kfloatspinbox.h +++ b/kview/modules/scale/kfloatspinbox.h @@ -21,13 +21,13 @@ #ifndef __kfloatspinbox_h_ #define __kfloatspinbox_h_ -#include <qspinbox.h> +#include <tqspinbox.h> class KFloatSpinBox : public QSpinBox { Q_OBJECT public: - KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, QWidget * parent = 0, const char * name = 0 ); + KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent = 0, const char * name = 0 ); virtual ~KFloatSpinBox(); void setRange( float minValue, float maxValue, float step, unsigned int precision ); @@ -43,7 +43,7 @@ class KFloatSpinBox : public QSpinBox virtual void setValueBlocking( float value ); protected: - virtual QString mapValueToText( int value ); + virtual TQString mapValueToText( int value ); virtual int mapTextToValue( bool * ok ); virtual void valueChange(); diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index aa8dec82..29e71b13 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -21,8 +21,8 @@ #include "kview_scale.h" #include "scaledlg.h" -#include <qimage.h> -#include <qvbox.h> +#include <tqimage.h> +#include <tqvbox.h> #include <kaction.h> #include <klocale.h> @@ -35,7 +35,7 @@ typedef KGenericFactory<KViewScale> KViewScaleFactory; K_EXPORT_COMPONENT_FACTORY( kview_scale, KViewScaleFactory( "kview_scale" ) ) -KViewScale::KViewScale( QObject* parent, const char* name, const QStringList & ) +KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList & ) : Plugin( parent, name ) , m_pViewer( 0 ) , m_pCanvas( 0 ) @@ -47,7 +47,7 @@ KViewScale::KViewScale( QObject* parent, const char* name, const QStringList & ) m_pCanvas = m_pViewer->canvas(); (void) new KAction( i18n( "&Scale Image..." ), 0, 0, - this, SLOT( slotScaleDlg() ), + this, TQT_SLOT( slotScaleDlg() ), actionCollection(), "plugin_scale" ); } else @@ -64,36 +64,36 @@ void KViewScale::slotScaleDlg() KDialogBase dlg( m_pViewer->widget(), "KView scale dialog", true, i18n( "Scale Image" ), KDialogBase::Ok|KDialogBase::Cancel ); ScaleDlg widget( m_pCanvas->imageSize(), dlg.makeVBoxMainWidget() ); #if 0 - QVBox * layout = dlg.makeVBoxMainWidget(); + TQVBox * layout = dlg.makeVBoxMainWidget(); - QGroupBox * pixelgroup = new QGroupBox( i18n( "Pixel Dimensions" ), layout ); - QGridLayout * pixelgroupgrid = new QGridLayout( pixelgroup, 1, 1, 0, KDialog::spacingHint() ); + TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), layout ); + TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, 0, KDialog::spacingHint() ); pixelgroupgrid->setSpacing( KDialog::spacingHint() ); pixelgroupgrid->setMargin( KDialog::marginHint() ); - QLabel * label; - QSize imagesize = m_pCanvas->imageSize(); + TQLabel * label; + TQSize imagesize = m_pCanvas->imageSize(); // show original width - label = new QLabel( i18n( "Original width:" ), pixelgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "Original width:" ), pixelgroup ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 0, 0 ); - pixelgroupgrid->addWidget( new QLabel( QString::number( imagesize.width() ), pixelgroup ), 0, 1 ); - label = new QLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( QLabel::AlignRight ); + pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.width() ), pixelgroup ), 0, 1 ); + label = new TQLabel( i18n( "Height:" ), pixelgroup ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 1, 0 ); - pixelgroupgrid->addWidget( new QLabel( QString::number( imagesize.height() ), pixelgroup ), 1, 1 ); + pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.height() ), pixelgroup ), 1, 1 ); pixelgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); - label = new QLabel( i18n( "New width:" ), pixelgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "New width:" ), pixelgroup ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 3, 0 ); - label = new QLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "Height:" ), pixelgroup ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 4, 0 ); - QSpinBox * newwidth = new QSpinBox( 1, 100000, 1, pixelgroup ); + TQSpinBox * newwidth = new TQSpinBox( 1, 100000, 1, pixelgroup ); pixelgroupgrid->addWidget( newwidth, 3, 1 ); - QSpinBox * newheight = new QSpinBox( 1, 100000, 1, pixelgroup ); + TQSpinBox * newheight = new TQSpinBox( 1, 100000, 1, pixelgroup ); pixelgroupgrid->addWidget( newheight, 4, 1 ); KComboBox * newsizeunit = new KComboBox( pixelgroup ); newsizeunit->insertItem( i18n( "px" ) ); @@ -102,34 +102,34 @@ void KViewScale::slotScaleDlg() pixelgroupgrid->addRowSpacing( 5, KDialog::spacingHint() ); - label = new QLabel( i18n( "Ratio X:" ), pixelgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "Ratio X:" ), pixelgroup ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 6, 0 ); - label = new QLabel( i18n( "Y:" ), pixelgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "Y:" ), pixelgroup ); + label->setAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 7, 0 ); - QSpinBox * ratiox = new QSpinBox( pixelgroup ); - ratiox->setValidator( new QDoubleValidator( 0.0001, 10000, 4, ratiox ) ); + TQSpinBox * ratiox = new TQSpinBox( pixelgroup ); + ratiox->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratiox ) ); pixelgroupgrid->addWidget( ratiox, 6, 1 ); - QSpinBox * ratioy = new QSpinBox( pixelgroup ); - ratioy->setValidator( new QDoubleValidator( 0.0001, 10000, 4, ratioy ) ); + TQSpinBox * ratioy = new TQSpinBox( pixelgroup ); + ratioy->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratioy ) ); pixelgroupgrid->addWidget( ratioy, 7, 1 ); - pixelgroupgrid->addMultiCellWidget( new QCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, Qt::AlignVCenter ); + pixelgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, Qt::AlignVCenter ); - QGroupBox * printgroup = new QGroupBox( i18n( "Print Size && Display Units" ), layout ); - QGridLayout * printgroupgrid = new QGridLayout( printgroup, 1, 1, 0, KDialog::spacingHint() ); + TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), layout ); + TQGridLayout * printgroupgrid = new TQGridLayout( printgroup, 1, 1, 0, KDialog::spacingHint() ); printgroupgrid->setSpacing( KDialog::spacingHint() ); printgroupgrid->setMargin( KDialog::marginHint() ); - label = new QLabel( i18n( "New width:" ), printgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "New width:" ), printgroup ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 0, 0 ); - label = new QLabel( i18n( "Height:" ), printgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "Height:" ), printgroup ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 1, 0 ); - QSpinBox * newwidth2 = new QSpinBox( printgroup ); + TQSpinBox * newwidth2 = new TQSpinBox( printgroup ); printgroupgrid->addWidget( newwidth2, 0, 1 ); - QSpinBox * newheight2 = new QSpinBox( printgroup ); + TQSpinBox * newheight2 = new TQSpinBox( printgroup ); printgroupgrid->addWidget( newheight2, 1, 1 ); KComboBox * newsizeunit2 = new KComboBox( printgroup ); newsizeunit2->insertItem( i18n( "in" ) ); @@ -138,17 +138,17 @@ void KViewScale::slotScaleDlg() printgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); - label = new QLabel( i18n( "Resolution X:" ), printgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "Resolution X:" ), printgroup ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 3, 0 ); - label = new QLabel( i18n( "Y:" ), printgroup ); - label->setAlignment( QLabel::AlignRight ); + label = new TQLabel( i18n( "Y:" ), printgroup ); + label->setAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 4, 0 ); - QSpinBox * resx = new QSpinBox( printgroup ); + TQSpinBox * resx = new TQSpinBox( printgroup ); printgroupgrid->addWidget( resx, 3, 1 ); - QSpinBox * resy = new QSpinBox( printgroup ); + TQSpinBox * resy = new TQSpinBox( printgroup ); printgroupgrid->addWidget( resy, 4, 1 ); - printgroupgrid->addMultiCellWidget( new QCheckBox( i18n( "Link" ), printgroup ), 3, 4, 2, 2, Qt::AlignVCenter ); + printgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), printgroup ), 3, 4, 2, 2, Qt::AlignVCenter ); //KComboBox * newsizeunit2 = new KComboBox( printgroup ); //newsizeunit2->insertItem( i18n( "in" ) ); //newsizeunit2->insertItem( i18n( "mm" ) ); @@ -162,12 +162,12 @@ void KViewScale::slotScale() { // retrieve current image kdDebug( 4630 ) << "m_pCanvas = " << m_pCanvas << endl; - const QImage * image = m_pCanvas->image(); + const TQImage * image = m_pCanvas->image(); kdDebug( 4630 ) << "image pointer retrieved" << endl; if( image ) { // scale - QImage newimage = image->smoothScale( 50, 50 ); + TQImage newimage = image->smoothScale( 50, 50 ); // put back (modified) m_pCanvas->setImage( newimage ); m_pViewer->setModified( true ); diff --git a/kview/modules/scale/kview_scale.h b/kview/modules/scale/kview_scale.h index 2022f0ac..3ac45257 100644 --- a/kview/modules/scale/kview_scale.h +++ b/kview/modules/scale/kview_scale.h @@ -32,7 +32,7 @@ class KViewScale : public KParts::Plugin { Q_OBJECT public: - KViewScale( QObject* parent, const char* name, const QStringList & ); + KViewScale( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewScale(); private slots: diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index 997be86d..929aafcd 100644 --- a/kview/modules/scale/scaledlg.cpp +++ b/kview/modules/scale/scaledlg.cpp @@ -20,13 +20,13 @@ #include "scaledlg.h" -#include <qvbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qsize.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqsize.h> #include <kdebug.h> #include <kcombobox.h> @@ -37,8 +37,8 @@ #define ONEINCHINMM 2.54 -ScaleDlg::ScaleDlg( const QSize & origsize, QVBox * parent, const char * name ) - : QObject( parent, name ) +ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name ) + : TQObject( parent, name ) , m_origsize( origsize ) , m_newsizeunit( 0 ) , m_newsizeunit2( 0 ) @@ -48,66 +48,66 @@ ScaleDlg::ScaleDlg( const QSize & origsize, QVBox * parent, const char * name ) , m_resx( 72 ) , m_resy( 72 ) { - QGroupBox * pixelgroup = new QGroupBox( i18n( "Pixel Dimensions" ), parent ); - QGroupBox * printgroup = new QGroupBox( i18n( "Print Size && Display Units" ), parent ); + TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), parent ); + TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), parent ); - QGridLayout * pixelgroupgrid = new QGridLayout( pixelgroup, 1, 1, + TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - QGridLayout * printgroupgrid = new QGridLayout( printgroup, 1, 1, + TQGridLayout * printgroupgrid = new TQGridLayout( printgroup, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel * label; + TQLabel * label; pixelgroupgrid->addRowSpacing( 0, KDialog::spacingHint() ); - label = new QLabel( i18n( "Original width:" ), pixelgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Original width:" ), pixelgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 1, 0 ); - label = new QLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Height:" ), pixelgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 2, 0 ); pixelgroupgrid->addRowSpacing( 3, KDialog::spacingHint() ); - label = new QLabel( i18n( "New width:" ), pixelgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "New width:" ), pixelgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 4, 0 ); - label = new QLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Height:" ), pixelgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 5, 0 ); pixelgroupgrid->addRowSpacing( 6, KDialog::spacingHint() ); - label = new QLabel( i18n( "Ratio X:" ), pixelgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Ratio X:" ), pixelgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 7, 0 ); - label = new QLabel( i18n( "Y:" ), pixelgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Y:" ), pixelgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 8, 0 ); printgroupgrid->addRowSpacing( 0, KDialog::spacingHint() ); - label = new QLabel( i18n( "New width:" ), printgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "New width:" ), printgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 1, 0 ); - label = new QLabel( i18n( "Height:" ), printgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Height:" ), printgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 2, 0 ); printgroupgrid->addRowSpacing( 3, KDialog::spacingHint() ); - label = new QLabel( i18n( "Resolution X:" ), printgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Resolution X:" ), printgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 4, 0 ); - label = new QLabel( i18n( "Y:" ), printgroup ); - label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label = new TQLabel( i18n( "Y:" ), printgroup ); + label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 5, 0 ); - m_pOldWidth = new QLabel( QString::number( origsize.width() ), pixelgroup ); - m_pOldWidth->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_pOldWidth = new TQLabel( TQString::number( origsize.width() ), pixelgroup ); + m_pOldWidth->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( m_pOldWidth, 1, 1 ); - m_pOldHeight = new QLabel( QString::number( origsize.height() ), pixelgroup ); - m_pOldHeight->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_pOldHeight = new TQLabel( TQString::number( origsize.height() ), pixelgroup ); + m_pOldHeight->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( m_pOldHeight, 2, 1 ); m_pNewWidth = new KFloatSpinBox( 1.0, 100000.0, 10.0, 0, pixelgroup ); @@ -125,7 +125,7 @@ ScaleDlg::ScaleDlg( const QSize & origsize, QVBox * parent, const char * name ) m_pRatioY = new KFloatSpinBox( 0.0001, 10000.0, 0.1, 4, pixelgroup ); pixelgroupgrid->addWidget( m_pRatioY, 8, 1 ); - m_pLinkRatio = new QCheckBox( i18n( "Link" ), pixelgroup ); + m_pLinkRatio = new TQCheckBox( i18n( "Link" ), pixelgroup ); pixelgroupgrid->addMultiCellWidget( m_pLinkRatio, 7, 8, 2, 2, Qt::AlignVCenter ); m_pNewWidth2 = new KFloatSpinBox( 0.0001, 10000.0, 0.1, 4, printgroup ); @@ -143,7 +143,7 @@ ScaleDlg::ScaleDlg( const QSize & origsize, QVBox * parent, const char * name ) m_pResolutionY = new KFloatSpinBox( 0.0001, 6000.0, 1.0, 4, printgroup ); printgroupgrid->addWidget( m_pResolutionY, 5, 1 ); - m_pLinkResolution = new QCheckBox( i18n( "Link" ), printgroup ); + m_pLinkResolution = new TQCheckBox( i18n( "Link" ), printgroup ); printgroupgrid->addMultiCellWidget( m_pLinkResolution, 4, 5, 2, 2, Qt::AlignVCenter ); m_pResolutionUnit = new KComboBox( printgroup ); m_pResolutionUnit->insertItem( i18n( "pixels/in" ) ); @@ -157,16 +157,16 @@ ScaleDlg::ScaleDlg( const QSize & origsize, QVBox * parent, const char * name ) m_newsizeunit2 = 0; m_resolutionunit = 0; - connect( m_pNewWidth, SIGNAL( valueChanged( float ) ), SLOT( slotNewWidth( float ) ) ); - connect( m_pNewHeight, SIGNAL( valueChanged( float ) ), SLOT( slotNewHeight( float ) ) ); - connect( m_pNewWidth2, SIGNAL( valueChanged( float ) ), SLOT( slotNewWidth2( float ) ) ); - connect( m_pNewHeight2, SIGNAL( valueChanged( float ) ), SLOT( slotNewHeight2( float ) ) ); - connect( m_pResolutionX, SIGNAL( valueChanged( float ) ), SLOT( slotResolutionX( float ) ) ); - connect( m_pResolutionY, SIGNAL( valueChanged( float ) ), SLOT( slotResolutionY( float ) ) ); + 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, SIGNAL( activated( int ) ), SLOT( slotChangeNewSizeUnit( int ) ) ); - connect( m_pNewSizeUnit2, SIGNAL( activated( int ) ), SLOT( slotChangeNewSizeUnit2( int ) ) ); - connect( m_pResolutionUnit, SIGNAL( activated( int ) ), SLOT( slotChangeResolutionUnit( int ) ) ); + 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 ) ) ); } ScaleDlg::~ScaleDlg() diff --git a/kview/modules/scale/scaledlg.h b/kview/modules/scale/scaledlg.h index ac5a6c44..71fa23d5 100644 --- a/kview/modules/scale/scaledlg.h +++ b/kview/modules/scale/scaledlg.h @@ -21,20 +21,20 @@ #ifndef __scaledlg_h_ #define __scaledlg_h_ -#include <qobject.h> +#include <tqobject.h> -class QLabel; +class TQLabel; class KFloatSpinBox; class KComboBox; -class QCheckBox; -class QVBox; -class QSize; +class TQCheckBox; +class TQVBox; +class TQSize; class ScaleDlg : public QObject { Q_OBJECT public: - ScaleDlg( const QSize & originalsize, QVBox * parent, const char * name = 0 ); + ScaleDlg( const TQSize & originalsize, TQVBox * parent, const char * name = 0 ); ~ScaleDlg(); private slots: @@ -49,7 +49,7 @@ class ScaleDlg : public QObject void slotChangeResolutionUnit( int ); private: - QSize m_origsize; + TQSize m_origsize; int m_newsizeunit; int m_newsizeunit2; int m_resolutionunit; @@ -57,21 +57,21 @@ class ScaleDlg : public QObject float m_newwidth, m_newheight; // in Pixel float m_resx, m_resy; // in dpi - QLabel * m_pOldWidth; - QLabel * m_pOldHeight; + TQLabel * m_pOldWidth; + TQLabel * m_pOldHeight; KFloatSpinBox * m_pNewWidth; KFloatSpinBox * m_pNewHeight; KComboBox * m_pNewSizeUnit; KFloatSpinBox * m_pRatioX; KFloatSpinBox * m_pRatioY; - QCheckBox * m_pLinkRatio; + TQCheckBox * m_pLinkRatio; KFloatSpinBox * m_pNewWidth2; KFloatSpinBox * m_pNewHeight2; KComboBox * m_pNewSizeUnit2; KFloatSpinBox * m_pResolutionX; KFloatSpinBox * m_pResolutionY; - QCheckBox * m_pLinkResolution; + TQCheckBox * m_pLinkResolution; KComboBox * m_pResolutionUnit; }; diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp index d1f96e5f..bf99e282 100644 --- a/kview/modules/scanner/kviewscanner.cpp +++ b/kview/modules/scanner/kviewscanner.cpp @@ -20,8 +20,8 @@ #include "kviewscanner.h" -#include <qimage.h> -#include <qobjectlist.h> +#include <tqimage.h> +#include <tqobjectlist.h> #include <kaction.h> #include <kinstance.h> @@ -35,19 +35,19 @@ typedef KGenericFactory<KViewScanner> KViewScannerFactory; K_EXPORT_COMPONENT_FACTORY( kview_scannerplugin, KViewScannerFactory( "kviewscannerplugin" ) ) -KViewScanner::KViewScanner( QObject* parent, const char* name, - const QStringList & ) +KViewScanner::KViewScanner( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ), m_pScandlg( 0 ), m_pViewer( 0 ) { - QObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) { (void) new KAction( i18n( "&Scan Image..." ), "scanner", 0, - this, SLOT( slotScan() ), + this, TQT_SLOT( slotScan() ), actionCollection(), "plugin_scan" ); } else @@ -67,8 +67,8 @@ void KViewScanner::slotScan() { m_pScandlg->setMinimumSize( 300, 300 ); - connect( m_pScandlg, SIGNAL( finalImage( const QImage &, int ) ), - this, SLOT( slotImgScanned( const QImage & ) ) ); + connect( m_pScandlg, TQT_SIGNAL( finalImage( const TQImage &, int ) ), + this, TQT_SLOT( slotImgScanned( const TQImage & ) ) ); } else { @@ -86,7 +86,7 @@ void KViewScanner::slotScan() m_pScandlg->show(); } -void KViewScanner::slotImgScanned( const QImage & img ) +void KViewScanner::slotImgScanned( const TQImage & img ) { kdDebug( 4630 ) << "received an image from the scanner" << endl; m_pViewer->newImage( img ); diff --git a/kview/modules/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h index cdb32d67..56b59472 100644 --- a/kview/modules/scanner/kviewscanner.h +++ b/kview/modules/scanner/kviewscanner.h @@ -32,14 +32,14 @@ class KViewScanner : public KParts::Plugin { Q_OBJECT public: - KViewScanner( QObject* parent, const char* name, const QStringList & ); + KViewScanner( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewScanner(); //public slots: private slots: void slotScan(); - void slotImgScanned( const QImage & ); + void slotImgScanned( const TQImage & ); private: KScanDialog * m_pScandlg; diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp index c8c6dc9d..f8277162 100644 --- a/kview/modules/template/kviewtemplate.cpp +++ b/kview/modules/template/kviewtemplate.cpp @@ -4,7 +4,7 @@ #include "kviewtemplate.h" -#include <qobjectlist.h> +#include <tqobjectlist.h> #include <kaction.h> /*#include <klocale.h>*/ @@ -15,16 +15,16 @@ typedef KGenericFactory<KViewTemplate> KViewTemplateFactory; K_EXPORT_COMPONENT_FACTORY( kview_templateplugin, KViewTemplateFactory( "kviewtemplateplugin" ) ) -KViewTemplate::KViewTemplate( QObject* parent, const char* name, const QStringList & ) +KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQStringList & ) : Plugin( parent, name ) { - QObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) { (void) new KAction( /*i18n(*/ "&Do Something" /*)*/, 0, 0, - this, SLOT( yourSlot() ), + this, TQT_SLOT( yourSlot() ), actionCollection(), "plugin_template" ); } else diff --git a/kview/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h index 1d158b05..5d49890e 100644 --- a/kview/modules/template/kviewtemplate.h +++ b/kview/modules/template/kviewtemplate.h @@ -13,7 +13,7 @@ class KViewTemplate : public KParts::Plugin { Q_OBJECT public: - KViewTemplate( QObject* parent, const char* name, const QStringList & ); + KViewTemplate( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewTemplate(); private slots: diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index 082bfd49..2558279a 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -44,30 +44,30 @@ Copyright (c) 2004,2005 Charles Samuels <charles@kde.org> #include <kstdaccel.h> #include <kstandarddirs.h> -Previews::Previews(PhotoBook *parent, const QStringList &mimetypes) +Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes) : KFileIconView(parent, 0) { mPhotoBook = parent; mMimeTypes = mimetypes; - connect(&mDirLister, SIGNAL(clear()), SLOT(slotClearView())); - connect(&mDirLister, SIGNAL(completed()), SLOT(doneListing())); + connect(&mDirLister, TQT_SIGNAL(clear()), TQT_SLOT(slotClearView())); + connect(&mDirLister, TQT_SIGNAL(completed()), TQT_SLOT(doneListing())); connect( - &mDirLister, SIGNAL(newItems(const KFileItemList &)), - SLOT(insertNewFiles(const KFileItemList &)) + &mDirLister, TQT_SIGNAL(newItems(const KFileItemList &)), + TQT_SLOT(insertNewFiles(const KFileItemList &)) ); connect( - signaler(), SIGNAL(fileSelected(const KFileItem*)), - SLOT(open(const KFileItem*)) + signaler(), TQT_SIGNAL(fileSelected(const KFileItem*)), + TQT_SLOT(open(const KFileItem*)) ); connect( - &mDirLister, SIGNAL(deleteItem(KFileItem *)), - SLOT(removeItem(KFileItem *)) + &mDirLister, TQT_SIGNAL(deleteItem(KFileItem *)), + TQT_SLOT(removeItem(KFileItem *)) ); connect( - &mDirLister, SIGNAL( refreshItems( const KFileItemList& ) ), - SLOT( slotRefreshItems( const KFileItemList& ) ) + &mDirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), + TQT_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 - QTimer::singleShot(0, this, SLOT(goToFirst())); + TQTimer::singleShot(0, this, TQT_SLOT(goToFirst())); } void Previews::goToFirst() @@ -149,15 +149,15 @@ void Previews::goToFirst() -PhotoBook::PhotoBook(QWidget *parent, PhotoBookPart *part, const char *name) - : QSplitter(parent, name) +PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) + : TQSplitter(parent, name) { - QStringList mimetypes; + TQStringList mimetypes; KTrader::OfferList offers = KTrader::self()->query( "KImageViewer/Viewer", "KParts/ReadOnlyPart", - "DesktopEntryName == 'kviewviewer'", QString::null + "DesktopEntryName == 'kviewviewer'", TQString::null ); for ( @@ -174,7 +174,7 @@ PhotoBook::PhotoBook(QWidget *parent, PhotoBookPart *part, const char *name) { KSimpleConfig e(locate("services", service->desktopEntryPath())); e.setGroup("Desktop Entry"); - mimetypes = QStringList::split(';', e.readEntry("MimeType")); + mimetypes = TQStringList::split(';', e.readEntry("MimeType")); break; } } @@ -184,8 +184,8 @@ PhotoBook::PhotoBook(QWidget *parent, PhotoBookPart *part, const char *name) mFit = mViewer->action("fittowin"); - connect(mList, SIGNAL(open(const KURL&)), mViewer, SLOT(openURL(const KURL&))); - connect(mViewer, SIGNAL(completed()), mFit, SLOT(activate())); + connect(mList, TQT_SIGNAL(open(const KURL&)), mViewer, TQT_SLOT(openURL(const KURL&))); + connect(mViewer, TQT_SIGNAL(completed()), mFit, TQT_SLOT(activate())); part->insertChildClient(mViewer); } @@ -220,9 +220,9 @@ void PhotoBook::updateButton( bool nextExist, bool previousExit) K_EXPORT_COMPONENT_FACTORY(libphotobook, PhotoBookFactory ) PhotoBookPart::PhotoBookPart( - QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const QStringList& + TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const TQStringList& ) : KParts::ReadOnlyPart(parent, name) { @@ -233,11 +233,11 @@ PhotoBookPart::PhotoBookPart( setWidget(bv); connect( - bv, SIGNAL(emitUpdateButton(bool, bool)), - this, SLOT(slotUpdateButton(bool, bool)) + bv, TQT_SIGNAL(emitUpdateButton(bool, bool)), + this, TQT_SLOT(slotUpdateButton(bool, bool)) ); - m_pNextAction = KStdAction::next(bv, SLOT(next()), actionCollection(), "next"); - m_pPreviousAction = KStdAction::prior(bv, SLOT(previous()), actionCollection(), "previous"); + m_pNextAction = KStdAction::next(bv, TQT_SLOT(next()), actionCollection(), "next"); + m_pPreviousAction = KStdAction::prior(bv, TQT_SLOT(previous()), actionCollection(), "previous"); setXMLFile( "photobookui.rc" ); diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index 3da5cf78..adae0e23 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -39,7 +39,7 @@ Copyright (c) 2004 Charles Samuels <charles@kde.org> #ifndef PHOTOBOOK_H #define PHOTOBOOK_H -#include <qsplitter.h> +#include <tqsplitter.h> #include <kfileiconview.h> #include <kdirlister.h> @@ -58,7 +58,7 @@ Q_OBJECT KParts::ReadOnlyPart *mViewer; public: - PhotoBook(QWidget *parent, PhotoBookPart *part, const char *name=0); + PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name=0); void openURL(const KURL &url); void updateButton(bool, bool ); @@ -76,10 +76,10 @@ Q_OBJECT KDirLister mDirLister; PhotoBook *mPhotoBook; - QStringList mMimeTypes; + TQStringList mMimeTypes; public: - Previews(PhotoBook *parent, const QStringList &mimetypes); + Previews(PhotoBook *parent, const TQStringList &mimetypes); ~Previews(); void openURL(const KURL &url); @@ -112,9 +112,9 @@ Q_OBJECT public: PhotoBookPart( - QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name=0, - const QStringList& args = QStringList() + TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name=0, + const TQStringList& args = TQStringList() ); ~PhotoBookPart(); |