summaryrefslogtreecommitdiffstats
path: root/kontact/src/kcmkontact.cpp
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/src/kcmkontact.cpp
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src/kcmkontact.cpp')
-rw-r--r--kontact/src/kcmkontact.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 2f5849bf9..9e46eef2d 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -86,11 +86,11 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name )
load();
}
-const KAboutData* KcmKontact::aboutData() const
+const TDEAboutData* KcmKontact::aboutData() const
{
- KAboutData *about = new KAboutData( I18N_NOOP( "kontactconfig" ),
+ TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactconfig" ),
I18N_NOOP( "TDE Kontact" ),
- 0, 0, KAboutData::License_GPL,
+ 0, 0, TDEAboutData::License_GPL,
I18N_NOOP( "(c), 2003 Cornelius Schumacher" ) );
about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );