diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:29 -0600 |
| commit | ff532ebe073eeaa8c43592399f94781d32464820 (patch) | |
| tree | 58366aece182d1d6c2319133a6e97021eb4394c7 /kdirstat | |
| parent | 3590fc459769860dd3f509d6d5a91e388297903e (diff) | |
| download | kdirstat-ff532ebe073eeaa8c43592399f94781d32464820.tar.gz kdirstat-ff532ebe073eeaa8c43592399f94781d32464820.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdirstat')
| -rw-r--r-- | kdirstat/kdirstatmain.cpp | 4 | ||||
| -rw-r--r-- | 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(); |