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/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 +- 22 files changed, 47 insertions(+), 47 deletions(-) (limited to 'kview/modules') 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: -- cgit v1.2.1