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 --- .../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 +- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kview/modules/presenter') 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: -- cgit v1.2.3