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/Thoughts | 4 ++-- kontact/interfaces/core.cpp | 4 ++-- kontact/interfaces/plugin.cpp | 4 ++-- kontact/interfaces/plugin.h | 4 ++-- kontact/interfaces/summary.cpp | 8 ++++---- kontact/interfaces/summary.h | 4 ++-- kontact/plugins/kmail/kcmkmailsummary.cpp | 8 ++++---- kontact/plugins/kmail/kcmkmailsummary.h | 2 +- kontact/plugins/kmail/kmail_plugin.cpp | 4 ++-- kontact/plugins/kmail/kmail_plugin.h | 2 +- kontact/plugins/kmail/summarywidget.cpp | 4 ++-- kontact/plugins/kmail/summarywidget.h | 2 +- kontact/plugins/knotes/knotes_part.cpp | 4 ++-- kontact/plugins/knotes/knotes_part.h | 2 +- kontact/plugins/knotes/knotes_part_p.h | 8 ++++---- kontact/plugins/knotes/knotetip.cpp | 4 ++-- kontact/plugins/knotes/knotetip.h | 2 +- kontact/plugins/knotes/summarywidget.cpp | 4 ++-- kontact/plugins/knotes/summarywidget.h | 2 +- kontact/plugins/korganizer/kcmkorgsummary.cpp | 8 ++++---- kontact/plugins/korganizer/kcmkorgsummary.h | 2 +- kontact/plugins/korganizer/korganizerplugin.cpp | 4 ++-- kontact/plugins/korganizer/korganizerplugin.h | 2 +- kontact/plugins/korganizer/summarywidget.cpp | 4 ++-- kontact/plugins/korganizer/summarywidget.h | 2 +- kontact/plugins/korganizer/todoplugin.cpp | 4 ++-- kontact/plugins/korganizer/todoplugin.h | 2 +- kontact/plugins/korganizer/todosummarywidget.cpp | 6 +++--- kontact/plugins/korganizer/todosummarywidget.h | 2 +- kontact/plugins/kpilot/summarywidget.cpp | 4 ++-- kontact/plugins/kpilot/summarywidget.h | 2 +- kontact/plugins/newsticker/kcmkontactknt.cpp | 20 ++++++++++---------- kontact/plugins/newsticker/kcmkontactknt.h | 4 ++-- kontact/plugins/newsticker/summarywidget.cpp | 4 ++-- kontact/plugins/newsticker/summarywidget.h | 2 +- kontact/plugins/specialdates/kcmsdsummary.cpp | 8 ++++---- kontact/plugins/specialdates/kcmsdsummary.h | 2 +- kontact/plugins/specialdates/sdsummarywidget.cpp | 4 ++-- kontact/plugins/specialdates/sdsummarywidget.h | 2 +- kontact/plugins/summary/dropwidget.cpp | 4 ++-- kontact/plugins/summary/dropwidget.h | 2 +- kontact/plugins/summary/kcmkontactsummary.cpp | 16 ++++++++-------- kontact/plugins/summary/kcmkontactsummary.h | 4 ++-- kontact/plugins/summary/summaryview_part.cpp | 4 ++-- kontact/plugins/summary/summaryview_part.h | 2 +- kontact/plugins/test/test_part.cpp | 4 ++-- kontact/plugins/test/test_part.h | 2 +- kontact/plugins/weather/summarywidget.cpp | 4 ++-- kontact/plugins/weather/summarywidget.h | 2 +- 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 +- 60 files changed, 137 insertions(+), 137 deletions(-) (limited to 'kontact') diff --git a/kontact/Thoughts b/kontact/Thoughts index 991209a7..a93d9193 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -311,7 +311,7 @@ MiB: yes, not too much against DCOP. But for KNotes I thought about turning MiB: a note into a plugin that can be loaded by Kontact and KNotes independently. MiB: like this, there's no DCOP necessary anymore and makes it much more flexible. MiB: e.g. usage of different display configs, a note embedded somewhere and having -MiB: a tqparent or standalone on the desktop. +MiB: a parent or standalone on the desktop. # Communication with external applications is something which doesn't fit too # well with the 'integrated' approach of Kontact. Is this really necessary? @@ -367,7 +367,7 @@ h: there is something else broken IMHO Summary View ------------ h: How would one best integrate a summary view into kontact? -h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* tqparent ); +h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* parent ); h: to get a summary widget for a day? h: b) use some sort of XML to UI to represent the summary informations h: c) have a stand a lone part which opens the PIM data seperately? ( How diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 997ad8c4..e4e44e70 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -37,8 +37,8 @@ public: TQString lastErrorMessage; }; -Core::Core( TQWidget *tqparent, const char *name ) - : KParts::MainWindow( tqparent, name ) +Core::Core( TQWidget *parent, const char *name ) + : KParts::MainWindow( parent, name ) { d = new Private; TQTimer* timer = new TQTimer( this ); diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 1d7a2a1a..14248250 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -53,8 +53,8 @@ class Plugin::Private }; -Plugin::Plugin( Kontact::Core *core, TQObject *tqparent, const char *name ) - : KXMLGUIClient( core ), TQObject( tqparent, name ), d( new Private ) +Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name ) + : KXMLGUIClient( core ), TQObject( parent, name ), d( new Private ) { core->factory()->addClient( this ); KGlobal::locale()->insertCatalogue(name); diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index f0fcc154..c532f86f 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -69,7 +69,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient provides the part! This is the name used for DCOP registration. It's ok to have several plugins using the same application name. */ - Plugin( Core *core, TQObject *tqparent, const char *name ); + Plugin( Core *core, TQObject *parent, const char *name ); ~Plugin(); @@ -172,7 +172,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient Reimplement this method if you want to add a widget for your application to Kontact's summary page. */ - virtual Summary *createSummaryWidget( TQWidget * /*tqparent*/ ) { return 0; } + virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; } /** Returns whether the plugin provides a part that should be shown in the sidebar. diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 4fa495bf..08512522 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -34,8 +34,8 @@ using namespace Kontact; -Summary::Summary( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Summary::Summary( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setAcceptDrops( true ); } @@ -44,9 +44,9 @@ Summary::~Summary() { } -TQWidget* Summary::createHeader(TQWidget *tqparent, const TQPixmap& icon, const TQString& heading) +TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQString& heading) { - TQHBox* hbox = new TQHBox( tqparent ); + TQHBox* hbox = new TQHBox( parent ); hbox->setMargin( 2 ); TQFont boldFont; diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index a845401f..f6efa308 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -39,7 +39,7 @@ class KDE_EXPORT Summary : public TQWidget TQ_OBJECT public: - Summary( TQWidget *tqparent, const char *name = 0 ); + Summary( TQWidget *parent, const char *name = 0 ); virtual ~Summary(); @@ -53,7 +53,7 @@ class KDE_EXPORT Summary : public TQWidget /** Creates a heading for a typical summary view with an icon and a heading. */ - TQWidget *createHeader( TQWidget* tqparent, const TQPixmap &icon, + TQWidget *createHeader( TQWidget* parent, const TQPixmap &icon, const TQString& heading ); /** diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 97fc9fad..989ab619 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -41,14 +41,14 @@ extern "C" { - KDE_EXPORT KCModule *create_kmailsummary( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * ) { - return new KCMKMailSummary( tqparent, "kcmkmailsummary" ); + return new KCMKMailSummary( parent, "kcmkmailsummary" ); } } -KCMKMailSummary::KCMKMailSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h index 068fa4a8..025a3f7d 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.h +++ b/kontact/plugins/kmail/kcmkmailsummary.h @@ -39,7 +39,7 @@ class KCMKMailSummary : public KCModule TQ_OBJECT public: - KCMKMailSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 51fceaa6..aa1e205a 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -174,9 +174,9 @@ bool KMailPlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *tqparent ) +Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent ) { - return new SummaryWidget( this, tqparent ); + return new SummaryWidget( this, parent ); } //// diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h index 46998d80..9ab74ac2 100644 --- a/kontact/plugins/kmail/kmail_plugin.h +++ b/kontact/plugins/kmail/kmail_plugin.h @@ -54,7 +54,7 @@ class KMailPlugin : public Kontact::Plugin virtual bool isRunningStandalone(); virtual bool createDCOPInterface( const TQString& serviceType ); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); virtual TQString tipFile() const; int weight() const { return 200; } diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 8f3b668b..195d853a 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -41,8 +41,8 @@ #include -SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( TQCString("MailSummary") ), mPlugin( plugin ) { diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h index 575aceae..73e27551 100644 --- a/kontact/plugins/kmail/summarywidget.h +++ b/kontact/plugins/kmail/summarywidget.h @@ -45,7 +45,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); int summaryHeight() const { return 1; } TQStringList configModules() const; diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index b4b0f778..004865dc 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -38,8 +38,8 @@ #include "knotetip.h" -KNotesPart::KNotesPart( TQObject *tqparent, const char *name ) - : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( tqparent, name ), +KNotesPart::KNotesPart( TQObject *parent, const char *name ) + : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( parent, name ), mNotesView( new KNotesIconView() ), mNoteTip( new KNoteTip( mNotesView ) ), mNoteEditDlg( 0 ), diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index 9bc4e847..4ab1be70 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -50,7 +50,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface TQ_OBJECT public: - KNotesPart( TQObject *tqparent = 0, const char *name = 0 ); + KNotesPart( TQObject *parent = 0, const char *name = 0 ); ~KNotesPart(); bool openFile(); diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 9f8a4bb8..a6e23d89 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -60,8 +60,8 @@ class KNotesIconViewItem : public KIconViewItem { public: - KNotesIconViewItem( KIconView *tqparent, KCal::Journal *journal ) - : KIconViewItem( tqparent ), + KNotesIconViewItem( KIconView *parent, KCal::Journal *journal ) + : KIconViewItem( parent ), mJournal( journal ) { setRenameEnabled( true ); @@ -118,9 +118,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient TQ_OBJECT public: - KNoteEditDlg( TQWidget *tqparent = 0, const char *name = 0 ) + KNoteEditDlg( TQWidget *parent = 0, const char *name = 0 ) : KDialogBase( Plain, i18n( "Edit Note" ), Ok | Cancel, Ok, - tqparent, name, true, true ) + parent, name, true, true ) { // this dialog is modal to prevent one from editing the same note twice in two // different windows diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 9e2609fc..79a45d21 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -40,11 +40,11 @@ #include "knotes_part_p.h" -KNoteTip::KNoteTip( KIconView *tqparent ) +KNoteTip::KNoteTip( KIconView *parent ) : TQFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ), mFilter( false ), - mView( tqparent ), + mView( parent ), mNoteIVI( 0 ), mPreview( new TQTextEdit( this ) ) { diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h index ca342fa4..22172022 100644 --- a/kontact/plugins/knotes/knotetip.h +++ b/kontact/plugins/knotes/knotetip.h @@ -41,7 +41,7 @@ class KNotesIconViewItem; class KNoteTip : public TQFrame { public: - KNoteTip( KIconView *tqparent ); + KNoteTip( KIconView *parent ); ~KNoteTip(); void setNote( KNotesIconViewItem *item ); diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index c0e1ef40..2bd0456c 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -45,8 +45,8 @@ #include "summarywidget.h" KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, - TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), mLayout( 0 ), mPlugin( plugin ) + TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), mLayout( 0 ), mPlugin( plugin ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h index 97ccd094..088bdea3 100644 --- a/kontact/plugins/knotes/summarywidget.h +++ b/kontact/plugins/knotes/summarywidget.h @@ -46,7 +46,7 @@ class KNotesSummaryWidget : public Kontact::Summary TQ_OBJECT public: - KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 ); + KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); } diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 9e698a2b..7aa684f4 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -41,14 +41,14 @@ extern "C" { - KDE_EXPORT KCModule *create_korgsummary( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * ) { - return new KCMKOrgSummary( tqparent, "kcmkorgsummary" ); + return new KCMKOrgSummary( parent, "kcmkorgsummary" ); } } -KCMKOrgSummary::KCMKOrgSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h index 6d19f30f..ea698f91 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.h +++ b/kontact/plugins/korganizer/kcmkorgsummary.h @@ -35,7 +35,7 @@ class KCMKOrgSummary : public KCModule TQ_OBJECT public: - KCMKOrgSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index d626c951..beba1738 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -80,14 +80,14 @@ KOrganizerPlugin::~KOrganizerPlugin() { } -Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *tqparent ) +Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent ) { // korg part must be loaded, otherwise when starting kontact on summary view // it won't display our stuff. // If the part is already loaded loadPart() is harmless and just returns loadPart(); - return new SummaryWidget( this, tqparent ); + return new SummaryWidget( this, parent ); } KParts::ReadOnlyPart *KOrganizerPlugin::createPart() diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h index 4aaa4a0b..83abfa91 100644 --- a/kontact/plugins/korganizer/korganizerplugin.h +++ b/kontact/plugins/korganizer/korganizerplugin.h @@ -51,7 +51,7 @@ class KOrganizerPlugin : public Kontact::Plugin bool canDecodeDrag( TQMimeSource * ); void processDropEvent( TQDropEvent * ); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); virtual TQString tipFile() const; virtual TQStringList invisibleToolbarActions() const; diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 03be389c..b3f73fdf 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -50,9 +50,9 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent, +SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 ) + : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h index 9e2350ea..1f7df4f1 100644 --- a/kontact/plugins/korganizer/summarywidget.h +++ b/kontact/plugins/korganizer/summarywidget.h @@ -42,7 +42,7 @@ class SummaryWidget : public Kontact::Summary TQ_OBJECT public: - SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent, + SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, const char *name = 0 ); ~SummaryWidget(); diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 6b6238bf..fa788778 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -77,9 +77,9 @@ TodoPlugin::~TodoPlugin() { } -Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *tqparent ) +Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *parent ) { - return new TodoSummaryWidget( this, tqparent ); + return new TodoSummaryWidget( this, parent ); } KParts::ReadOnlyPart *TodoPlugin::createPart() diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h index 9bff00d0..4d2896cd 100644 --- a/kontact/plugins/korganizer/todoplugin.h +++ b/kontact/plugins/korganizer/todoplugin.h @@ -48,7 +48,7 @@ class TodoPlugin : public Kontact::Plugin virtual TQStringList invisibleToolbarActions() const; - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); void select(); diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 1109f314..8d78d372 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -53,8 +53,8 @@ #include "todosummarywidget.h" TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin, - TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), mPlugin( plugin ) + TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), mPlugin( plugin ) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); @@ -152,7 +152,7 @@ void TodoSummaryWidget::updateView() mLabels.append( label ); TQString sSummary = todo->summary(); - if ( todo->relatedTo() ) { // show tqparent only, not entire ancestry + if ( todo->relatedTo() ) { // show parent only, not entire ancestry sSummary = todo->relatedTo()->summary() + ":" + todo->summary(); } KURLLabel *urlLabel = new KURLLabel( this ); diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h index 974a45b3..e8374edc 100644 --- a/kontact/plugins/korganizer/todosummarywidget.h +++ b/kontact/plugins/korganizer/todosummarywidget.h @@ -42,7 +42,7 @@ class TodoSummaryWidget : public Kontact::Summary TQ_OBJECT public: - TodoSummaryWidget( TodoPlugin *plugin, TQWidget *tqparent, + TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent, const char *name = 0 ); ~TodoSummaryWidget(); diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index a0dafaa2..c2f4739c 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -49,8 +49,8 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( "KPilotSummaryWidget" ), mDCOPSuccess( false ), mStartedDaemon( false ), diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h index cfb87ae5..b1b60a05 100644 --- a/kontact/plugins/kpilot/summarywidget.h +++ b/kontact/plugins/kpilot/summarywidget.h @@ -49,7 +49,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); virtual ~SummaryWidget(); int summaryHeight() const { return 1; } diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 63dc312e..6795ffb5 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -49,15 +49,15 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactknt( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * ) { - return new KCMKontactKNT( tqparent, "kcmkontactknt" ); + return new KCMKontactKNT( parent, "kcmkontactknt" ); } } -NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *tqparent ) +NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *parent ) : KDialogBase( Plain, i18n( "New News Feed" ), Ok | Cancel, - Ok, tqparent, 0, true, true ) + Ok, parent, 0, true, true ) { TQWidget *page = plainPage(); TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(), @@ -106,14 +106,14 @@ TQString NewsEditDialog::url() const class NewsItem : public TQListViewItem { public: - NewsItem( TQListView *tqparent, const TQString& title, const TQString& url, bool custom ) - : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom ) + NewsItem( TQListView *parent, const TQString& title, const TQString& url, bool custom ) + : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) { setText( 0, mTitle ); } - NewsItem( TQListViewItem *tqparent, const TQString& title, const TQString& url, bool custom ) - : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom ) + NewsItem( TQListViewItem *parent, const TQString& title, const TQString& url, bool custom ) + : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom ) { setText( 0, mTitle ); } @@ -128,8 +128,8 @@ class NewsItem : public TQListViewItem bool mCustom; }; -KCMKontactKNT::KCMKontactKNT( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h index 2ec21f86..7bb00c7e 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.h +++ b/kontact/plugins/newsticker/kcmkontactknt.h @@ -41,7 +41,7 @@ class KCMKontactKNT : public KCModule TQ_OBJECT public: - KCMKontactKNT( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); @@ -89,7 +89,7 @@ class NewsEditDialog : public KDialogBase TQ_OBJECT public: - NewsEditDialog( const TQString&, const TQString&, TQWidget *tqparent ); + NewsEditDialog( const TQString&, const TQString&, TQWidget *parent ); TQString title() const; TQString url() const; diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 3667d402..2ba0dfcf 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -41,8 +41,8 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( "NewsTickerPlugin" ), mLayout( 0 ), mFeedCounter( 0 ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h index 7f30ca26..4a7c5c45 100644 --- a/kontact/plugins/newsticker/summarywidget.h +++ b/kontact/plugins/newsticker/summarywidget.h @@ -60,7 +60,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject K_DCOP public: - SummaryWidget( TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); int summaryHeight() const; TQStringList configModules() const; diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 3c342082..b659cdb4 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -43,14 +43,14 @@ extern "C" { - KDE_EXPORT KCModule *create_sdsummary( TQWidget *tqparent, const char * ) + KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * ) { - return new KCMSDSummary( tqparent, "kcmsdsummary" ); + return new KCMSDSummary( parent, "kcmsdsummary" ); } } -KCMSDSummary::KCMSDSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { initGUI(); diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h index 4369797f..7e18f219 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.h +++ b/kontact/plugins/specialdates/kcmsdsummary.h @@ -39,7 +39,7 @@ class KCMSDSummary : public KCModule TQ_OBJECT public: - KCMSDSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMSDSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 3a5f8b3a..537e4ec0 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -77,9 +77,9 @@ class SDEntry } }; -SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, +SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) + : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) { // Create the Summary Layout TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h index 939ca5bb..00f45a5d 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.h +++ b/kontact/plugins/specialdates/sdsummarywidget.h @@ -46,7 +46,7 @@ class SDSummaryWidget : public Kontact::Summary TQ_OBJECT public: - SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, + SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); TQStringList configModules() const; diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp index 300d7993..63c1d3ce 100644 --- a/kontact/plugins/summary/dropwidget.cpp +++ b/kontact/plugins/summary/dropwidget.cpp @@ -23,8 +23,8 @@ #include "dropwidget.h" -DropWidget::DropWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +DropWidget::DropWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setAcceptDrops( true ); } diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h index ee430d90..e2d11c9e 100644 --- a/kontact/plugins/summary/dropwidget.h +++ b/kontact/plugins/summary/dropwidget.h @@ -30,7 +30,7 @@ class DropWidget : public TQWidget TQ_OBJECT public: - DropWidget( TQWidget *tqparent, const char *name = 0 ); + DropWidget( TQWidget *parent, const char *name = 0 ); signals: void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index a2b5003b..156014ca 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -43,16 +43,16 @@ extern "C" { - KDE_EXPORT KCModule *create_kontactsummary( TQWidget *tqparent, const char * ) { - return new KCMKontactSummary( tqparent, "kcmkontactsummary" ); + KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) { + return new KCMKontactSummary( parent, "kcmkontactsummary" ); } } class PluginItem : public TQCheckListItem { public: - PluginItem( KPluginInfo *info, KListView *tqparent ) - : TQCheckListItem( tqparent, TQString(), TQCheckListItem::CheckBox ), + PluginItem( KPluginInfo *info, KListView *parent ) + : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ), mInfo( info ) { TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); @@ -78,8 +78,8 @@ class PluginItem : public TQCheckListItem KPluginInfo *mInfo; }; -PluginView::PluginView( TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ) +PluginView::PluginView( TQWidget *parent, const char *name ) + : KListView( parent, name ) { addColumn( i18n( "Name" ) ); setAllColumnsShowFocus( true ); @@ -90,8 +90,8 @@ PluginView::~PluginView() { } -KCMKontactSummary::KCMKontactSummary( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h index 4545f16d..33c9b8f0 100644 --- a/kontact/plugins/summary/kcmkontactsummary.h +++ b/kontact/plugins/summary/kcmkontactsummary.h @@ -36,7 +36,7 @@ class PluginView : public KListView TQ_OBJECT public: - PluginView( TQWidget *tqparent, const char *name = 0 ); + PluginView( TQWidget *parent, const char *name = 0 ); ~PluginView(); }; @@ -46,7 +46,7 @@ class KCMKontactSummary : public KCModule TQ_OBJECT public: - KCMKontactSummary( TQWidget *tqparent = 0, const char *name = 0 ); + KCMKontactSummary( TQWidget *parent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index f9dbd83e..d65228cd 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -67,8 +67,8 @@ namespace Kontact SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, const KAboutData *aboutData, - TQObject *tqparent, const char *name ) - : KParts::ReadOnlyPart( tqparent, name ), + TQObject *parent, const char *name ) + : KParts::ReadOnlyPart( parent, name ), mCore( core ), mFrame( 0 ), mConfigAction( 0 ) { setInstance( new KInstance( aboutData ) ); diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index b04b944a..5a99b947 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -57,7 +57,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart public: SummaryViewPart( Kontact::Core *core, const char *widgetName, const KAboutData *aboutData, - TQObject *tqparent = 0, const char *name = 0 ); + TQObject *parent = 0, const char *name = 0 ); ~SummaryViewPart(); public slots: diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 93311c7d..3c900a53 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -41,8 +41,8 @@ #include -TestPart::TestPart(TQObject *tqparent, const char *name) // ## parentWidget - : KParts::ReadOnlyPart(tqparent, name) +TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget + : KParts::ReadOnlyPart(parent, name) { setInstance( new KInstance("testpart") ); // ## memleak m_edit = new TQTextEdit; diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h index 7f14aed2..1be87dde 100644 --- a/kontact/plugins/test/test_part.h +++ b/kontact/plugins/test/test_part.h @@ -38,7 +38,7 @@ class TestPart : public KParts::ReadOnlyPart public: - TestPart(TQObject *tqparent=0, const char *name=0); + TestPart(TQObject *parent=0, const char *name=0); ~TestPart(); protected: diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 611a7c1c..bf4d452a 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -38,8 +38,8 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) - : Kontact::Summary( tqparent, name ), +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) + : Kontact::Summary( parent, name ), DCOPObject( "WeatherSummaryWidget" ), mProc( 0 ) { mLayout = new TQVBoxLayout( this, 3, 3 ); diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h index be1c5b9c..b4735151 100644 --- a/kontact/plugins/weather/summarywidget.h +++ b/kontact/plugins/weather/summarywidget.h @@ -90,7 +90,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject // TQ_OBJECT K_DCOP public: - SummaryWidget( TQWidget *tqparent, const char *name = 0 ); + SummaryWidget( TQWidget *parent, const char *name = 0 ); TQStringList configModules() const; 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