summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/summary
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /kontact/plugins/summary
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/summary')
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp4
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp4
-rw-r--r--kontact/plugins/summary/summaryview_part.h2
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp6
-rw-r--r--kontact/plugins/summary/summaryview_plugin.h4
5 files changed, 10 insertions, 10 deletions
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 80550802e..360da023d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -107,9 +107,9 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
load();
- KAboutData *about = new KAboutData( I18N_NOOP( "kontactsummary" ),
+ TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ),
I18N_NOOP( "TDE Kontact Summary" ),
- 0, 0, KAboutData::License_GPL,
+ 0, 0, TDEAboutData::License_GPL,
I18N_NOOP( "(c), 2004 Tobias Koenig" ) );
about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 01c5a7f13..da0c160dd 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -66,12 +66,12 @@ namespace Kontact
}
SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
- const KAboutData *aboutData,
+ const TDEAboutData *aboutData,
TQObject *parent, const char *name )
: KParts::ReadOnlyPart( parent, name ),
mCore( core ), mFrame( 0 ), mConfigAction( 0 )
{
- setInstance( new KInstance( aboutData ) );
+ setInstance( new TDEInstance( aboutData ) );
loadLayout();
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 9a7b605c7..5b57d45cd 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -56,7 +56,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
public:
SummaryViewPart( Kontact::Core *core, const char *widgetName,
- const KAboutData *aboutData,
+ const TDEAboutData *aboutData,
TQObject *parent = 0, const char *name = 0 );
~SummaryViewPart();
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 74b8e3d76..8f4b7065d 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -106,13 +106,13 @@ KParts::ReadOnlyPart *SummaryView::createPart()
return mPart;
}
-const KAboutData *SummaryView::aboutData()
+const TDEAboutData *SummaryView::aboutData()
{
if ( !mAboutData ) {
- mAboutData = new KAboutData( "kontactsummary", I18N_NOOP("Kontact Summary"),
+ mAboutData = new TDEAboutData( "kontactsummary", I18N_NOOP("Kontact Summary"),
"1.1",
I18N_NOOP("Kontact Summary View"),
- KAboutData::License_LGPL,
+ TDEAboutData::License_LGPL,
I18N_NOOP("(c) 2003 The Kontact developers" ) );
mAboutData->addAuthor( "Sven Lueppken", "", "sven@kde.org" );
mAboutData->addAuthor( "Cornelius Schumacher", "", "schumacher@kde.org" );
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 1be750fe1..450980dc1 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -43,7 +43,7 @@ class SummaryView : public Kontact::Plugin
int weight() const { return 100; }
- const KAboutData *aboutData();
+ const TDEAboutData *aboutData();
protected:
virtual KParts::ReadOnlyPart* createPart();
@@ -55,7 +55,7 @@ class SummaryView : public Kontact::Plugin
void fillSyncActionSubEntries();
private:
- KAboutData *mAboutData;
+ TDEAboutData *mAboutData;
SummaryViewPart *mPart;
KSelectAction *mSyncAction;
};