diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
| commit | e69e8b1d09fb579316595b4e6a850e717358a8b1 (patch) | |
| tree | a24fc20865f65772f530d16177520190594ffdd2 /kview | |
| parent | eecec9afb81fdebb0f22e9da22635874c403f854 (diff) | |
| download | tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip | |
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kview')
55 files changed, 342 insertions, 316 deletions
diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index e994d8ed..f84310e2 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -32,15 +32,15 @@ typedef KGenericFactory<KViewGeneralConfig, TQWidget> KViewGeneralConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "kcm_kviewgeneralconfig" ) ) -KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args ) - : KCModule( KViewGeneralConfigFactory::instance(), parent, args ) +KViewGeneralConfig::KViewGeneralConfig( TQWidget * tqparent, const char * /*name*/, const TQStringList & args ) + : KCModule( KViewGeneralConfigFactory::instance(), tqparent, args ) { - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); m_pResizeGroup = new TQVButtonGroup( i18n( "Resizing" ), this ); - m_pResizeGroup->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + m_pResizeGroup->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); connect( m_pResizeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( resizeChanged( int ) ) ); - layout->addWidget( m_pResizeGroup ); + tqlayout->addWidget( m_pResizeGroup ); ( void )new TQRadioButton( i18n( "Only resize window" ), m_pResizeGroup ); ( void )new TQRadioButton( i18n( "Resize image to fit window" ), m_pResizeGroup ); diff --git a/kview/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h index 1c9c1e7f..bd01dbaf 100644 --- a/kview/config/kviewconfmodules.h +++ b/kview/config/kviewconfmodules.h @@ -26,8 +26,9 @@ class TQVButtonGroup; class KViewGeneralConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KViewGeneralConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewGeneralConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewGeneralConfig(); virtual void load(); diff --git a/kview/config/plugins/kviewpluginsconfig.cpp b/kview/config/plugins/kviewpluginsconfig.cpp index bad5bd55..cf085d3c 100644 --- a/kview/config/plugins/kviewpluginsconfig.cpp +++ b/kview/config/plugins/kviewpluginsconfig.cpp @@ -28,11 +28,11 @@ typedef KGenericFactory<KViewPluginsConfig, TQWidget> KViewPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpluginsconfig, KViewPluginsConfigFactory( "kcm_kviewpluginsconfig" ) ) -KViewPluginsConfig::KViewPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) - : KSettings::PluginPage( KViewPluginsConfigFactory::instance(), parent, args ) +KViewPluginsConfig::KViewPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args ) + : KSettings::PluginPage( KViewPluginsConfigFactory::instance(), tqparent, args ) { m_config = new KSimpleConfig( "kviewrc" ); - pluginSelector()->addPlugins( TQString::fromAscii( "kview" ), i18n( "Application" ), TQString::null, m_config ); + pluginSelector()->addPlugins( TQString::fromAscii( "kview" ), i18n( "Application" ), TQString(), m_config ); pluginSelector()->setShowEmptyConfigPage( false ); } diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h index 4095944d..3353bf6b 100644 --- a/kview/config/plugins/kviewpluginsconfig.h +++ b/kview/config/plugins/kviewpluginsconfig.h @@ -26,8 +26,9 @@ class KConfig; class KViewPluginsConfig : public KSettings::PluginPage { Q_OBJECT + TQ_OBJECT public: - KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewPluginsConfig( TQWidget * tqparent, 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 18aae3be..51736844 100644 --- a/kview/kimageviewer/canvas.h +++ b/kview/kimageviewer/canvas.h @@ -29,7 +29,7 @@ class TQPoint; class TQWidget; #include <tqstring.h> -#include <qobjectdefs.h> +#include <tqobjectdefs.h> #include <kdemacros.h> namespace KImageViewer { @@ -47,7 +47,7 @@ namespace KImageViewer * your program: * * <pre> - TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( "KImageViewer/Canvas", TQString::null, this ); + TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( "KImageViewer/Canvas", TQString(), this ); m_canvas = static_cast<KImageViewer::Canvas *>( widget->qt_cast( "KImageViewer::Canvas" ) ); if( ! ( widget && m_canvas ) ) { @@ -151,7 +151,7 @@ class KDE_EXPORT Canvas /** * @return the description of the blend effect */ - virtual TQString blendEffectDescription( unsigned int ) const { return TQString::null; } + virtual TQString blendEffectDescription( unsigned int ) const { return TQString(); } /** * Sets the blending effect used to create a transition between images diff --git a/kview/kimageviewer/viewer.cpp b/kview/kimageviewer/viewer.cpp index 1a5890d6..445cb6de 100644 --- a/kview/kimageviewer/viewer.cpp +++ b/kview/kimageviewer/viewer.cpp @@ -22,8 +22,8 @@ namespace KImageViewer { - Viewer::Viewer( TQObject * parent, const char * name ) - : KParts::ReadWritePart( parent, name ) + Viewer::Viewer( TQObject * tqparent, const char * name ) + : KParts::ReadWritePart( tqparent, name ) { } diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h index 995be8b9..a656f049 100644 --- a/kview/kimageviewer/viewer.h +++ b/kview/kimageviewer/viewer.h @@ -48,8 +48,9 @@ namespace KImageViewer class KDE_EXPORT Viewer : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: - Viewer( TQObject * parent = 0, const char * name = 0 ); + Viewer( TQObject * tqparent = 0, const char * name = 0 ); virtual ~Viewer(); diff --git a/kview/kview.cpp b/kview/kview.cpp index 44d792df..f30d5c3c 100644 --- a/kview/kview.cpp +++ b/kview/kview.cpp @@ -59,12 +59,12 @@ KView::KView() : KParts::MainWindow( 0, "KView" ) , m_pViewer( 0 ) , m_pCanvas( 0 ) - , m_pWinModule( new KWinModule( this, KWinModule::INFO_DESKTOP ) ) + , m_pWinModule( new KWinModule( TQT_TQOBJECT(this), KWinModule::INFO_DESKTOP ) ) , m_bImageSizeChangedBlocked( false ) , m_bFullscreen( false ) { KParts::ReadWritePart * part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( - "libkviewviewer", this, "KViewViewer Widget", this, "KImageViewer Part" ); + "libkviewviewer", this, "KViewViewer Widget", TQT_TQOBJECT(this), "KImageViewer Part" ); if( part ) { m_pViewer = static_cast<KImageViewer::Viewer *>( part ); @@ -89,7 +89,7 @@ KView::KView() connect( part->widget(), TQT_SIGNAL( contextPress( const TQPoint & ) ), TQT_SLOT( contextPress( const TQPoint & ) ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( clipboardDataChanged() ) ); connect( m_pViewer, TQT_SIGNAL( started( KIO::Job * ) ), @@ -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, TQT_SLOT( readSettings() ) ); + KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this), TQT_SLOT( readSettings() ) ); setPluginLoadingMode( LoadPluginsIfEnabled ); createGUI( part ); @@ -120,13 +120,13 @@ KView::KView() // create status bar (hidden by default) statusBar()->insertItem( "", STATUSBAR_SPEED_ID, 0, true ); statusBar()->setItemFixed( STATUSBAR_SPEED_ID, - 8 + fontMetrics().width( i18n( "%1/s" ).arg( KIO::convertSize( 999000 ) ) ) ); + 8 + fontMetrics().width( i18n( "%1/s" ).tqarg( KIO::convertSize( 999000 ) ) ) ); statusBar()->insertItem( "", STATUSBAR_CURSOR_ID, 0, true ); statusBar()->setItemFixed( STATUSBAR_CURSOR_ID, 8 + fontMetrics().width( "8888, 8888" ) ); statusBar()->insertItem( "", STATUSBAR_SIZE_ID, 0, true ); statusBar()->setItemFixed( STATUSBAR_SIZE_ID, 8 + fontMetrics().width( "8888 x 8888" ) ); - statusBar()->insertItem( TQString::null, STATUSBAR_SELECTION_ID ); + statusBar()->insertItem( TQString(), STATUSBAR_SELECTION_ID ); m_pProgressBar = new KProgress( statusBar() ); m_pProgressBar->setFixedSize( 140, fontMetrics().height() ); @@ -163,13 +163,13 @@ void KView::load( const KURL & url ) if( url.isLocalFile() ) { // XXX: this code is what - //KRecentDirs::add( TQString::fromLatin1( ":load_image" ), url.directory() ); + //KRecentDirs::add( TQString::tqfromLatin1( ":load_image" ), url.directory() ); // would do: TQString directory = url.directory(); - TQString key = TQString::fromLatin1( "load_image" ); + TQString key = TQString::tqfromLatin1( "load_image" ); KConfig * config = KGlobal::config(); - config->setGroup( TQString::fromLatin1( "Recent Dirs" ) ); + config->setGroup( TQString::tqfromLatin1( "Recent Dirs" ) ); TQStringList result = config->readPathListEntry( key ); // make sure the dir is first in history result.remove( directory ); @@ -208,7 +208,7 @@ TQSize KView::sizeForCentralWidgetSize( TQSize size ) if( ! mb->isHidden() ) { size.rheight() += mb->heightForWidth( width() ); - if( style().styleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) ) + if( tqstyle().tqstyleHint( TQStyle::SH_MainWindow_SpaceBelowMenuBar, this ) ) size.rheight() += dockWindowsMovable() ? 1 : 2; } kdDebug( 4600 ) << "added Menubar: " << size << endl; @@ -251,7 +251,7 @@ void KView::readSettings() // KConfig * config ) bool KView::eventFilter( TQObject * obj, TQEvent * ev ) { - if( obj == m_pViewer->widget() && ev->type() == TQEvent::Resize ) + if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) && ev->type() == TQEvent::Resize ) { if( m_nResizeMode == ResizeImage ) handleResize(); @@ -262,7 +262,7 @@ bool KView::eventFilter( TQObject * obj, TQEvent * ev ) void KView::imageSizeChanged( const TQSize & /*size*/ ) { TQSize size = m_pCanvas->imageSize(); - statusBar()->changeItem( TQString( "%1 x %2" ).arg( size.width() ).arg( size.height() ), STATUSBAR_SIZE_ID ); + statusBar()->changeItem( TQString( "%1 x %2" ).tqarg( size.width() ).tqarg( size.height() ), STATUSBAR_SIZE_ID ); handleResize(); } @@ -270,9 +270,9 @@ void KView::selectionChanged( const TQRect & rect ) { kdDebug( 4600 ) << k_funcinfo << rect << endl; if( rect.isNull() ) - statusBar()->changeItem( TQString::null, STATUSBAR_SELECTION_ID ); + statusBar()->changeItem( TQString(), STATUSBAR_SELECTION_ID ); else - statusBar()->changeItem( TQString( "%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" ).tqarg( rect.x() ).tqarg( rect.y() ).tqarg( rect.width() ).tqarg( rect.height() ), STATUSBAR_SELECTION_ID ); action( "crop" )->setEnabled( ! rect.isNull() ); } @@ -301,7 +301,7 @@ void KView::slotClose() void KView::slotCopy() { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setSelectionMode( false ); TQRect selectarea = m_pCanvas->selection(); @@ -320,7 +320,7 @@ void KView::slotCopy() void KView::slotPaste() { // Get TQImage from clipboard and create a new image. - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQImage img = cb->image(); if( ! img.isNull() ) m_pViewer->newImage( img ); @@ -412,9 +412,9 @@ void KView::enableAction( const char * name, bool b ) void KView::clipboardDataChanged() { - QClipboard * cb = TQApplication::clipboard(); + TQClipboard * cb = TQApplication::tqclipboard(); cb->setSelectionMode( false ); - bool hasImage = TQImageDrag::canDecode( cb->data( QClipboard::Clipboard ) ); + bool hasImage = TQImageDrag::canDecode( cb->data( TQClipboard::Clipboard ) ); m_paPaste->setEnabled( hasImage ); } @@ -466,7 +466,7 @@ void KView::speedProgress( KIO::Job *, unsigned long bytesPerSecond ) TQString sizeStr; if( bytesPerSecond > 0 ) - sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) ); + sizeStr = i18n( "%1/s" ).tqarg( KIO::convertSize( bytesPerSecond ) ); else sizeStr = i18n( "Stalled" ); @@ -483,38 +483,38 @@ void KView::slotSetStatusBarText( const TQString & msg ) void KView::cursorPos( const TQPoint & pos ) { - statusBar()->changeItem( TQString( "%1, %2" ).arg( pos.x() ).arg( pos.y() ), STATUSBAR_CURSOR_ID ); + statusBar()->changeItem( TQString( "%1, %2" ).tqarg( pos.x() ).tqarg( pos.y() ), STATUSBAR_CURSOR_ID ); } void KView::setupActions( TQObject * partobject ) { // File - 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() ); + KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenFile() ), actionCollection() ); + m_paRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL & ) ), actionCollection() ); + KAction * aClose = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); aClose->setEnabled( false ); connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aClose, TQT_SLOT( setEnabled( bool ) ) ); TQObject * extension = partobject->child( 0, "KParts::BrowserExtension", false ); if( extension ) { - TQStrList slotNames = extension->metaObject()->slotNames(); - if( slotNames.contains( "print()" ) ) + TQStrList slotNames = extension->tqmetaObject()->slotNames(); + if( slotNames.tqcontains( "print()" ) ) KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" ); - if( slotNames.contains( "del()" ) ) + if( slotNames.tqcontains( "del()" ) ) ( void )new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, extension, TQT_SLOT( del() ), actionCollection(), "del" ); connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) ); } - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); // Edit - KAction * aCopy = KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); + KAction * aCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); aCopy->setEnabled( false ); connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aCopy, TQT_SLOT( setEnabled( bool ) ) ); - m_paPaste = KStdAction::paste( this, TQT_SLOT( slotPaste() ), actionCollection() ); + m_paPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), actionCollection() ); clipboardDataChanged(); //enable or disable paste - KAction * aCrop = new KAction( i18n( "Cr&op" ), Key_C, this, TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); + KAction * aCrop = new KAction( i18n( "Cr&op" ), Key_C, TQT_TQOBJECT(this), TQT_SLOT( slotCrop() ), actionCollection(), "crop" ); aCrop->setEnabled( false ); KAction * aReload = new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut( KStdAccel::Reload ), partobject, @@ -523,17 +523,17 @@ void KView::setupActions( TQObject * partobject ) connect( m_pViewer->widget(), TQT_SIGNAL( hasImage( bool ) ), aReload, TQT_SLOT( setEnabled( bool ) ) ); // Settings - m_paShowMenubar = KStdAction::showMenubar( this, TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + m_paShowMenubar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); createStandardStatusBarAction(); - m_paShowStatusBar = ::qt_cast<KToggleAction*>( action( "options_show_statusbar" ) ); + m_paShowStatusBar = ::tqqt_cast<KToggleAction*>( action( "options_show_statusbar" ) ); if( m_paShowStatusBar ) connect( m_paShowStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( statusbarToggled( bool ) ) ); m_paShowFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); connect( m_paShowFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); - KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), actionCollection() ); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); } void KView::handleResize() @@ -614,7 +614,7 @@ void KView::fitWindowToImage() winsize.setWidth( workarea.width() ); } - TQRect winrect( geometry() ); + TQRect winrect( tqgeometry() ); winrect.setSize( winsize ); int xdiff = winrect.x() + winrect.width() - workarea.x() - workarea.width(); @@ -653,7 +653,7 @@ TQSize KView::barSize( int mainwinwidth, BarSizeFrom from ) width += toolBar()->width(); break; case KToolBar::Flat: - height += kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ); + height += kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ); break; case KToolBar::Floating: break; diff --git a/kview/kview.h b/kview/kview.h index 6726fb8b..ef886427 100644 --- a/kview/kview.h +++ b/kview/kview.h @@ -43,6 +43,7 @@ class KProgress; class KView : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: KView(); virtual ~KView(); diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index 4ecf07b9..a90c1024 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -34,12 +34,12 @@ typedef KGenericFactory<KViewCanvasConfig, TQWidget> KViewCanvasConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewcanvasconfig, KViewCanvasConfigFactory( "kcm_kviewcanvasconfig" ) ) -KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQStringList & args ) - : KCModule( KViewCanvasConfigFactory::instance(), parent, args ) +KViewCanvasConfig::KViewCanvasConfig( TQWidget * tqparent, const char *, const TQStringList & args ) + : KCModule( KViewCanvasConfigFactory::instance(), tqparent, args ) , m_config( new KConfig( "kviewcanvasrc" ) ) { - TQBoxLayout * layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); m_pWidget = new GeneralConfigWidget( this ); m_pWidget->m_pMinWidth ->setRange( 1, 200 ); diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h index e513a9cd..95fa00c6 100644 --- a/kview/kviewcanvas/config/confmodules.h +++ b/kview/kviewcanvas/config/confmodules.h @@ -29,8 +29,9 @@ class KConfig; class KViewCanvasConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewCanvasConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewCanvasConfig(); void load(); diff --git a/kview/kviewcanvas/config/defaults.h b/kview/kviewcanvas/config/defaults.h index 02abbb19..166b3b02 100644 --- a/kview/kviewcanvas/config/defaults.h +++ b/kview/kviewcanvas/config/defaults.h @@ -27,7 +27,7 @@ namespace Defaults { static const bool smoothScaling = false; static const bool keepAspectRatio = true; static const bool centerImage = true; - static const TQColor bgColor( Qt::black ); + static const TQColor bgColor( TQt::black ); static const TQSize minSize( 1, 1 ); static const TQSize maxSize( 10000, 10000 ); static const unsigned int numOfBlendEffects = 4; diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui index b4646381..da279892 100644 --- a/kview/kviewcanvas/config/generalconfigwidget.ui +++ b/kview/kviewcanvas/config/generalconfigwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>GeneralConfigWidget</class> <author>Matthias Kretz <[email protected]></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GeneralConfigWidget</cstring> </property> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -110,7 +110,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> @@ -127,7 +127,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> @@ -136,15 +136,15 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a </spacer> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -179,15 +179,15 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pSmoothScaling</cstring> </property> @@ -195,7 +195,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <string>Use smooth scaling (high quality but slower)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pKeepRatio</cstring> </property> @@ -206,7 +206,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <string>If this is checked KView will always try to keep the aspect ratio. That means if the width is scaled with a factor x, the height is scaled with the same factor.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_pCenterImage</cstring> </property> @@ -216,7 +216,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -239,7 +239,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> @@ -259,7 +259,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>151</width> <height>21</height> @@ -283,8 +283,8 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index 97001670..d3a8608b 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -43,8 +43,8 @@ typedef KGenericFactory<KImageCanvas> KImageCanvasFactory; K_EXPORT_COMPONENT_FACTORY( libkviewcanvas, KImageCanvasFactory( "kviewcanvas" ) ) -KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQStringList & ) - : TQScrollView( parent, name, WResizeNoErase | WStaticContents ) +KImageCanvas::KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & ) + : TQScrollView( tqparent, name, WResizeNoErase | WStaticContents ) , m_client( 0 ) , m_oldClient( 0 ) , m_image( 0 ) @@ -75,7 +75,7 @@ KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQString connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( hideCursor() ) ); KSettings::Dispatcher::self()->registerInstance( - KImageCanvasFactory::instance(), this, + KImageCanvasFactory::instance(), TQT_TQOBJECT(this), TQT_SLOT( loadSettings() ) ); viewport()->setFocusProxy( this ); @@ -321,13 +321,13 @@ TQString 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 TQString::null; + return TQString(); } bool KImageCanvas::eventFilter( TQObject * obj, TQEvent * ev ) { - if( ( obj == m_client || obj == m_oldClient ) && ev->type() == TQEvent::MouseMove ) - mouseMoveEvent( static_cast<TQMouseEvent*>( ev ) ); + if( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_client) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_oldClient) ) && ev->type() == TQEvent::MouseMove ) + mouseMoveEvent( TQT_TQMOUSEEVENT( ev ) ); return TQScrollView::eventFilter( obj, ev ); } @@ -543,7 +543,7 @@ void KImageCanvas::slotUpdateImage() if( m_bSizeChanged || m_bNewImage ) { - TQSize sh = m_client->sizeHint(); + TQSize sh = m_client->tqsizeHint(); if( ! sh.isValid() ) sh = TQSize( 0, 0 ); m_client->resize( sh ); @@ -587,7 +587,7 @@ void KImageCanvas::slotUpdateImage() void KImageCanvas::mouseMoveEvent( TQMouseEvent * ) { - if( m_cursor.shape() == Qt::BlankCursor ) + if( m_cursor.tqshape() == TQt::BlankCursor ) { m_cursor.setShape( Qt::CrossCursor ); viewport()->setCursor( m_cursor ); @@ -607,7 +607,7 @@ void KImageCanvas::resizeEvent( TQResizeEvent * ev ) void KImageCanvas::contentsMousePressEvent( TQMouseEvent * ev ) { - if ( ev->button() == RightButton ) + if ( ev->button() == Qt::RightButton ) emit contextPress( ev->globalPos() ); TQScrollView::contentsMousePressEvent( ev ); } @@ -935,7 +935,7 @@ KImageHolder * KImageCanvas::createNewClient() client->setMouseTracking( true ); client->installEventFilter( this ); setFocusProxy( client ); - client->setFocusPolicy( TQWidget::StrongFocus ); + client->setFocusPolicy( TQ_StrongFocus ); client->setFocus(); addChild( client, 0, 0 ); diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h index 04934c74..c7af475e 100644 --- a/kview/kviewcanvas/kimagecanvas.h +++ b/kview/kviewcanvas/kimagecanvas.h @@ -42,11 +42,12 @@ class KPixmap; class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas { Q_OBJECT + TQ_OBJECT public: /** * KImageCanvas Constructor */ - KImageCanvas( TQWidget * parent, const char * name, const TQStringList & args ); + KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & args ); /** * KImageCanvas Destructor diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index 6ca63698..13ee9e43 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -33,8 +33,8 @@ #include "kimageholder.h" -KImageHolder::KImageHolder( TQWidget * parent, const char * name ) - : TQWidget( parent, name, Qt::WResizeNoErase | Qt::WRepaintNoErase ) +KImageHolder::KImageHolder( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase ) , m_selected( false ) , m_bSelecting( false ) , m_scrollTimerId( 0 ) @@ -64,7 +64,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) { //kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl; // if the right mouse button is pressed emit the contextPress signal - if ( ev->button() == RightButton ) + if ( ev->button() == Qt::RightButton ) { emit contextPress( mapToGlobal( ev->pos() ) ); return; @@ -73,7 +73,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) if( m_pPixmap == 0 ) return; - if( ev->button() == LeftButton || ev->button() == MidButton ) + if( ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton ) { m_scrollpos = ev->globalPos(); m_selectionStartPoint = ev->pos(); @@ -83,20 +83,20 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev ) void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) { //FIXME: when scrolling the cursorpos shouldn't change - if( this->rect().contains( ev->pos(), false ) ) + if( TQT_TQRECT_OBJECT(this->rect()).tqcontains( ev->pos(), false ) ) emit cursorPos( ev->pos() ); //kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl; - if( ev->state() & LeftButton || ev->state() & MidButton ) + if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton ) { // scroll when a modifier and left button or the middle button is pressed - if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & MidButton ) + if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & Qt::MidButton ) { TQPoint difference = m_scrollpos - ev->globalPos(); emit wannaScroll( difference.x(), difference.y() ); } else // create a selection { - TQWidget * parentwidget = ( TQWidget* )parent(); + TQWidget * tqparentwidget = ( TQWidget* )tqparent(); if( ! m_bSelecting ) { m_bSelecting = true; @@ -127,17 +127,17 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) // -2 => scroll to the left 2 px per 50ms // 2 => scroll to the right 2 px per 50ms // ... - m_xOffset = mapTo( parentwidget, ev->pos() ).x(); - m_yOffset = mapTo( parentwidget, ev->pos() ).y(); + m_xOffset = mapTo( tqparentwidget, ev->pos() ).x(); + m_yOffset = mapTo( tqparentwidget, ev->pos() ).y(); if( m_xOffset > 0 ) { - m_xOffset -= parentwidget->width(); + m_xOffset -= tqparentwidget->width(); if( m_xOffset < 0 ) m_xOffset = 0; } if( m_yOffset > 0 ) { - m_yOffset -= parentwidget->height(); + m_yOffset -= tqparentwidget->height(); if( m_yOffset < 0 ) m_yOffset = 0; } @@ -181,7 +181,7 @@ void KImageHolder::mouseReleaseEvent( TQMouseEvent * ev ) m_scrollTimerId = 0; } } - if( ev->state() & LeftButton || ev->state() & MidButton ) + if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton ) if( m_bSelecting ) m_bSelecting = false; else @@ -207,7 +207,7 @@ void KImageHolder::eraseSelect() inner.rBottom() -= 1; r -= inner; - TQMemArray<TQRect> rects = r.rects(); + TQMemArray<TQRect> rects = r.tqrects(); if( m_pDoubleBuffer ) for( unsigned int i = 0; i < rects.size(); ++i ) @@ -269,7 +269,7 @@ TQRect KImageHolder::selection() const return TQRect(); } -TQSize KImageHolder::sizeHint() const +TQSize KImageHolder::tqsizeHint() const { if( m_pPixmap ) return m_pPixmap->size(); @@ -282,7 +282,7 @@ void KImageHolder::paintEvent( TQPaintEvent *ev ) painter.setClipRegion( ev->region().intersect( m_drawRect ) ); if( m_pPixmap ) { - if( m_pPixmap->mask() ) + if( m_pPixmap->tqmask() ) { if( ! m_pDoubleBuffer ) { diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index 73148cbf..d8d220c0 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -32,11 +32,12 @@ class TQPoint; * @short Image widget * @version $Id$ */ -class KImageHolder : public QWidget +class KImageHolder : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KImageHolder( TQWidget *parent = 0, const char * name = 0 ); + KImageHolder( TQWidget *tqparent = 0, const char * name = 0 ); virtual ~KImageHolder(); @@ -56,7 +57,7 @@ class KImageHolder : public QWidget */ TQRect selection() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setDrawRect( const TQRect & rect ) { m_drawRect = rect; } const TQRect & drawRect() const { return m_drawRect; } diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp index e913ab59..3d24cbce 100644 --- a/kview/kviewcanvas/test/test.cpp +++ b/kview/kviewcanvas/test/test.cpp @@ -17,7 +17,7 @@ KImageViewerTest::KImageViewerTest() : KParts::MainWindow( 0L, "KImageViewerTest" ) { TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( - "KImageViewer/Canvas", TQString::null, this ); + "KImageViewer/Canvas", TQString(), this ); if( widget ) { m_part = dynamic_cast<KImageViewer::Canvas *>( widget ); diff --git a/kview/kviewcanvas/test/test.h b/kview/kviewcanvas/test/test.h index b6a85188..f04866ef 100644 --- a/kview/kviewcanvas/test/test.h +++ b/kview/kviewcanvas/test/test.h @@ -13,6 +13,7 @@ namespace KImageViewer { class Canvas; }; class KImageViewerTest : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: KImageViewerTest(); virtual ~KImageViewerTest(); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp index ea876950..a1576b49 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp @@ -30,11 +30,11 @@ typedef KGenericFactory<KViewViewerPluginsConfig, TQWidget> KViewViewerPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewviewerpluginsconfig, KViewViewerPluginsConfigFactory( "kcm_kviewviewerpluginsconfig" ) ) -KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) - : KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), parent, args ) +KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args ) + : KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), tqparent, args ) { m_config = new KSimpleConfig( "kviewviewerrc" ); - pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString::null, m_config ); + pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString(), m_config ); pluginSelector()->setShowEmptyConfigPage( false ); } diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h index 1dbe39c3..94860fc9 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h @@ -26,8 +26,9 @@ class KConfig; class KViewViewerPluginsConfig : public KSettings::PluginPage { Q_OBJECT + TQ_OBJECT public: - KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewViewerPluginsConfig( TQWidget * tqparent, 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 0ee58b78..10781565 100644 --- a/kview/kviewviewer/imagesettings.cpp +++ b/kview/kviewviewer/imagesettings.cpp @@ -24,20 +24,20 @@ #include <klocale.h> #include <kdialog.h> -ImageSettings::ImageSettings( TQWidget * parent, const char * name ) - : KPrintDialogPage( parent, name ) +ImageSettings::ImageSettings( TQWidget * tqparent, const char * name ) + : KPrintDialogPage( tqparent, name ) , m_pFitImage( 0 ) { setTitle( i18n( "Image Settings" ) ); - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout * tqlayout = 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 ); + tqlayout->addWidget( m_pFitImage ); m_pCenter = new TQCheckBox( i18n( "Center image on page" ), this ); m_pCenter->setChecked( true ); - layout->addWidget( m_pCenter ); - layout->insertStretch( -1, 0 ); + tqlayout->addWidget( m_pCenter ); + tqlayout->insertStretch( -1, 0 ); } ImageSettings::~ImageSettings() diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h index f627cbac..07bb9af8 100644 --- a/kview/kviewviewer/imagesettings.h +++ b/kview/kviewviewer/imagesettings.h @@ -26,8 +26,9 @@ class TQCheckBox; class ImageSettings : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: - ImageSettings( TQWidget * parent = 0, const char * name = 0 ); + ImageSettings( TQWidget * tqparent = 0, const char * name = 0 ); ~ImageSettings(); void setOptions( const TQMap<TQString, TQString> & opts ); diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index b3f16a93..b47ea17d 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -33,9 +33,9 @@ #include <klocale.h> KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas, - KViewViewer *parent, const char *name ) - : KParts::BrowserExtension( parent, name ), - m_pViewer( parent ), + KViewViewer *tqparent, const char *name ) + : KParts::BrowserExtension( tqparent, name ), + m_pViewer( tqparent ), m_pCanvas( canvas ) { KGlobal::locale()->insertCatalogue("kview"); @@ -68,7 +68,7 @@ void KViewKonqExtension::print() 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 )) ) ) + if ( !printer.setup( ((KViewViewer *)tqparent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) ) return; TQPainter painter; @@ -80,7 +80,7 @@ void KViewKonqExtension::print() TQImage imagetoprint; if( printer.option( "app-kviewviewer-fitimage" ) == "1" ) - imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin ); + imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQ_ScaleMin ); else imagetoprint = *m_pCanvas->image(); diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h index b7692f31..fa986c81 100644 --- a/kview/kviewviewer/kviewkonqextension.h +++ b/kview/kviewviewer/kviewkonqextension.h @@ -29,8 +29,9 @@ class KViewKonqExtension: public KParts::BrowserExtension { friend class KViewViewer; // it can emit our signals Q_OBJECT + TQ_OBJECT public: - KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, const char *name = 0 ); + KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *tqparent, const char *name = 0 ); virtual ~KViewKonqExtension() {} virtual void setXYOffset( int x, int y ); diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index 06dd1716..e566b74b 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -55,10 +55,10 @@ typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory; K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory ) -KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *parent, const char *name, const TQStringList & ) - : KImageViewer::Viewer( parent, name ) - , m_pParentWidget( parentWidget ) +KViewViewer::KViewViewer( TQWidget *tqparentWidget, const char * /*widgetName*/, + TQObject *tqparent, const char *name, const TQStringList & ) + : KImageViewer::Viewer( tqparent, name ) + , m_pParentWidget( tqparentWidget ) , m_pJob( 0 ) , m_pExtension( 0 ) , m_pCanvas( 0 ) @@ -69,7 +69,7 @@ KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, KImageIO::registerFormats(); TQWidget * widget = KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( - "KImageViewer/Canvas", TQString::null, m_pParentWidget ); + "KImageViewer/Canvas", TQString(), TQT_TQOBJECT(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 ) ) @@ -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 ?" ), - TQString::null, KStdGuiItem::saveAs(), KStdGuiItem::discard() ): + TQString(), KStdGuiItem::saveAs(), KStdGuiItem::discard() ): KMessageBox::warningYesNo( widget(), i18n( "The document has been modified.\nDo you want to save it ?" ), - TQString::null, KStdGuiItem::saveAs(), KStdGuiItem::dontSave() ); + TQString(), KStdGuiItem::saveAs(), KStdGuiItem::dontSave() ); if( res == KMessageBox::Yes ) { @@ -259,11 +259,11 @@ bool KViewViewer::openURL( const KURL & url ) // Use same extension as remote file. This is important for mimetype-determination (e.g. koffice) TQString extension; TQString fileName = url.fileName(); - int extensionPos = fileName.findRev( '.' ); + int extensionPos = fileName.tqfindRev( '.' ); if ( extensionPos != -1 ) extension = fileName.mid( extensionPos ); // keep the '.' delete m_pTempFile; - m_pTempFile = new KTempFile( TQString::null, extension ); + m_pTempFile = new KTempFile( TQString(), extension ); m_file = m_pTempFile->name(); m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, isProgressInfoEnabled() ); @@ -294,7 +294,7 @@ void KViewViewer::newImage( const TQImage & newimg ) if( closeURL() ) { m_url = ""; - m_file = TQString::null; + m_file = TQString(); m_sCaption = i18n( "Title caption when new image selected", "new image" ); m_pCanvas->setImage( newimg ); if( isReadWrite() ) @@ -397,7 +397,7 @@ bool KViewViewer::openFile() } else { - emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_url.prettyURL() ) ); + emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_url.prettyURL() ) ); return false; } } @@ -406,12 +406,12 @@ bool KViewViewer::openFile() kdDebug( 4610 ) << k_funcinfo << " load from file: " << m_file << endl; if( ! TQFile::exists( m_file ) ) { - emit setStatusBarText( i18n( "No such file: %1" ).arg( m_file ) ); + emit setStatusBarText( i18n( "No such file: %1" ).tqarg( m_file ) ); return false; } if( TQImage::imageFormat( m_file ) == 0 ) { - emit setStatusBarText( i18n( "Unknown image format: %1" ).arg( m_file ) ); + emit setStatusBarText( i18n( "Unknown image format: %1" ).tqarg( m_file ) ); return false; } // determine Mime Type @@ -450,7 +450,7 @@ bool KViewViewer::saveFile() if( ! m_newMimeType.isNull() ) { m_mimeType = m_newMimeType; - m_newMimeType = TQString::null; + m_newMimeType = TQString(); } TQString type = KImageIO::typeForMime( m_mimeType ); kdDebug( 4610 ) << "save m_pCanvas->image() to " << m_file << " as " << type << endl; @@ -567,7 +567,7 @@ void KViewViewer::writeSettings() void KViewViewer::zoomChanged( double zoom ) { kdDebug( 4610 ) << k_funcinfo << endl; - emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).arg( zoom * 100, 0, 'f', 0 ) ); + emit setWindowCaption( m_sCaption + TQString( " (%1%)" ).tqarg( zoom * 100, 0, 'f', 0 ) ); updateZoomMenu( zoom ); } @@ -610,7 +610,7 @@ void KViewViewer::slotSave() void KViewViewer::slotSaveAs() { kdDebug( 4610 ) << k_funcinfo << endl; - KFileDialog dlg( TQString::null, TQString::null, widget(), "filedialog", true ); + KFileDialog dlg( TQString(), TQString(), widget(), "filedialog", true ); dlg.setMimeFilter( KImageIO::mimeTypes( KImageIO::Writing ) ); dlg.setSelection( m_url.fileName() ); dlg.setCaption( i18n( "Save As" ) ); @@ -645,7 +645,7 @@ void KViewViewer::setZoom( const TQString & newZoom ) kdDebug( 4610 ) << k_funcinfo << newZoom << endl; double zoom; TQString z = newZoom; - z.remove( z.find( '%' ), 1 ); + z.remove( z.tqfind( '%' ), 1 ); if( newZoom == "33%" ) zoom = 1.0 / 3.0; else @@ -667,14 +667,14 @@ void KViewViewer::updateZoomMenu( double zoom ) TQStringList itemsList = m_paZoom->items(); for( TQStringList::Iterator it = itemsList.begin(); it != itemsList.end(); ++it ) { - z = ( *it ).replace( TQRegExp( "%" ), "" ); + z = ( *it ).tqreplace( TQRegExp( "%" ), "" ); z = z.simplifyWhiteSpace(); val = z.toInt( &ok ); - if( ok && val > 0 && list.contains( val ) == 0 ) + if( ok && val > 0 && list.tqcontains( val ) == 0 ) list << val; } val = TQString::number( zoom * 100, 'f', 0 ).toInt(); // round/lround from math.h doesn't work - dunno - if( list.contains( val ) == 0 ) + if( list.tqcontains( val ) == 0 ) list.append( val ); qHeapSort( list ); @@ -685,9 +685,9 @@ void KViewViewer::updateZoomMenu( double zoom ) } // first look if it's a new value (not in the list yet) - TQString z = TQString( "%1%" ).arg( zoom * 100, 0, 'f', 0 ); + TQString z = TQString( "%1%" ).tqarg( zoom * 100, 0, 'f', 0 ); TQStringList items = m_paZoom->items(); - int idx = items.findIndex( z ); + int idx = items.tqfindIndex( z ); if( -1 == idx ) { // not found XXX: remove when done @@ -773,7 +773,7 @@ void KViewViewer::slotResultSaveAs( KIO::Job *job ) else { emit completed(); - KIO::CopyJob * cjob = ::qt_cast<KIO::CopyJob*>( job ); + KIO::CopyJob * cjob = ::tqqt_cast<KIO::CopyJob*>( job ); if( cjob ) { m_url = cjob->destURL(); @@ -803,21 +803,21 @@ void KViewViewer::slotFileDirty( const TQString & ) if( isModified() && isReadWrite() ) { KPassivePopup * pop = new KPassivePopup( m_pParentWidget ); - TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).arg( kapp->aboutData()->programName() ), - TQString::null, kapp->miniIcon() ); + TQVBox * vb = pop->standardView( i18n( "Load changed image? - %1" ).tqarg( kapp->aboutData()->programName() ), + TQString(), 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 ); + "changes that have already been saved." ).tqarg( url().fileName() ), vb ); TQWidget * hb = new TQWidget( vb ); - TQHBoxLayout * layout = new TQHBoxLayout( hb ); - layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + TQHBoxLayout * tqlayout = new TQHBoxLayout( hb ); + tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); KPushButton * yes = new KPushButton( i18n("Reload"), hb ); - layout->addWidget( yes ); - layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + tqlayout->addWidget( yes ); + tqlayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); KPushButton * no = new KPushButton( i18n("Do Not Reload"), hb ); - layout->addWidget( no ); - layout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + tqlayout->addWidget( no ); + tqlayout->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() ) ); diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index 0dc5d6a3..1d79696e 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -45,11 +45,12 @@ class TQCache; class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIface { Q_OBJECT + TQ_OBJECT friend class KViewKonqExtension; public: - KViewViewer( TQWidget * parentWidget, const char * widgetName, - TQObject * parent, const char * name, const TQStringList & ); + KViewViewer( TQWidget * tqparentWidget, const char * widgetName, + TQObject * tqparent, const char * name, const TQStringList & ); virtual ~KViewViewer(); KImageViewer::Canvas * canvas() const { return m_pCanvas; } diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui index 4944ef3c..3c5418af 100644 --- a/kview/kviewviewer/printimagesettings.ui +++ b/kview/kviewviewer/printimagesettings.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PrintImageSettings</class> <author>Matthias Kretz <[email protected]></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PrintImageSettings</cstring> </property> @@ -23,9 +23,9 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -37,9 +37,9 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -48,7 +48,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -59,7 +59,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -67,7 +67,7 @@ <string>Fit to page size</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -75,7 +75,7 @@ <string>9x13</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton3</cstring> </property> @@ -83,7 +83,7 @@ <string>10x15</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton4</cstring> </property> @@ -91,9 +91,9 @@ <string>Manual</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ <cstring>kIntSpinBox1</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -129,7 +129,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox1</cstring> </property> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>0</height> @@ -180,10 +180,10 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>qwidget.h</includehint> + <includehint>tqwidget.h</includehint> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> </includehints> diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h index 82777090..c97a8951 100644 --- a/kview/kviewviewer/test/test.h +++ b/kview/kviewviewer/test/test.h @@ -13,6 +13,7 @@ namespace KParts { class ReadWritePart; } class Test : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: Test(); virtual ~Test(); diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index 936061eb..ef4d091a 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -36,13 +36,13 @@ typedef KGenericFactory<KViewBrowser> KViewBrowserFactory; K_EXPORT_COMPONENT_FACTORY( kview_browserplugin, KViewBrowserFactory( "kviewbrowserplugin" ) ) -KViewBrowser::KViewBrowser( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ) +KViewBrowser::KViewBrowser( TQObject* tqparent, const char* name, const TQStringList & ) + : Plugin( tqparent, name ) , m_pDirLister( 0 ) , m_pFileItemList( 0 ) , m_bShowCurrent( false ) { - m_pViewer = static_cast<KImageViewer::Viewer *>( parent ); + m_pViewer = static_cast<KImageViewer::Viewer *>( tqparent ); if( m_pViewer ) { m_paBack = KStdAction::back ( this, TQT_SLOT( slotBack() ), actionCollection(), "previous_image" ); @@ -163,7 +163,7 @@ void KViewBrowser::setupDirLister() { TQApplication::setOverrideCursor( WaitCursor ); TQString url = m_pViewer->url().prettyURL(); - int pos = url.findRev( "/" ); + int pos = url.tqfindRev( "/" ); url = url.left( (unsigned int)pos ); kdDebug( 4630 ) << "open KDirLister for " << url << endl; m_pDirLister->openURL( KURL( url )); diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h index 96e8b17f..ecae29f3 100644 --- a/kview/modules/browser/kviewbrowser.h +++ b/kview/modules/browser/kviewbrowser.h @@ -33,8 +33,9 @@ class KMyFileItemList; class KViewBrowser : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KViewBrowser( TQObject* parent, const char* name, const TQStringList & ); + KViewBrowser( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~KViewBrowser(); private slots: diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp index a2e57327..c1ac49c2 100644 --- a/kview/modules/effects/kvieweffects.cpp +++ b/kview/modules/effects/kvieweffects.cpp @@ -24,15 +24,15 @@ typedef KGenericFactory<KViewEffects> KViewEffectsFactory; K_EXPORT_COMPONENT_FACTORY( kview_effectsplugin, KViewEffectsFactory( "kvieweffectsplugin" ) ) -KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ) +KViewEffects::KViewEffects( TQObject* tqparent, const char* name, const TQStringList & ) + : Plugin( tqparent, name ) , m_gamma( 0.5 ), m_lastgamma( -1.0 ) , m_opacity( 50 ), m_lastopacity( -1 ) , m_intensity( 50 ), m_lastintensity( -1 ) , m_color( white ) , m_image( 0 ) { - TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h index 821b99c8..43c1b16d 100644 --- a/kview/modules/effects/kvieweffects.h +++ b/kview/modules/effects/kvieweffects.h @@ -13,8 +13,9 @@ namespace KImageViewer { class Viewer; } class KViewEffects : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KViewEffects( TQObject* parent, const char* name, const TQStringList & ); + KViewEffects( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~KViewEffects(); private slots: diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index e44889ed..edcf157d 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -31,11 +31,11 @@ typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactory( "kcm_kviewpresenterconfig" ) ) -KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args ) - : KCModule( KViewPresenterConfigFactory::instance(), parent, args ) +KViewPresenterConfig::KViewPresenterConfig( TQWidget * tqparent, const char *, const TQStringList & args ) + : KCModule( KViewPresenterConfigFactory::instance(), tqparent, args ) { - TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - layout->setAutoAdd( true ); + TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + tqlayout->setAutoAdd( true ); m_pCheckBox = new TQCheckBox( "This is only for testing...", this ); connect( m_pCheckBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkChanged() ) ); diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h index ae257cea..d07c1506 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.h +++ b/kview/modules/presenter/config/kviewpresenterconfig.h @@ -26,8 +26,9 @@ class TQCheckBox; class KViewPresenterConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KViewPresenterConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewPresenterConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewPresenterConfig(); virtual void load(); diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui index 66d9e9b5..2bc7206a 100644 --- a/kview/modules/presenter/imagelistdialog.ui +++ b/kview/modules/presenter/imagelistdialog.ui @@ -60,7 +60,7 @@ <property name="name"> <cstring>m_pListView</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>0</height> @@ -79,7 +79,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -87,7 +87,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -206,7 +206,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -259,7 +259,7 @@ <include location="global" impldecl="in implementation">kio/netaccess.h</include> <include location="global" impldecl="in implementation">kurl.h</include> <include location="global" impldecl="in implementation">kfiledialog.h</include> - <include location="global" impldecl="in implementation">qstring.h</include> + <include location="global" impldecl="in implementation">tqstring.h</include> <include location="global" impldecl="in implementation">kmessagebox.h</include> <include location="local" impldecl="in implementation">imagelistitem.h</include> <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include> @@ -267,12 +267,12 @@ <forwards> <forward>class KURL</forward> </forwards> -<slots> +<Q_SLOTS> <slot access="private" specifier="non virtual">init()</slot> <slot specifier="non virtual">noSort()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kdialog.h</includehint> <includehint>klistview.h</includehint> diff --git a/kview/modules/presenter/imagelistdialog.ui.h b/kview/modules/presenter/imagelistdialog.ui.h index ce97754e..5c391549 100644 --- a/kview/modules/presenter/imagelistdialog.ui.h +++ b/kview/modules/presenter/imagelistdialog.ui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp index 547de656..b31c65b2 100644 --- a/kview/modules/presenter/imagelistitem.cpp +++ b/kview/modules/presenter/imagelistitem.cpp @@ -24,10 +24,10 @@ #include <klistview.h> -ImageListItem::ImageListItem( KListView * parent, const KURL & url ) - : KListViewItem( parent, parent->lastItem(), url.prettyURL() ) +ImageListItem::ImageListItem( KListView * tqparent, const KURL & url ) + : KListViewItem( tqparent, tqparent->lastItem(), url.prettyURL() ) , m_pImage( 0 ) - , m_filename( TQString::null ) + , m_filename( TQString() ) , m_url( url ) { setDragEnabled( true ); @@ -41,11 +41,11 @@ ImageListItem::ImageListItem( KListView * parent, const KURL & url ) /* TQString extension; TQString fileName = m_url.fileName(); - int extensionPos = fileName.findRev( '.' ); + int extensionPos = fileName.tqfindRev( '.' ); if ( extensionPos != -1 ) extension = fileName.mid( extensionPos ); // keep the '.' delete m_pTempFile; - m_pTempFile = new KTempFile( TQString::null, extension ); + m_pTempFile = new KTempFile( TQString(), extension ); m_filename = m_pTempFile->name(); m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, false ); @@ -70,7 +70,7 @@ const TQImage * ImageListItem::image() const const TQString & ImageListItem::file() const { if( m_url.isLocalFile() ) - return TQString::null; + return TQString(); return m_filename; } diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h index ee143a90..e54f84a4 100644 --- a/kview/modules/presenter/imagelistitem.h +++ b/kview/modules/presenter/imagelistitem.h @@ -30,7 +30,7 @@ class TQImage; class ImageListItem : public KListViewItem { public: - ImageListItem( KListView * parent, const KURL & url ); + ImageListItem( KListView * tqparent, const KURL & url ); ~ImageListItem(); const TQImage * image() const; diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index 3cf54d15..d85748c1 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory<KViewPresenter> KViewPresenterFactory; K_EXPORT_COMPONENT_FACTORY( kview_presenterplugin, KViewPresenterFactory( "kviewpresenterplugin" ) ) -KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ) +KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQStringList & ) + : Plugin( tqparent, name ) , m_pImageList( new ImageListDialog() ) , m_paFileOpen( 0 ) , m_bDontAdd( false ) @@ -62,7 +62,7 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri kdDebug( 4630 ) << k_funcinfo << endl; m_imagelist.setAutoDelete( true ); - TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) @@ -82,17 +82,17 @@ KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStri 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" ) ); - if( parentClient ) + KXMLGUIClient * tqparentClient = static_cast<KXMLGUIClient*>( tqparent->qt_cast( "KXMLGUIClient" ) ); + if( tqparentClient ) { - m_paFileOpen = parentClient->actionCollection()->action( "file_open" ); - m_paFileClose = parentClient->actionCollection()->action( "file_close" ); + m_paFileOpen = tqparentClient->actionCollection()->action( "file_open" ); + m_paFileClose = tqparentClient->actionCollection()->action( "file_close" ); } if( m_paFileClose ) connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) ); if( m_paFileOpen ) { - disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), parent, TQT_SLOT( slotOpenFile() ) ); + disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), tqparent, TQT_SLOT( slotOpenFile() ) ); connect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); } else @@ -150,18 +150,18 @@ KViewPresenter::~KViewPresenter() if( m_paFileOpen ) { disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); - // If the parent() doesn't exist we either leave the "File Open" action + // If the tqparent() doesn't exist we either leave the "File Open" action // in an unusable state or KView was just shutting down and therefor we // can ignore this. I've only seen the second one happening and to get - // rid of the TQObject::connect warning we do the parent() check. - if( parent() ) - connect( m_paFileOpen, TQT_SIGNAL( activated() ), parent(), TQT_SLOT( slotOpenFile() ) ); + // rid of the TQObject::connect warning we do the tqparent() check. + if( tqparent() ) + connect( m_paFileOpen, TQT_SIGNAL( activated() ), tqparent(), TQT_SLOT( slotOpenFile() ) ); } } 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() ) + if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView->viewport()) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) ) { switch( ev->type() ) { @@ -191,7 +191,7 @@ bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev ) for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it ) { ImageInfo * info = new ImageInfo( KURL( *it ) ); - if( ! m_imagelist.contains( info ) ) + if( ! m_imagelist.tqcontains( info ) ) { m_imagelist.inSort( info ); ( void )new ImageListItem( m_pImageList->m_pListView, KURL( *it ) ); @@ -218,7 +218,7 @@ void KViewPresenter::slotImageOpened( const KURL & url ) { kdDebug( 4630 ) << k_funcinfo << "imagelist:" << endl; ImageInfo * info = new ImageInfo( url ); - if( ! m_imagelist.contains( info ) ) + if( ! m_imagelist.tqcontains( info ) ) { m_imagelist.inSort( info ); TQListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url ); @@ -248,7 +248,7 @@ void KViewPresenter::slotOpenFiles() for( ++it; it != urls.end(); ++it ) { ImageInfo * info = new ImageInfo( *it ); - if( ! m_imagelist.contains( info ) ) + if( ! m_imagelist.tqcontains( info ) ) { m_imagelist.inSort( info ); ( void )new ImageListItem( m_pImageList->m_pListView, *it ); @@ -405,14 +405,14 @@ void KViewPresenter::closeAll() void KViewPresenter::loadList() { - KURL url = KFileDialog::getOpenURL( ":load_list", TQString::null, m_pImageList ); + KURL url = KFileDialog::getOpenURL( ":load_list", TQString(), m_pImageList ); if( url.isEmpty() ) return; TQString tempfile; if( ! KIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) ) { - KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).arg( url.prettyURL() ) ); + KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).tqarg( url.prettyURL() ) ); return; } TQFile file( tempfile ); @@ -431,7 +431,7 @@ void KViewPresenter::loadList() { KURL url ( t.readLine() ); ImageInfo * info = new ImageInfo( url ); - if( ! m_imagelist.contains( info ) ) + if( ! m_imagelist.tqcontains( info ) ) { m_imagelist.inSort( info ); ( void )new ImageListItem( m_pImageList->m_pListView, url ); @@ -442,7 +442,7 @@ void KViewPresenter::loadList() } else { - KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).arg( url.prettyURL() ) ); + KMessageBox::error( m_pImageList, i18n( "Wrong format\n%1" ).tqarg( url.prettyURL() ) ); } file.close(); } @@ -451,7 +451,7 @@ void KViewPresenter::loadList() void KViewPresenter::saveList() { - KURL url = KFileDialog::getSaveURL( ":save_list", TQString::null, m_pImageList ); + KURL url = KFileDialog::getSaveURL( ":save_list", TQString(), m_pImageList ); if( url.isEmpty() ) return; diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h index e607f92b..ba3198b2 100644 --- a/kview/modules/presenter/kviewpresenter.h +++ b/kview/modules/presenter/kviewpresenter.h @@ -38,8 +38,9 @@ class KAction; class KViewPresenter : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KViewPresenter( TQObject* parent, const char* name, const TQStringList & ); + KViewPresenter( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~KViewPresenter(); protected: diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp index 1c79ee15..ef051c28 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.cpp +++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp @@ -29,8 +29,8 @@ #include <kglobal.h> #include <kconfig.h> -KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent ) - : KPreferencesModule( "kviewpresenter", parent, "KView Presenter Config Module" ) +KViewPresenterConfModule::KViewPresenterConfModule( TQObject * tqparent ) + : KPreferencesModule( "kviewpresenter", tqparent, "KView Presenter Config Module" ) { } @@ -49,8 +49,8 @@ void KViewPresenterConfModule::reset() void KViewPresenterConfModule::createPage( TQFrame * page ) { - TQBoxLayout * layout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() ); - layout->setAutoAdd( true ); + TQBoxLayout * tqlayout = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() ); + tqlayout->setAutoAdd( true ); m_pCheckBox = new TQCheckBox( "This is only for testing...", page ); } diff --git a/kview/modules/presenter/kviewpresenterconfmodule.h b/kview/modules/presenter/kviewpresenterconfmodule.h index 6e3dcb46..8ecaa345 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.h +++ b/kview/modules/presenter/kviewpresenterconfmodule.h @@ -28,8 +28,9 @@ class TQCheckBox; class KViewPresenterConfModule : public KPreferencesModule { Q_OBJECT + TQ_OBJECT public: - KViewPresenterConfModule( TQObject * parent ); + KViewPresenterConfModule( TQObject * tqparent ); ~KViewPresenterConfModule(); signals: diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index 936713f6..428dc2ee 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -20,7 +20,7 @@ #include "kfloatspinbox.h" -#if defined(QT_ACCESSIBILITY_SUPPORT) +#if defined(TQT_ACCESSIBILITY_SUPPORT) #include <tqaccessible.h> #endif @@ -37,8 +37,8 @@ int pow( int a, int b ) return ret; } -KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent, const char * name ) - : TQSpinBox( parent, name ) +KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * tqparent, const char * name ) + : TQSpinBox( tqparent, name ) , m_doselection( true ) { setRange( minValue, maxValue, step, precision ); @@ -102,7 +102,7 @@ void KFloatSpinBox::valueChange() { updateDisplay(); emit valueChanged( value() ); -#if defined(QT_ACCESSIBILITY_SUPPORT) +#if defined(TQT_ACCESSIBILITY_SUPPORT) TQAccessible::updateAccessibility( this, 0, TQAccessible::ValueChanged ); #endif } diff --git a/kview/modules/scale/kfloatspinbox.h b/kview/modules/scale/kfloatspinbox.h index 6424df38..572fc952 100644 --- a/kview/modules/scale/kfloatspinbox.h +++ b/kview/modules/scale/kfloatspinbox.h @@ -23,11 +23,12 @@ #include <tqspinbox.h> -class KFloatSpinBox : public QSpinBox +class KFloatSpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: - KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent = 0, const char * name = 0 ); + KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * tqparent = 0, const char * name = 0 ); virtual ~KFloatSpinBox(); void setRange( float minValue, float maxValue, float step, unsigned int precision ); diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index 29e71b13..39cf9e37 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -35,12 +35,12 @@ typedef KGenericFactory<KViewScale> KViewScaleFactory; K_EXPORT_COMPONENT_FACTORY( kview_scale, KViewScaleFactory( "kview_scale" ) ) -KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ) +KViewScale::KViewScale( TQObject* tqparent, const char* name, const TQStringList & ) + : Plugin( tqparent, name ) , m_pViewer( 0 ) , m_pCanvas( 0 ) { - m_pViewer = static_cast<KImageViewer::Viewer *>( parent ); + m_pViewer = static_cast<KImageViewer::Viewer *>( tqparent ); if( m_pViewer ) { kdDebug( 4630 ) << "m_pViewer->canvas() = " << m_pViewer->canvas() << endl; @@ -64,9 +64,9 @@ 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 - TQVBox * layout = dlg.makeVBoxMainWidget(); + TQVBox * tqlayout = dlg.makeVBoxMainWidget(); - TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), layout ); + TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqlayout ); TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, 0, KDialog::spacingHint() ); pixelgroupgrid->setSpacing( KDialog::spacingHint() ); pixelgroupgrid->setMargin( KDialog::marginHint() ); @@ -75,21 +75,21 @@ void KViewScale::slotScaleDlg() // show original width label = new TQLabel( i18n( "Original width:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 0, 0 ); pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.width() ), pixelgroup ), 0, 1 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 1, 0 ); pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.height() ), pixelgroup ), 1, 1 ); pixelgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "New width:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 3, 0 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 4, 0 ); TQSpinBox * newwidth = new TQSpinBox( 1, 100000, 1, pixelgroup ); pixelgroupgrid->addWidget( newwidth, 3, 1 ); @@ -98,15 +98,15 @@ void KViewScale::slotScaleDlg() KComboBox * newsizeunit = new KComboBox( pixelgroup ); newsizeunit->insertItem( i18n( "px" ) ); newsizeunit->insertItem( i18n( "%" ) ); - pixelgroupgrid->addMultiCellWidget( newsizeunit, 3, 4, 2, 2, Qt::AlignVCenter ); + pixelgroupgrid->addMultiCellWidget( newsizeunit, 3, 4, 2, 2, TQt::AlignVCenter ); pixelgroupgrid->addRowSpacing( 5, KDialog::spacingHint() ); label = new TQLabel( i18n( "Ratio X:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 6, 0 ); label = new TQLabel( i18n( "Y:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 7, 0 ); TQSpinBox * ratiox = new TQSpinBox( pixelgroup ); ratiox->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratiox ) ); @@ -114,18 +114,18 @@ void KViewScale::slotScaleDlg() TQSpinBox * ratioy = new TQSpinBox( pixelgroup ); ratioy->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratioy ) ); pixelgroupgrid->addWidget( ratioy, 7, 1 ); - pixelgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, Qt::AlignVCenter ); + pixelgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, TQt::AlignVCenter ); - TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), layout ); + TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqlayout ); TQGridLayout * printgroupgrid = new TQGridLayout( printgroup, 1, 1, 0, KDialog::spacingHint() ); printgroupgrid->setSpacing( KDialog::spacingHint() ); printgroupgrid->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "New width:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 0, 0 ); label = new TQLabel( i18n( "Height:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 1, 0 ); TQSpinBox * newwidth2 = new TQSpinBox( printgroup ); printgroupgrid->addWidget( newwidth2, 0, 1 ); @@ -134,25 +134,25 @@ void KViewScale::slotScaleDlg() KComboBox * newsizeunit2 = new KComboBox( printgroup ); newsizeunit2->insertItem( i18n( "in" ) ); newsizeunit2->insertItem( i18n( "mm" ) ); - printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, Qt::AlignVCenter ); + printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, TQt::AlignVCenter ); printgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Resolution X:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 3, 0 ); label = new TQLabel( i18n( "Y:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 4, 0 ); TQSpinBox * resx = new TQSpinBox( printgroup ); printgroupgrid->addWidget( resx, 3, 1 ); TQSpinBox * resy = new TQSpinBox( printgroup ); printgroupgrid->addWidget( resy, 4, 1 ); - printgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), printgroup ), 3, 4, 2, 2, Qt::AlignVCenter ); + printgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), printgroup ), 3, 4, 2, 2, TQt::AlignVCenter ); //KComboBox * newsizeunit2 = new KComboBox( printgroup ); //newsizeunit2->insertItem( i18n( "in" ) ); //newsizeunit2->insertItem( i18n( "mm" ) ); - //printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, Qt::AlignVCenter ); + //printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, TQt::AlignVCenter ); #endif dlg.exec(); diff --git a/kview/modules/scale/kview_scale.h b/kview/modules/scale/kview_scale.h index 3ac45257..99417425 100644 --- a/kview/modules/scale/kview_scale.h +++ b/kview/modules/scale/kview_scale.h @@ -31,8 +31,9 @@ namespace KImageViewer { class KViewScale : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KViewScale( TQObject* parent, const char* name, const TQStringList & ); + KViewScale( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~KViewScale(); private slots: diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index 929aafcd..8483f763 100644 --- a/kview/modules/scale/scaledlg.cpp +++ b/kview/modules/scale/scaledlg.cpp @@ -37,8 +37,8 @@ #define ONEINCHINMM 2.54 -ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name ) - : TQObject( parent, name ) +ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * tqparent, const char * name ) + : TQObject( tqparent, name ) , m_origsize( origsize ) , m_newsizeunit( 0 ) , m_newsizeunit2( 0 ) @@ -48,8 +48,8 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name , m_resx( 72 ) , m_resy( 72 ) { - TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), parent ); - TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), parent ); + TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqparent ); + TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqparent ); TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); @@ -61,53 +61,53 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name pixelgroupgrid->addRowSpacing( 0, KDialog::spacingHint() ); label = new TQLabel( i18n( "Original width:" ), pixelgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 1, 0 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 2, 0 ); pixelgroupgrid->addRowSpacing( 3, KDialog::spacingHint() ); label = new TQLabel( i18n( "New width:" ), pixelgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 4, 0 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 5, 0 ); pixelgroupgrid->addRowSpacing( 6, KDialog::spacingHint() ); label = new TQLabel( i18n( "Ratio X:" ), pixelgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 7, 0 ); label = new TQLabel( i18n( "Y:" ), pixelgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( label, 8, 0 ); printgroupgrid->addRowSpacing( 0, KDialog::spacingHint() ); label = new TQLabel( i18n( "New width:" ), printgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 1, 0 ); label = new TQLabel( i18n( "Height:" ), printgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 2, 0 ); printgroupgrid->addRowSpacing( 3, KDialog::spacingHint() ); label = new TQLabel( i18n( "Resolution X:" ), printgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 4, 0 ); label = new TQLabel( i18n( "Y:" ), printgroup ); - label->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + label->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); printgroupgrid->addWidget( label, 5, 0 ); m_pOldWidth = new TQLabel( TQString::number( origsize.width() ), pixelgroup ); - m_pOldWidth->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_pOldWidth->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( m_pOldWidth, 1, 1 ); m_pOldHeight = new TQLabel( TQString::number( origsize.height() ), pixelgroup ); - m_pOldHeight->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + m_pOldHeight->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); pixelgroupgrid->addWidget( m_pOldHeight, 2, 1 ); m_pNewWidth = new KFloatSpinBox( 1.0, 100000.0, 10.0, 0, pixelgroup ); @@ -118,7 +118,7 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name m_pNewSizeUnit = new KComboBox( pixelgroup ); m_pNewSizeUnit->insertItem( i18n( "px" ) ); m_pNewSizeUnit->insertItem( i18n( "%" ) ); - pixelgroupgrid->addMultiCellWidget( m_pNewSizeUnit, 4, 5, 2, 2, Qt::AlignVCenter ); + pixelgroupgrid->addMultiCellWidget( m_pNewSizeUnit, 4, 5, 2, 2, TQt::AlignVCenter ); m_pRatioX = new KFloatSpinBox( 0.0001, 10000.0, 0.1, 4, pixelgroup ); pixelgroupgrid->addWidget( m_pRatioX, 7, 1 ); @@ -126,7 +126,7 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name pixelgroupgrid->addWidget( m_pRatioY, 8, 1 ); m_pLinkRatio = new TQCheckBox( i18n( "Link" ), pixelgroup ); - pixelgroupgrid->addMultiCellWidget( m_pLinkRatio, 7, 8, 2, 2, Qt::AlignVCenter ); + pixelgroupgrid->addMultiCellWidget( m_pLinkRatio, 7, 8, 2, 2, TQt::AlignVCenter ); m_pNewWidth2 = new KFloatSpinBox( 0.0001, 10000.0, 0.1, 4, printgroup ); printgroupgrid->addWidget( m_pNewWidth2, 1, 1 ); @@ -136,7 +136,7 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name m_pNewSizeUnit2 = new KComboBox( printgroup ); m_pNewSizeUnit2->insertItem( i18n( "in" ) ); m_pNewSizeUnit2->insertItem( i18n( "mm" ) ); - printgroupgrid->addMultiCellWidget( m_pNewSizeUnit2, 1, 2, 2, 2, Qt::AlignVCenter ); + printgroupgrid->addMultiCellWidget( m_pNewSizeUnit2, 1, 2, 2, 2, TQt::AlignVCenter ); m_pResolutionX = new KFloatSpinBox( 0.0001, 6000.0, 1.0, 4, printgroup ); printgroupgrid->addWidget( m_pResolutionX, 4, 1 ); @@ -144,11 +144,11 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name printgroupgrid->addWidget( m_pResolutionY, 5, 1 ); m_pLinkResolution = new TQCheckBox( i18n( "Link" ), printgroup ); - printgroupgrid->addMultiCellWidget( m_pLinkResolution, 4, 5, 2, 2, Qt::AlignVCenter ); + printgroupgrid->addMultiCellWidget( m_pLinkResolution, 4, 5, 2, 2, TQt::AlignVCenter ); m_pResolutionUnit = new KComboBox( printgroup ); m_pResolutionUnit->insertItem( i18n( "pixels/in" ) ); m_pResolutionUnit->insertItem( i18n( "pixels/mm" ) ); - printgroupgrid->addMultiCellWidget( m_pResolutionUnit, 6, 6, 1, 2, Qt::AlignLeft ); + printgroupgrid->addMultiCellWidget( m_pResolutionUnit, 6, 6, 1, 2, TQt::AlignLeft ); m_pNewWidth->setValue( m_origsize.width() ); m_pNewHeight->setValue( m_origsize.height() ); diff --git a/kview/modules/scale/scaledlg.h b/kview/modules/scale/scaledlg.h index 71fa23d5..9c039d8c 100644 --- a/kview/modules/scale/scaledlg.h +++ b/kview/modules/scale/scaledlg.h @@ -30,11 +30,12 @@ class TQCheckBox; class TQVBox; class TQSize; -class ScaleDlg : public QObject +class ScaleDlg : public TQObject { Q_OBJECT + TQ_OBJECT public: - ScaleDlg( const TQSize & originalsize, TQVBox * parent, const char * name = 0 ); + ScaleDlg( const TQSize & originalsize, TQVBox * tqparent, const char * name = 0 ); ~ScaleDlg(); private slots: diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp index bf99e282..9f8b370c 100644 --- a/kview/modules/scanner/kviewscanner.cpp +++ b/kview/modules/scanner/kviewscanner.cpp @@ -35,13 +35,13 @@ typedef KGenericFactory<KViewScanner> KViewScannerFactory; K_EXPORT_COMPONENT_FACTORY( kview_scannerplugin, KViewScannerFactory( "kviewscannerplugin" ) ) -KViewScanner::KViewScanner( TQObject* parent, const char* name, +KViewScanner::KViewScanner( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( parent, name ), + : Plugin( tqparent, name ), m_pScandlg( 0 ), m_pViewer( 0 ) { - TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h index 56b59472..2c5abc77 100644 --- a/kview/modules/scanner/kviewscanner.h +++ b/kview/modules/scanner/kviewscanner.h @@ -31,8 +31,9 @@ namespace KImageViewer { class Viewer; } class KViewScanner : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KViewScanner( TQObject* parent, const char* name, const TQStringList & ); + KViewScanner( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~KViewScanner(); //public slots: diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp index f8277162..54869912 100644 --- a/kview/modules/template/kviewtemplate.cpp +++ b/kview/modules/template/kviewtemplate.cpp @@ -15,10 +15,10 @@ typedef KGenericFactory<KViewTemplate> KViewTemplateFactory; K_EXPORT_COMPONENT_FACTORY( kview_templateplugin, KViewTemplateFactory( "kviewtemplateplugin" ) ) -KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ) +KViewTemplate::KViewTemplate( TQObject* tqparent, const char* name, const TQStringList & ) + : Plugin( tqparent, name ) { - TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h index 5d49890e..03470b3d 100644 --- a/kview/modules/template/kviewtemplate.h +++ b/kview/modules/template/kviewtemplate.h @@ -12,8 +12,9 @@ namespace KImageViewer { class Viewer; } class KViewTemplate : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KViewTemplate( TQObject* parent, const char* name, const TQStringList & ); + KViewTemplate( TQObject* tqparent, const char* name, const TQStringList & ); virtual ~KViewTemplate(); private slots: diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index 2558279a..ce6c5d1e 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -4,7 +4,7 @@ Copyright (c) 2004,2005 Charles Samuels <[email protected]> This file is hereby licensed under the GNU General Public License version 2 or later at your option. - This file is licensed under the Qt Public License version 1 with the + This file is licensed under the TQt Public License version 1 with the condition that the licensed will be governed under the Laws of California (USA) instead of Norway. Disputes will be settled in Santa Clara county courts. @@ -44,10 +44,10 @@ Copyright (c) 2004,2005 Charles Samuels <[email protected]> #include <kstdaccel.h> #include <kstandarddirs.h> -Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes) - : KFileIconView(parent, 0) +Previews::Previews(PhotoBook *tqparent, const TQStringList &mimetypes) + : KFileIconView(tqparent, 0) { - mPhotoBook = parent; + mPhotoBook = tqparent; mMimeTypes = mimetypes; connect(&mDirLister, TQT_SIGNAL(clear()), TQT_SLOT(slotClearView())); @@ -149,15 +149,15 @@ void Previews::goToFirst() -PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) - : TQSplitter(parent, name) +PhotoBook::PhotoBook(TQWidget *tqparent, PhotoBookPart *part, const char *name) + : TQSplitter(tqparent, name) { TQStringList mimetypes; KTrader::OfferList offers = KTrader::self()->query( "KImageViewer/Viewer", "KParts/ReadOnlyPart", - "DesktopEntryName == 'kviewviewer'", TQString::null + "DesktopEntryName == 'kviewviewer'", TQString() ); for ( @@ -167,7 +167,7 @@ PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) { KService::Ptr service = *i; mViewer = KParts::ComponentFactory:: - createPartInstanceFromService<KParts::ReadOnlyPart>( service, this, 0, this ); + createPartInstanceFromService<KParts::ReadOnlyPart>( service, this, 0, TQT_TQOBJECT(this) ); // is this the correct way to get the supported mimetypes? if (mViewer) @@ -220,24 +220,24 @@ void PhotoBook::updateButton( bool nextExist, bool previousExit) K_EXPORT_COMPONENT_FACTORY(libphotobook, PhotoBookFactory ) PhotoBookPart::PhotoBookPart( - TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList& ) - : KParts::ReadOnlyPart(parent, name) + : KParts::ReadOnlyPart(tqparent, name) { setInstance(PhotoBookFactory::instance()); new PhotoBookBrowserExtension(this); - bv = new PhotoBook(parentWidget, this, widgetName); + bv = new PhotoBook(tqparentWidget, this, widgetName); setWidget(bv); connect( bv, TQT_SIGNAL(emitUpdateButton(bool, bool)), this, TQT_SLOT(slotUpdateButton(bool, bool)) ); - m_pNextAction = KStdAction::next(bv, TQT_SLOT(next()), actionCollection(), "next"); - m_pPreviousAction = KStdAction::prior(bv, TQT_SLOT(previous()), actionCollection(), "previous"); + m_pNextAction = KStdAction::next(TQT_TQOBJECT(bv), TQT_SLOT(next()), actionCollection(), "next"); + m_pPreviousAction = KStdAction::prior(TQT_TQOBJECT(bv), TQT_SLOT(previous()), actionCollection(), "previous"); setXMLFile( "photobookui.rc" ); diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index adae0e23..51065027 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -4,7 +4,7 @@ Copyright (c) 2004 Charles Samuels <[email protected]> This file is hereby licensed under the GNU General Public License version 2 or later at your option. - This file is licensed under the Qt Public License version 1 with the + This file is licensed under the TQt Public License version 1 with the condition that the licensed will be governed under the Laws of California (USA) instead of Norway. Disputes will be settled in Santa Clara county courts. @@ -50,15 +50,15 @@ Copyright (c) 2004 Charles Samuels <[email protected]> class Previews; class PhotoBookPart; -class PhotoBook : public QSplitter +class PhotoBook : public TQSplitter { -Q_OBJECT +TQ_OBJECT Previews *mList; KAction *mFit; KParts::ReadOnlyPart *mViewer; public: - PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name=0); + PhotoBook(TQWidget *tqparent, PhotoBookPart *part, const char *name=0); void openURL(const KURL &url); void updateButton(bool, bool ); @@ -73,13 +73,14 @@ signals: class Previews : public KFileIconView { Q_OBJECT + TQ_OBJECT KDirLister mDirLister; PhotoBook *mPhotoBook; TQStringList mMimeTypes; public: - Previews(PhotoBook *parent, const TQStringList &mimetypes); + Previews(PhotoBook *tqparent, const TQStringList &mimetypes); ~Previews(); void openURL(const KURL &url); @@ -106,14 +107,15 @@ private slots: class PhotoBookPart : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT PhotoBook *bv; KAction *m_pPreviousAction; KAction *m_pNextAction; public: PhotoBookPart( - TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name=0, + TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList() ); ~PhotoBookPart(); @@ -131,6 +133,7 @@ typedef KParts::GenericFactory<PhotoBookPart> PhotoBookFactory; class PhotoBookBrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT public: PhotoBookBrowserExtension(PhotoBookPart *p); }; |