From e7366c97c998679efa80cf61c88e64a11a3d3c33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kview/config/kviewconfmodules.cpp | 4 ++-- kview/config/kviewconfmodules.h | 2 +- kview/config/plugins/kviewpluginsconfig.cpp | 4 ++-- kview/config/plugins/kviewpluginsconfig.h | 2 +- kview/kimageviewer/viewer.cpp | 4 ++-- kview/kimageviewer/viewer.h | 2 +- kview/kviewcanvas/config/confmodules.cpp | 4 ++-- kview/kviewcanvas/config/confmodules.h | 2 +- kview/kviewcanvas/kimagecanvas.cpp | 4 ++-- kview/kviewcanvas/kimagecanvas.h | 2 +- kview/kviewcanvas/kimageholder.cpp | 8 ++++---- kview/kviewcanvas/kimageholder.h | 2 +- kview/kviewviewer/config/kviewviewerpluginsconfig.cpp | 4 ++-- kview/kviewviewer/config/kviewviewerpluginsconfig.h | 2 +- kview/kviewviewer/imagesettings.cpp | 4 ++-- kview/kviewviewer/imagesettings.h | 2 +- kview/kviewviewer/kviewkonqextension.cpp | 8 ++++---- kview/kviewviewer/kviewkonqextension.h | 2 +- kview/kviewviewer/kviewviewer.cpp | 4 ++-- kview/kviewviewer/kviewviewer.h | 2 +- kview/modules/browser/kviewbrowser.cpp | 6 +++--- kview/modules/browser/kviewbrowser.h | 2 +- kview/modules/effects/kvieweffects.cpp | 6 +++--- kview/modules/effects/kvieweffects.h | 2 +- .../modules/presenter/config/kviewpresenterconfig.cpp | 4 ++-- kview/modules/presenter/config/kviewpresenterconfig.h | 2 +- kview/modules/presenter/imagelistitem.cpp | 4 ++-- kview/modules/presenter/imagelistitem.h | 2 +- kview/modules/presenter/kviewpresenter.cpp | 18 +++++++++--------- kview/modules/presenter/kviewpresenter.h | 2 +- kview/modules/presenter/kviewpresenterconfmodule.cpp | 4 ++-- kview/modules/presenter/kviewpresenterconfmodule.h | 2 +- kview/modules/scale/kfloatspinbox.cpp | 4 ++-- kview/modules/scale/kfloatspinbox.h | 2 +- kview/modules/scale/kview_scale.cpp | 6 +++--- kview/modules/scale/kview_scale.h | 2 +- kview/modules/scale/scaledlg.cpp | 8 ++++---- kview/modules/scale/scaledlg.h | 2 +- kview/modules/scanner/kviewscanner.cpp | 6 +++--- kview/modules/scanner/kviewscanner.h | 2 +- kview/modules/template/kviewtemplate.cpp | 6 +++--- kview/modules/template/kviewtemplate.h | 2 +- kview/photobook/photobook.cpp | 14 +++++++------- kview/photobook/photobook.h | 6 +++--- 44 files changed, 91 insertions(+), 91 deletions(-) (limited to 'kview') diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index f84310e2..0a448b1a 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -32,8 +32,8 @@ typedef KGenericFactory KViewGeneralConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "kcm_kviewgeneralconfig" ) ) -KViewGeneralConfig::KViewGeneralConfig( TQWidget * tqparent, const char * /*name*/, const TQStringList & args ) - : KCModule( KViewGeneralConfigFactory::instance(), tqparent, args ) +KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args ) + : KCModule( KViewGeneralConfigFactory::instance(), parent, args ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kview/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h index bd01dbaf..91da7413 100644 --- a/kview/config/kviewconfmodules.h +++ b/kview/config/kviewconfmodules.h @@ -28,7 +28,7 @@ class KViewGeneralConfig : public KCModule Q_OBJECT TQ_OBJECT public: - KViewGeneralConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewGeneralConfig( TQWidget * parent, 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 cf085d3c..79b6b76b 100644 --- a/kview/config/plugins/kviewpluginsconfig.cpp +++ b/kview/config/plugins/kviewpluginsconfig.cpp @@ -28,8 +28,8 @@ typedef KGenericFactory KViewPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpluginsconfig, KViewPluginsConfigFactory( "kcm_kviewpluginsconfig" ) ) -KViewPluginsConfig::KViewPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KSettings::PluginPage( KViewPluginsConfigFactory::instance(), tqparent, args ) +KViewPluginsConfig::KViewPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KSettings::PluginPage( KViewPluginsConfigFactory::instance(), parent, args ) { m_config = new KSimpleConfig( "kviewrc" ); pluginSelector()->addPlugins( TQString::fromAscii( "kview" ), i18n( "Application" ), TQString(), m_config ); diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h index 3353bf6b..4d595a83 100644 --- a/kview/config/plugins/kviewpluginsconfig.h +++ b/kview/config/plugins/kviewpluginsconfig.h @@ -28,7 +28,7 @@ class KViewPluginsConfig : public KSettings::PluginPage Q_OBJECT TQ_OBJECT public: - KViewPluginsConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewPluginsConfig(); private: KConfig * m_config; diff --git a/kview/kimageviewer/viewer.cpp b/kview/kimageviewer/viewer.cpp index 445cb6de..1a5890d6 100644 --- a/kview/kimageviewer/viewer.cpp +++ b/kview/kimageviewer/viewer.cpp @@ -22,8 +22,8 @@ namespace KImageViewer { - Viewer::Viewer( TQObject * tqparent, const char * name ) - : KParts::ReadWritePart( tqparent, name ) + Viewer::Viewer( TQObject * parent, const char * name ) + : KParts::ReadWritePart( parent, name ) { } diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h index a656f049..b521710d 100644 --- a/kview/kimageviewer/viewer.h +++ b/kview/kimageviewer/viewer.h @@ -50,7 +50,7 @@ class KDE_EXPORT Viewer : public KParts::ReadWritePart Q_OBJECT TQ_OBJECT public: - Viewer( TQObject * tqparent = 0, const char * name = 0 ); + Viewer( TQObject * parent = 0, const char * name = 0 ); virtual ~Viewer(); diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index a90c1024..f9cf90cc 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -34,8 +34,8 @@ typedef KGenericFactory KViewCanvasConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewcanvasconfig, KViewCanvasConfigFactory( "kcm_kviewcanvasconfig" ) ) -KViewCanvasConfig::KViewCanvasConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KCModule( KViewCanvasConfigFactory::instance(), tqparent, args ) +KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KCModule( KViewCanvasConfigFactory::instance(), parent, args ) , m_config( new KConfig( "kviewcanvasrc" ) ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this ); diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h index 95fa00c6..d8760ff4 100644 --- a/kview/kviewcanvas/config/confmodules.h +++ b/kview/kviewcanvas/config/confmodules.h @@ -31,7 +31,7 @@ class KViewCanvasConfig : public KCModule Q_OBJECT TQ_OBJECT public: - KViewCanvasConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewCanvasConfig(); void load(); diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index d3a8608b..a2e6c5b7 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -43,8 +43,8 @@ typedef KGenericFactory KImageCanvasFactory; K_EXPORT_COMPONENT_FACTORY( libkviewcanvas, KImageCanvasFactory( "kviewcanvas" ) ) -KImageCanvas::KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & ) - : TQScrollView( tqparent, name, WResizeNoErase | WStaticContents ) +KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQStringList & ) + : TQScrollView( parent, name, WResizeNoErase | WStaticContents ) , m_client( 0 ) , m_oldClient( 0 ) , m_image( 0 ) diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h index c7af475e..52b49aca 100644 --- a/kview/kviewcanvas/kimagecanvas.h +++ b/kview/kviewcanvas/kimagecanvas.h @@ -47,7 +47,7 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas /** * KImageCanvas Constructor */ - KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & args ); + KImageCanvas( TQWidget * parent, const char * name, const TQStringList & args ); /** * KImageCanvas Destructor diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index 1bf3df98..f2e54462 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -33,8 +33,8 @@ #include "kimageholder.h" -KImageHolder::KImageHolder( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase ) +KImageHolder::KImageHolder( TQWidget * parent, const char * name ) + : TQWidget( parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase ) , m_selected( false ) , m_bSelecting( false ) , m_scrollTimerId( 0 ) @@ -96,7 +96,7 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) } else // create a selection { - TQWidget * parentwidget = ( TQWidget* )tqparent(); + TQWidget * parentwidget = ( TQWidget* )parent(); if( ! m_bSelecting ) { m_bSelecting = true; @@ -282,7 +282,7 @@ void KImageHolder::paintEvent( TQPaintEvent *ev ) painter.setClipRegion( ev->region().intersect( m_drawRect ) ); if( m_pPixmap ) { - if( m_pPixmap->tqmask() ) + if( m_pPixmap->mask() ) { if( ! m_pDoubleBuffer ) { diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index d8d220c0..165ec0bc 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -37,7 +37,7 @@ class KImageHolder : public TQWidget Q_OBJECT TQ_OBJECT public: - KImageHolder( TQWidget *tqparent = 0, const char * name = 0 ); + KImageHolder( TQWidget *parent = 0, const char * name = 0 ); virtual ~KImageHolder(); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp index a1576b49..122190f9 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory KViewViewerPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewviewerpluginsconfig, KViewViewerPluginsConfigFactory( "kcm_kviewviewerpluginsconfig" ) ) -KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), tqparent, args ) +KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), parent, args ) { m_config = new KSimpleConfig( "kviewviewerrc" ); pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString(), m_config ); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h index 94860fc9..b9ac90e3 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h @@ -28,7 +28,7 @@ class KViewViewerPluginsConfig : public KSettings::PluginPage Q_OBJECT TQ_OBJECT public: - KViewViewerPluginsConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewViewerPluginsConfig(); private: KConfig * m_config; diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp index 10781565..a4259b05 100644 --- a/kview/kviewviewer/imagesettings.cpp +++ b/kview/kviewviewer/imagesettings.cpp @@ -24,8 +24,8 @@ #include #include -ImageSettings::ImageSettings( TQWidget * tqparent, const char * name ) - : KPrintDialogPage( tqparent, name ) +ImageSettings::ImageSettings( TQWidget * parent, const char * name ) + : KPrintDialogPage( parent, name ) , m_pFitImage( 0 ) { setTitle( i18n( "Image Settings" ) ); diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h index 07bb9af8..4d8b2144 100644 --- a/kview/kviewviewer/imagesettings.h +++ b/kview/kviewviewer/imagesettings.h @@ -28,7 +28,7 @@ class ImageSettings : public KPrintDialogPage Q_OBJECT TQ_OBJECT public: - ImageSettings( TQWidget * tqparent = 0, const char * name = 0 ); + ImageSettings( TQWidget * parent = 0, const char * name = 0 ); ~ImageSettings(); void setOptions( const TQMap & opts ); diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index b47ea17d..ed93d6ea 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -33,9 +33,9 @@ #include KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas, - KViewViewer *tqparent, const char *name ) - : KParts::BrowserExtension( tqparent, name ), - m_pViewer( tqparent ), + KViewViewer *parent, const char *name ) + : KParts::BrowserExtension( parent, name ), + m_pViewer( parent ), 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 *)tqparent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) ) + if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) ) return; TQPainter painter; diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h index fa986c81..f9db2879 100644 --- a/kview/kviewviewer/kviewkonqextension.h +++ b/kview/kviewviewer/kviewkonqextension.h @@ -31,7 +31,7 @@ class KViewKonqExtension: public KParts::BrowserExtension Q_OBJECT TQ_OBJECT public: - KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *tqparent, const char *name = 0 ); + KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, 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 d4d2cda6..73d1bd92 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -56,8 +56,8 @@ typedef KParts::GenericFactory KViewViewerFactory; K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory ) KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *tqparent, const char *name, const TQStringList & ) - : KImageViewer::Viewer( tqparent, name ) + TQObject *parent, const char *name, const TQStringList & ) + : KImageViewer::Viewer( parent, name ) , m_pParentWidget( parentWidget ) , m_pJob( 0 ) , m_pExtension( 0 ) diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index f63808c8..3240badc 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -50,7 +50,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf public: KViewViewer( TQWidget * parentWidget, const char * widgetName, - TQObject * tqparent, const char * name, const TQStringList & ); + TQObject * parent, const char * name, const TQStringList & ); virtual ~KViewViewer(); KImageViewer::Canvas * canvas() const { return m_pCanvas; } diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index 7e52732b..936061eb 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -36,13 +36,13 @@ typedef KGenericFactory KViewBrowserFactory; K_EXPORT_COMPONENT_FACTORY( kview_browserplugin, KViewBrowserFactory( "kviewbrowserplugin" ) ) -KViewBrowser::KViewBrowser( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewBrowser::KViewBrowser( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_pDirLister( 0 ) , m_pFileItemList( 0 ) , m_bShowCurrent( false ) { - m_pViewer = static_cast( tqparent ); + m_pViewer = static_cast( parent ); if( m_pViewer ) { m_paBack = KStdAction::back ( this, TQT_SLOT( slotBack() ), actionCollection(), "previous_image" ); diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h index ecae29f3..a065c237 100644 --- a/kview/modules/browser/kviewbrowser.h +++ b/kview/modules/browser/kviewbrowser.h @@ -35,7 +35,7 @@ class KViewBrowser : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewBrowser( TQObject* tqparent, const char* name, const TQStringList & ); + KViewBrowser( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewBrowser(); private slots: diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp index c1ac49c2..a2e57327 100644 --- a/kview/modules/effects/kvieweffects.cpp +++ b/kview/modules/effects/kvieweffects.cpp @@ -24,15 +24,15 @@ typedef KGenericFactory KViewEffectsFactory; K_EXPORT_COMPONENT_FACTORY( kview_effectsplugin, KViewEffectsFactory( "kvieweffectsplugin" ) ) -KViewEffects::KViewEffects( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_gamma( 0.5 ), m_lastgamma( -1.0 ) , m_opacity( 50 ), m_lastopacity( -1 ) , m_intensity( 50 ), m_lastintensity( -1 ) , m_color( white ) , m_image( 0 ) { - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h index 43c1b16d..90d9bba4 100644 --- a/kview/modules/effects/kvieweffects.h +++ b/kview/modules/effects/kvieweffects.h @@ -15,7 +15,7 @@ class KViewEffects : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewEffects( TQObject* tqparent, const char* name, const TQStringList & ); + KViewEffects( TQObject* parent, 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 edcf157d..3f868694 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -31,8 +31,8 @@ typedef KGenericFactory KViewPresenterConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactory( "kcm_kviewpresenterconfig" ) ) -KViewPresenterConfig::KViewPresenterConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KCModule( KViewPresenterConfigFactory::instance(), tqparent, args ) +KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KCModule( KViewPresenterConfigFactory::instance(), parent, args ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h index d07c1506..91c5b6d6 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.h +++ b/kview/modules/presenter/config/kviewpresenterconfig.h @@ -28,7 +28,7 @@ class KViewPresenterConfig : public KCModule Q_OBJECT TQ_OBJECT public: - KViewPresenterConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewPresenterConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewPresenterConfig(); virtual void load(); diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp index 870987be..441568ad 100644 --- a/kview/modules/presenter/imagelistitem.cpp +++ b/kview/modules/presenter/imagelistitem.cpp @@ -24,8 +24,8 @@ #include -ImageListItem::ImageListItem( KListView * tqparent, const KURL & url ) - : KListViewItem( tqparent, tqparent->lastItem(), url.prettyURL() ) +ImageListItem::ImageListItem( KListView * parent, const KURL & url ) + : KListViewItem( parent, parent->lastItem(), url.prettyURL() ) , m_pImage( 0 ) , m_filename( TQString() ) , m_url( url ) diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h index e54f84a4..ee143a90 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 * tqparent, const KURL & url ); + ImageListItem( KListView * parent, const KURL & url ); ~ImageListItem(); const TQImage * image() const; diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index 4f5eeb10..e7275c0d 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory KViewPresenterFactory; K_EXPORT_COMPONENT_FACTORY( kview_presenterplugin, KViewPresenterFactory( "kviewpresenterplugin" ) ) -KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_pImageList( new ImageListDialog() ) , m_paFileOpen( 0 ) , m_bDontAdd( false ) @@ -62,7 +62,7 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt kdDebug( 4630 ) << k_funcinfo << endl; m_imagelist.setAutoDelete( true ); - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) @@ -82,7 +82,7 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), m_paSlideshow, TQT_SLOT( setChecked( bool ) ) ); // search for file_open action - KXMLGUIClient * parentClient = static_cast( tqparent->qt_cast( "KXMLGUIClient" ) ); + KXMLGUIClient * parentClient = static_cast( parent->qt_cast( "KXMLGUIClient" ) ); if( parentClient ) { m_paFileOpen = parentClient->actionCollection()->action( "file_open" ); @@ -92,7 +92,7 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) ); if( m_paFileOpen ) { - disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), tqparent, TQT_SLOT( slotOpenFile() ) ); + disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), parent, TQT_SLOT( slotOpenFile() ) ); connect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); } else @@ -150,12 +150,12 @@ KViewPresenter::~KViewPresenter() if( m_paFileOpen ) { disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); - // If the tqparent() doesn't exist we either leave the "File Open" action + // If the parent() doesn't exist we either leave the "File Open" action // in an unusable state or KView was just shutting down and therefor we // can ignore this. I've only seen the second one happening and to get - // rid of the TQObject::connect warning we do the tqparent() check. - if( tqparent() ) - connect( m_paFileOpen, TQT_SIGNAL( activated() ), tqparent(), TQT_SLOT( slotOpenFile() ) ); + // rid of the TQObject::connect warning we do the parent() check. + if( parent() ) + connect( m_paFileOpen, TQT_SIGNAL( activated() ), parent(), TQT_SLOT( slotOpenFile() ) ); } } diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h index ba3198b2..df1f38ac 100644 --- a/kview/modules/presenter/kviewpresenter.h +++ b/kview/modules/presenter/kviewpresenter.h @@ -40,7 +40,7 @@ class KViewPresenter : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewPresenter( TQObject* tqparent, const char* name, const TQStringList & ); + KViewPresenter( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewPresenter(); protected: diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp index ef051c28..b6818271 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.cpp +++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp @@ -29,8 +29,8 @@ #include #include -KViewPresenterConfModule::KViewPresenterConfModule( TQObject * tqparent ) - : KPreferencesModule( "kviewpresenter", tqparent, "KView Presenter Config Module" ) +KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent ) + : KPreferencesModule( "kviewpresenter", parent, "KView Presenter Config Module" ) { } diff --git a/kview/modules/presenter/kviewpresenterconfmodule.h b/kview/modules/presenter/kviewpresenterconfmodule.h index 8ecaa345..bef21e39 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.h +++ b/kview/modules/presenter/kviewpresenterconfmodule.h @@ -30,7 +30,7 @@ class KViewPresenterConfModule : public KPreferencesModule Q_OBJECT TQ_OBJECT public: - KViewPresenterConfModule( TQObject * tqparent ); + KViewPresenterConfModule( TQObject * parent ); ~KViewPresenterConfModule(); signals: diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index 428dc2ee..6870a20b 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -37,8 +37,8 @@ int pow( int a, int b ) return ret; } -KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * tqparent, const char * name ) - : TQSpinBox( tqparent, name ) +KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent, const char * name ) + : TQSpinBox( parent, name ) , m_doselection( true ) { setRange( minValue, maxValue, step, precision ); diff --git a/kview/modules/scale/kfloatspinbox.h b/kview/modules/scale/kfloatspinbox.h index 572fc952..5c8897c0 100644 --- a/kview/modules/scale/kfloatspinbox.h +++ b/kview/modules/scale/kfloatspinbox.h @@ -28,7 +28,7 @@ class KFloatSpinBox : public TQSpinBox Q_OBJECT TQ_OBJECT public: - KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * tqparent = 0, const char * name = 0 ); + KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent = 0, const char * name = 0 ); virtual ~KFloatSpinBox(); void setRange( float minValue, float maxValue, float step, unsigned int precision ); diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index 39cf9e37..95802df4 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -35,12 +35,12 @@ typedef KGenericFactory KViewScaleFactory; K_EXPORT_COMPONENT_FACTORY( kview_scale, KViewScaleFactory( "kview_scale" ) ) -KViewScale::KViewScale( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_pViewer( 0 ) , m_pCanvas( 0 ) { - m_pViewer = static_cast( tqparent ); + m_pViewer = static_cast( parent ); if( m_pViewer ) { kdDebug( 4630 ) << "m_pViewer->canvas() = " << m_pViewer->canvas() << endl; diff --git a/kview/modules/scale/kview_scale.h b/kview/modules/scale/kview_scale.h index 99417425..a3be4e48 100644 --- a/kview/modules/scale/kview_scale.h +++ b/kview/modules/scale/kview_scale.h @@ -33,7 +33,7 @@ class KViewScale : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewScale( TQObject* tqparent, const char* name, const TQStringList & ); + KViewScale( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewScale(); private slots: diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index 8483f763..335ab1c9 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 * tqparent, const char * name ) - : TQObject( tqparent, name ) +ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name ) + : TQObject( parent, name ) , m_origsize( origsize ) , m_newsizeunit( 0 ) , m_newsizeunit2( 0 ) @@ -48,8 +48,8 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * tqparent, const char * nam , m_resx( 72 ) , m_resy( 72 ) { - TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqparent ); - TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqparent ); + TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), parent ); + TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), parent ); TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kview/modules/scale/scaledlg.h b/kview/modules/scale/scaledlg.h index 9c039d8c..dace8109 100644 --- a/kview/modules/scale/scaledlg.h +++ b/kview/modules/scale/scaledlg.h @@ -35,7 +35,7 @@ class ScaleDlg : public TQObject Q_OBJECT TQ_OBJECT public: - ScaleDlg( const TQSize & originalsize, TQVBox * tqparent, const char * name = 0 ); + ScaleDlg( const TQSize & originalsize, TQVBox * parent, const char * name = 0 ); ~ScaleDlg(); private slots: diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp index 9f8b370c..bf99e282 100644 --- a/kview/modules/scanner/kviewscanner.cpp +++ b/kview/modules/scanner/kviewscanner.cpp @@ -35,13 +35,13 @@ typedef KGenericFactory KViewScannerFactory; K_EXPORT_COMPONENT_FACTORY( kview_scannerplugin, KViewScannerFactory( "kviewscannerplugin" ) ) -KViewScanner::KViewScanner( TQObject* tqparent, const char* name, +KViewScanner::KViewScanner( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ), + : Plugin( parent, name ), m_pScandlg( 0 ), m_pViewer( 0 ) { - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h index 2c5abc77..c0f8f7c8 100644 --- a/kview/modules/scanner/kviewscanner.h +++ b/kview/modules/scanner/kviewscanner.h @@ -33,7 +33,7 @@ class KViewScanner : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewScanner( TQObject* tqparent, const char* name, const TQStringList & ); + KViewScanner( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewScanner(); //public slots: diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp index 54869912..f8277162 100644 --- a/kview/modules/template/kviewtemplate.cpp +++ b/kview/modules/template/kviewtemplate.cpp @@ -15,10 +15,10 @@ typedef KGenericFactory KViewTemplateFactory; K_EXPORT_COMPONENT_FACTORY( kview_templateplugin, KViewTemplateFactory( "kviewtemplateplugin" ) ) -KViewTemplate::KViewTemplate( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) { - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h index 03470b3d..379a4cc8 100644 --- a/kview/modules/template/kviewtemplate.h +++ b/kview/modules/template/kviewtemplate.h @@ -14,7 +14,7 @@ class KViewTemplate : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewTemplate( TQObject* tqparent, const char* name, const TQStringList & ); + KViewTemplate( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewTemplate(); private slots: diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index 8503188d..9fcb1603 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -44,10 +44,10 @@ Copyright (c) 2004,2005 Charles Samuels #include #include -Previews::Previews(PhotoBook *tqparent, const TQStringList &mimetypes) - : KFileIconView(tqparent, 0) +Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes) + : KFileIconView(parent, 0) { - mPhotoBook = tqparent; + mPhotoBook = parent; mMimeTypes = mimetypes; connect(&mDirLister, TQT_SIGNAL(clear()), TQT_SLOT(slotClearView())); @@ -149,8 +149,8 @@ void Previews::goToFirst() -PhotoBook::PhotoBook(TQWidget *tqparent, PhotoBookPart *part, const char *name) - : TQSplitter(tqparent, name) +PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) + : TQSplitter(parent, name) { TQStringList mimetypes; @@ -221,10 +221,10 @@ K_EXPORT_COMPONENT_FACTORY(libphotobook, PhotoBookFactory ) PhotoBookPart::PhotoBookPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& ) - : KParts::ReadOnlyPart(tqparent, name) + : KParts::ReadOnlyPart(parent, name) { setInstance(PhotoBookFactory::instance()); diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index 2ce243a9..cd1d7536 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -59,7 +59,7 @@ TQ_OBJECT KParts::ReadOnlyPart *mViewer; public: - PhotoBook(TQWidget *tqparent, PhotoBookPart *part, const char *name=0); + PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name=0); void openURL(const KURL &url); void updateButton(bool, bool ); @@ -81,7 +81,7 @@ class Previews : public KFileIconView TQStringList mMimeTypes; public: - Previews(PhotoBook *tqparent, const TQStringList &mimetypes); + Previews(PhotoBook *parent, const TQStringList &mimetypes); ~Previews(); void openURL(const KURL &url); @@ -116,7 +116,7 @@ Q_OBJECT public: PhotoBookPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name=0, + TQObject *parent, const char *name=0, const TQStringList& args = TQStringList() ); ~PhotoBookPart(); -- cgit v1.2.1