diff options
Diffstat (limited to 'kontact')
-rw-r--r-- | kontact/interfaces/core.h | 2 | ||||
-rw-r--r-- | kontact/plugins/kmail/kcmkmailsummary.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/knotes/knotes_plugin.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/knotes/knotes_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/kpilot/kpilot_plugin.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/kpilot/kpilot_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/newsticker/kcmkontactknt.cpp | 18 | ||||
-rw-r--r-- | kontact/plugins/newsticker/newsticker_plugin.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/newsticker/newsticker_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/specialdates/specialdates_plugin.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/specialdates/specialdates_plugin.h | 2 | ||||
-rw-r--r-- | kontact/plugins/test/test_part.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/weather/weather_plugin.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/weather/weather_plugin.h | 2 | ||||
-rw-r--r-- | kontact/src/iconsidepane.cpp | 4 | ||||
-rw-r--r-- | kontact/src/mainwindow.cpp | 4 |
16 files changed, 32 insertions, 32 deletions
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index b060cc8a6..d43e78f5d 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -80,7 +80,7 @@ class KDE_EXPORT Core : public KParts::MainWindow void dayChanged( const TQDate& ); protected: - Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); + Core( TQWidget *parentWidget = 0, const char *name = 0 ); TQString lastErrorMessage() const; diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 1c1812cec..bc0d683e7 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -114,9 +114,9 @@ void KCMKMailSummary::initFolders() displayName ) ); } else { const int pos = (*it).tqfindRev( '/' ); - const TQString tqparentFolder = (*it).left( pos ); + const TQString parentFolder = (*it).left( pos ); mFolderMap.insert( *it, - new TQCheckListItem( mFolderMap[ tqparentFolder ], + new TQCheckListItem( mFolderMap[ parentFolder ], displayName, TQCheckListItem::CheckBox ) ); } diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index a72f14b7e..5010bf7d9 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -59,9 +59,9 @@ KParts::ReadOnlyPart* KNotesPlugin::createPart() return new KNotesPart( this, "notes" ); } -Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new KNotesSummaryWidget( this, tqparentWidget ); + return new KNotesSummaryWidget( this, parentWidget ); } const KAboutData *KNotesPlugin::aboutData() diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h index 680eb7f5f..de48b2ff6 100644 --- a/kontact/plugins/knotes/knotes_plugin.h +++ b/kontact/plugins/knotes/knotes_plugin.h @@ -38,7 +38,7 @@ class KNotesPlugin : public Kontact::Plugin KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& ); ~KNotesPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); int weight() const { return 600; } diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index 402d1e21a..c4044b4b1 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -43,9 +43,9 @@ KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStrin } -Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new SummaryWidget( tqparentWidget ); + return new SummaryWidget( parentWidget ); } const KAboutData *KPilotPlugin::aboutData() diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h index b1a08cbef..5695d2605 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.h +++ b/kontact/plugins/kpilot/kpilot_plugin.h @@ -33,7 +33,7 @@ class KPilotPlugin : public Kontact::Plugin KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ); KPilotPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); virtual bool showInSideBar() const { return false; } // virtual TQStringList configModules() const; diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 18a8871e6..7c3d05875 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -153,22 +153,22 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *tqparent, const char *name ) void KCMKontactKNT::loadNews() { - TQValueVector<TQListViewItem*> tqparents; + TQValueVector<TQListViewItem*> parents; TQValueVector<TQListViewItem*>::Iterator it; - tqparents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) ); - tqparents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) ); + parents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) ); - for ( it = tqparents.begin(); it != tqparents.end(); ++it ) + for ( it = parents.begin(); it != parents.end(); ++it ) (*it)->setSelectable( false ); for ( int i = 0; i < DEFAULT_NEWSSOURCES; ++i ) { NewsSourceData data = NewsSourceDefault[ i ]; - new NewsItem( tqparents[ data.category() ], data.name(), data.url(), false ); + new NewsItem( parents[ data.category() ], data.name(), data.url(), false ); mFeedMap.insert( data.url(), data.name() ); } } diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 4b187ea47..671ed5a23 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -37,7 +37,7 @@ NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const setInstance( NewsTickerPluginFactory::instance() ); } -Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* tqparentWidget ) +Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* parentWidget ) { - return new SummaryWidget( tqparentWidget ); + return new SummaryWidget( parentWidget ); } diff --git a/kontact/plugins/newsticker/newsticker_plugin.h b/kontact/plugins/newsticker/newsticker_plugin.h index e651e7dd7..b3c0b651d 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.h +++ b/kontact/plugins/newsticker/newsticker_plugin.h @@ -31,7 +31,7 @@ class NewsTickerPlugin : public Kontact::Plugin NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& ); NewsTickerPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget* tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget* parentWidget ); protected: virtual KParts::ReadOnlyPart* createPart() { return 0L; } diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index 316f94a77..9dc5e9828 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -49,9 +49,9 @@ SpecialdatesPlugin::~SpecialdatesPlugin() { } -Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new SDSummaryWidget( this, tqparentWidget ); + return new SDSummaryWidget( this, parentWidget ); } const KAboutData *SpecialdatesPlugin::aboutData() diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h index fc3598029..f1feb68b3 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.h +++ b/kontact/plugins/specialdates/specialdates_plugin.h @@ -39,7 +39,7 @@ class SpecialdatesPlugin : public Kontact::Plugin const KAboutData *aboutData(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); protected: virtual KParts::ReadOnlyPart *createPart() { return false; } diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index d8cfe9e6a..93311c7d2 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -41,7 +41,7 @@ #include <kservice.h> -TestPart::TestPart(TQObject *tqparent, const char *name) // ## tqparentWidget +TestPart::TestPart(TQObject *tqparent, const char *name) // ## parentWidget : KParts::ReadOnlyPart(tqparent, name) { setInstance( new KInstance("testpart") ); // ## memleak diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index 9d9f5dfde..564465bed 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -37,9 +37,9 @@ WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStr setInstance( WeatherPluginFactory::instance() ); } -Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *tqparentWidget ) +Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget ) { - return new SummaryWidget( tqparentWidget ); + return new SummaryWidget( parentWidget ); } const KAboutData *WeatherPlugin::aboutData() diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h index 924eb0a32..4ab019645 100644 --- a/kontact/plugins/weather/weather_plugin.h +++ b/kontact/plugins/weather/weather_plugin.h @@ -31,7 +31,7 @@ class WeatherPlugin : public Kontact::Plugin WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ); WeatherPlugin(); - virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget ); const KAboutData *aboutData(); diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 5b1ff2bd8..85e7e7a4f 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -344,7 +344,7 @@ void Navigator::updatePlugins( TQValueList<Kontact::Plugin*> plugins_ ) minWidth = item->width( this ); } - tqparentWidget()->setFixedWidth( minWidth ); + parentWidget()->setFixedWidth( minWidth ); } void Navigator::dragEnterEvent( TQDragEnterEvent *event ) @@ -491,7 +491,7 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos ) if (width > maxWidth) maxWidth = width; } - tqparentWidget()->setFixedWidth( maxWidth ); + parentWidget()->setFixedWidth( maxWidth ); triggerUpdate( true ); } diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 582b895a6..8439b4fce 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -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->tqparentWidget(); + TQWidget *tqparent = tqfocusWidget->parentWidget(); while ( tqparent ) { if ( tqparent == mCurrentPlugin->part()->widget() ) mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) ); - tqparent = tqparent->tqparentWidget(); + tqparent = tqparent->parentWidget(); } } |