From fd5d099065a748cac49e20a13481f85666c53c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:12 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kontact/plugins/summary/kcmkontactsummary.cpp | 4 ++-- kontact/plugins/summary/kcmkontactsummary.h | 2 +- kontact/plugins/summary/summaryview_part.cpp | 2 +- kontact/plugins/summary/summaryview_part.h | 4 ++-- kontact/plugins/summary/summaryview_plugin.cpp | 6 +++--- kontact/plugins/summary/summaryview_plugin.h | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kontact/plugins/summary') diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 91f33d3fc..e1e3c7f00 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -51,7 +51,7 @@ extern "C" class PluginItem : public TQCheckListItem { public: - PluginItem( KPluginInfo *info, KListView *parent ) + PluginItem( KPluginInfo *info, TDEListView *parent ) : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ), mInfo( info ) { @@ -79,7 +79,7 @@ class PluginItem : public TQCheckListItem }; PluginView::PluginView( TQWidget *parent, const char *name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { addColumn( i18n( "Name" ) ); setAllColumnsShowFocus( true ); diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h index 3e624798d..75cd79821 100644 --- a/kontact/plugins/summary/kcmkontactsummary.h +++ b/kontact/plugins/summary/kcmkontactsummary.h @@ -30,7 +30,7 @@ class KPluginInfo; -class PluginView : public KListView +class PluginView : public TDEListView { Q_OBJECT diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 27dac829f..335651cbd 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -88,7 +88,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), info, TQT_SIGNAL( textChanged( const TQString& ) ) ); - mConfigAction = new KAction( i18n( "&Configure Summary View..." ), + mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ), "configure", 0, this, TQT_SLOT( slotConfigure() ), actionCollection(), "summaryview_configure" ); diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index 9de42432e..03b37d033 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -46,7 +46,7 @@ namespace KParts class TQFrame; class TQLabel; class TQGridLayout; -class KAction; +class TDEAction; class KCMultiDialog; class SummaryViewPart : public KParts::ReadOnlyPart @@ -95,7 +95,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart TQVBoxLayout *mRightColumn; TQLabel *mUsernameLabel; TQLabel *mDateLabel; - KAction *mConfigAction; + TDEAction *mConfigAction; TQStringList mLeftColumnSummaries; TQStringList mRightColumnSummaries; diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index a7bb89960..21c3a24c5 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -39,7 +39,7 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL { setInstance( SummaryViewFactory::instance() ); - mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, 0, + mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 0, actionCollection(), "kontact_summary_sync" ); connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) ); @@ -90,8 +90,8 @@ void SummaryView::doSync() for ( TQValueList::ConstIterator it = pluginList.begin(), end = pluginList.end(); it != end; ++it ) { // execute all sync actions but our own - TQPtrList *actions = (*it)->syncActions(); - for ( TQPtrList::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) { + TQPtrList *actions = (*it)->syncActions(); + for ( TQPtrList::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) { if ( *jt != mSyncAction ) (*jt)->activate(); } diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h index 336f43dbd..ad14ce2ec 100644 --- a/kontact/plugins/summary/summaryview_plugin.h +++ b/kontact/plugins/summary/summaryview_plugin.h @@ -28,7 +28,7 @@ #include -class KSelectAction; +class TDESelectAction; class SummaryViewPart; @@ -57,7 +57,7 @@ class SummaryView : public Kontact::Plugin private: TDEAboutData *mAboutData; SummaryViewPart *mPart; - KSelectAction *mSyncAction; + TDESelectAction *mSyncAction; }; #endif -- cgit v1.2.1