From ff532ebe073eeaa8c43592399f94781d32464820 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:52:29 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kdirstat/kdirstatmain.cpp | 4 ++-- kdirstat/kfeedback.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kdirstat/kdirstatmain.cpp b/kdirstat/kdirstatmain.cpp index 383c8de..47ea5d0 100644 --- a/kdirstat/kdirstatmain.cpp +++ b/kdirstat/kdirstatmain.cpp @@ -41,8 +41,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kdirstat", I18N_NOOP("KDirStat"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kdirstat", I18N_NOOP("KDirStat"), + VERSION, description, TDEAboutData::License_GPL, "(c) 1999-2003 Stefan Hundhammer", 0, 0, "sh@suse.de" ); diff --git a/kdirstat/kfeedback.cpp b/kdirstat/kfeedback.cpp index 9b2956e..b8c3fbf 100644 --- a/kdirstat/kfeedback.cpp +++ b/kdirstat/kfeedback.cpp @@ -154,7 +154,7 @@ KFeedbackForm::sendMail() TQString subject; - const KAboutData * aboutData = KGlobal::instance()->aboutData(); + const TDEAboutData * aboutData = KGlobal::instance()->aboutData(); if ( aboutData ) subject = aboutData->programName() + "-" + aboutData->version();