From 36a36a5c1015aa0d03f4515c401e907ddb9d6291 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/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/src/iconsidepane.cpp | 12 ++++++------ kontact/src/iconsidepane.h | 8 ++++---- kontact/src/kcmkontact.cpp | 16 ++++++++-------- kontact/src/kcmkontact.h | 4 ++-- kontact/src/mainwindow.cpp | 12 ++++++------ kontact/src/profiledialog.cpp | 2 +- kontact/src/profiledialog.h | 2 +- kontact/src/profilemanager.cpp | 2 +- kontact/src/profilemanager.h | 2 +- kontact/src/sidepanebase.cpp | 4 ++-- kontact/src/sidepanebase.h | 2 +- 11 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kontact/src') diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 85e7e7a4..4eacd608 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -92,8 +92,8 @@ class PluginProxy using namespace Kontact; -EntryItem::EntryItem( Navigator *tqparent, Kontact::Plugin *plugin ) - : TQListBoxItem( tqparent ), +EntryItem::EntryItem( Navigator *parent, Kontact::Plugin *plugin ) + : TQListBoxItem( parent ), mPlugin( plugin ), mHasHover( false ), mPaintActive( false ) @@ -250,8 +250,8 @@ void EntryItem::setPaintActive( bool paintActive ) mPaintActive = paintActive; } -Navigator::Navigator( IconSidePane *tqparent, const char *name ) - : KListBox( tqparent, name ), mSidePane( tqparent ), +Navigator::Navigator( IconSidePane *parent, const char *name ) + : KListBox( parent, name ), mSidePane( parent ), mShowIcons( true ), mShowText( true ) { mMouseOn = 0; @@ -535,8 +535,8 @@ void Navigator::slotMouseOff() slotMouseOn( 0 ); } -IconSidePane::IconSidePane( Core *core, TQWidget *tqparent, const char *name ) - : SidePaneBase( core, tqparent, name ) +IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) + : SidePaneBase( core, parent, name ) { mNavigator = new Navigator( this ); connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ), diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index d7cc532d..d215558d 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -91,8 +91,8 @@ class EntryItem : public TQListBoxItem class EntryItemToolTip : public TQToolTip { public: - EntryItemToolTip( TQListBox* tqparent ) - : TQToolTip( tqparent->viewport() ), mListBox( tqparent ) + EntryItemToolTip( TQListBox* parent ) + : TQToolTip( parent->viewport() ), mListBox( parent ) {} protected: void maybeTip( const TQPoint& p ) { @@ -120,7 +120,7 @@ class Navigator : public KListBox Q_OBJECT TQ_OBJECT public: - Navigator( IconSidePane *tqparent = 0, const char *name = 0 ); + Navigator( IconSidePane *parent = 0, const char *name = 0 ); virtual void setSelected( TQListBoxItem *, bool ); @@ -176,7 +176,7 @@ class IconSidePane : public SidePaneBase Q_OBJECT TQ_OBJECT public: - IconSidePane( Core *core, TQWidget *tqparent, const char *name = 0 ); + IconSidePane( Core *core, TQWidget *parent, const char *name = 0 ); ~IconSidePane(); virtual void indicateForegrunding( Kontact::Plugin* ); diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index fbdd4a04..03c59d65 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -42,16 +42,16 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactconfig( TQWidget *tqparent, const char * ) { - return new KcmKontact( tqparent, "kcmkontact" ); + KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) { + return new KcmKontact( parent, "kcmkontact" ); } } class PluginItem : public TQListViewItem { public: - PluginItem( TQListView *tqparent, const KService::Ptr &ptr ) - : TQListViewItem( tqparent, ptr->name(), ptr->comment(), ptr->library() ), + PluginItem( TQListView *parent, const KService::Ptr &ptr ) + : TQListViewItem( parent, ptr->name(), ptr->comment(), ptr->library() ), mPtr( ptr ) { } @@ -65,8 +65,8 @@ class PluginItem : public TQListViewItem KService::Ptr mPtr; }; -KcmKontact::KcmKontact( TQWidget *tqparent, const char *name ) - : KPrefsModule( Kontact::Prefs::self(), tqparent, name ) +KcmKontact::KcmKontact( TQWidget *parent, const char *name ) + : KPrefsModule( Kontact::Prefs::self(), parent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); TQBoxLayout *pluginStartupLayout = new TQHBoxLayout( topLayout ); @@ -100,10 +100,10 @@ const KAboutData* KcmKontact::aboutData() const } -PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent ) +PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent ) { mItem = item; - mPluginCombo = new TQComboBox( tqparent ); + mPluginCombo = new TQComboBox( parent ); connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); } diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h index 1d3f04a6..0bb8cb47 100644 --- a/kontact/src/kcmkontact.h +++ b/kontact/src/kcmkontact.h @@ -42,7 +42,7 @@ class KcmKontact : public KPrefsModule TQ_OBJECT public: - KcmKontact( TQWidget *tqparent = 0, const char *name = 0 ); + KcmKontact( TQWidget *parent = 0, const char *name = 0 ); virtual const KAboutData* aboutData() const; }; @@ -53,7 +53,7 @@ class PluginSelection : public KPrefsWid TQ_OBJECT public: - PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent ); + PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent ); ~PluginSelection(); void readConfig(); diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index b719a57d..e30975ec 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -87,8 +87,8 @@ using namespace Kontact; class SettingsDialogWrapper : public KSettings::Dialog { public: - SettingsDialogWrapper( ContentInListView content, TQWidget * tqparent = 0 ) - : KSettings::Dialog( content, tqparent, 0 ) + SettingsDialogWrapper( ContentInListView content, TQWidget * parent = 0 ) + : KSettings::Dialog( content, parent, 0 ) { } @@ -805,12 +805,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) TQWidget *tqfocusWidget = kapp->tqfocusWidget(); if ( mCurrentPlugin && tqfocusWidget ) { // save the focus widget only when it belongs to the activated part - TQWidget *tqparent = tqfocusWidget->parentWidget(); - while ( tqparent ) { - if ( tqparent == mCurrentPlugin->part()->widget() ) + TQWidget *parent = tqfocusWidget->parentWidget(); + while ( parent ) { + if ( parent == mCurrentPlugin->part()->widget() ) mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr( tqfocusWidget ) ); - tqparent = tqparent->parentWidget(); + parent = parent->parentWidget(); } } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index bc3bff99..c5837780 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -34,7 +34,7 @@ #include #include -Kontact::ProfileDialog::ProfileDialog( TQWidget* tqparent, WFlags flags ) : KDialogBase( tqparent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) +Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close ) { setWFlags( flags ); setCaption( i18n("Configure Profiles") ); diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h index fc9559b5..dc0aee03 100644 --- a/kontact/src/profiledialog.h +++ b/kontact/src/profiledialog.h @@ -43,7 +43,7 @@ Q_OBJECT TQ_OBJECT public: - explicit ProfileDialog( TQWidget* tqparent = 0, WFlags f = 0 ); + explicit ProfileDialog( TQWidget* parent = 0, WFlags f = 0 ); private: enum ListColumn { diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 50b2a71d..91fc370d 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -131,7 +131,7 @@ Kontact::ProfileManager* Kontact::ProfileManager::self() return m_self; } -Kontact::ProfileManager::ProfileManager( TQObject* tqparent ) : TQObject( tqparent ) +Kontact::ProfileManager::ProfileManager( TQObject* parent ) : TQObject( parent ) { } diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h index b7abdcb3..2224b29f 100644 --- a/kontact/src/profilemanager.h +++ b/kontact/src/profilemanager.h @@ -146,7 +146,7 @@ private: static Kontact::Profile readFromConfiguration( const TQString& configFile, bool isLocal ); - explicit ProfileManager( TQObject* tqparent = 0 ); + explicit ProfileManager( TQObject* parent = 0 ); void readConfig(); diff --git a/kontact/src/sidepanebase.cpp b/kontact/src/sidepanebase.cpp index 486e273b..92a3ce51 100644 --- a/kontact/src/sidepanebase.cpp +++ b/kontact/src/sidepanebase.cpp @@ -25,8 +25,8 @@ using namespace Kontact; -SidePaneBase::SidePaneBase( Core *core, TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ), mCore( core ) +SidePaneBase::SidePaneBase( Core *core, TQWidget *parent, const char *name ) + : TQVBox( parent, name ), mCore( core ) { } diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h index 77acc66f..6942ac8b 100644 --- a/kontact/src/sidepanebase.h +++ b/kontact/src/sidepanebase.h @@ -36,7 +36,7 @@ class SidePaneBase : public TQVBox Q_OBJECT TQ_OBJECT public: - SidePaneBase( Core *core, TQWidget *tqparent, const char *name = 0 ); + SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 ); virtual ~SidePaneBase(); signals: -- cgit v1.2.3