Rename KInstance and KAboutData to avoid conflicts with KDE4

12 years ago · ff532ebe07
parent 3590fc4597
commit ff532ebe07
2 changed files with 3 additions and 3 deletions
--- 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" );

--- 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();