diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /kaddressbook/kcmconfigs | |
parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/kcmconfigs')
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 823f24f7d..296f79553 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -51,9 +51,9 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) load(); - KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabconfig" ), I18N_NOOP( "KAddressBook Configure Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index a3a9ee1be..66fcde2f5 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -52,9 +52,9 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) load(); - KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabldapconfig" ), + TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabldapconfig" ), I18N_NOOP( "KAB LDAP Configure Dialog" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); |