summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/specialdates
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/specialdates
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/specialdates')
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp6
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.h4
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp6
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 7d7cae936..4ce846d06 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -232,11 +232,11 @@ void KCMSDSummary::defaults()
emit changed( true );
}
-const KAboutData* KCMSDSummary::aboutData() const
+const TDEAboutData* KCMSDSummary::aboutData() const
{
- KAboutData *about = new KAboutData( I18N_NOOP( "kcmsdsummary" ),
+ TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmsdsummary" ),
I18N_NOOP( "Special Dates Configuration Dialog" ),
- 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/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index bdff28b70..9a4e56e51 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -31,7 +31,7 @@ class TQButtonGroup;
class TQCheckBox;
class TQSpinBox;
-class KAboutData;
+class TDEAboutData;
class KCMSDSummary : public KCModule
{
@@ -44,7 +44,7 @@ class KCMSDSummary : public KCModule
virtual void load();
virtual void save();
virtual void defaults();
- virtual const KAboutData* aboutData() const;
+ virtual const TDEAboutData* aboutData() const;
private slots:
void modified();
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index c71b9e722..f9d850acc 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -54,14 +54,14 @@ Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidge
return new SDSummaryWidget( this, parentWidget );
}
-const KAboutData *SpecialdatesPlugin::aboutData()
+const TDEAboutData *SpecialdatesPlugin::aboutData()
{
if ( !mAboutData ) {
- mAboutData = new KAboutData( "specialdates",
+ mAboutData = new TDEAboutData( "specialdates",
I18N_NOOP( "Special Dates Summary" ),
"1.0",
I18N_NOOP( "Kontact Special Dates Summary" ),
- KAboutData::License_LGPL,
+ TDEAboutData::License_LGPL,
I18N_NOOP( "(c) 2004-2005 The KDE PIM Team" ) );
mAboutData->addAuthor( "Allen Winter", "Current Maintainer", "winter@kde.org" );
mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" );
diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h
index f1feb68b3..53c0621e4 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.h
+++ b/kontact/plugins/specialdates/specialdates_plugin.h
@@ -37,7 +37,7 @@ class SpecialdatesPlugin : public Kontact::Plugin
int weight() const { return 310; }
- const KAboutData *aboutData();
+ const TDEAboutData *aboutData();
virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
@@ -45,7 +45,7 @@ class SpecialdatesPlugin : public Kontact::Plugin
virtual KParts::ReadOnlyPart *createPart() { return false; }
private:
- KAboutData *mAboutData;
+ TDEAboutData *mAboutData;
};