From 8856e75c203aa69be210b2fee1095ab9761aca7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:08 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kwallet/konfigurator/konfigurator.cpp | 6 +++--- kwallet/main.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kwallet') diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp index 44e2844..3506f58 100644 --- a/kwallet/konfigurator/konfigurator.cpp +++ b/kwallet/konfigurator/konfigurator.cpp @@ -43,10 +43,10 @@ K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet")) KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&) : KCModule(KWalletFactory::instance(), parent, name) { - KAboutData *about = - new KAboutData(I18N_NOOP("kcmkwallet"), + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kcmkwallet"), I18N_NOOP("TDE Wallet Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2003 George Staikos")); about->addAuthor("George Staikos", 0, "staikos@kde.org"); setAboutData( about ); diff --git a/kwallet/main.cpp b/kwallet/main.cpp index 19e452d..7503737 100644 --- a/kwallet/main.cpp +++ b/kwallet/main.cpp @@ -48,9 +48,9 @@ int main(int argc, char **argv) { KCmdLineLastOption }; - KAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1", + TDEAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1", I18N_NOOP("TDE Wallet Management Tool"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2003,2004 George Staikos"), 0, "http://www.kde.org/"); -- cgit v1.2.1