diff options
Diffstat (limited to 'tdecore/tdeaboutdata.cpp')
-rw-r--r-- | tdecore/tdeaboutdata.cpp | 149 |
1 files changed, 60 insertions, 89 deletions
diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp index 3a147842a..2e58ed283 100644 --- a/tdecore/tdeaboutdata.cpp +++ b/tdecore/tdeaboutdata.cpp @@ -34,10 +34,7 @@ TDEAboutPerson::name() const TQString TDEAboutPerson::task() const { - if (mTask && *mTask) - return i18n(mTask); - else - return TQString::null; + return i18n(mTask); } TQString @@ -77,76 +74,66 @@ public: TDEAboutDataPrivate() : translatorName("_: NAME OF TRANSLATORS\nYour names") , translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails") - , productName(0) - , programLogo(0) , customAuthorTextEnabled(false) - , mTranslatedProgramName( 0 ) {} - ~TDEAboutDataPrivate() - { - delete programLogo; - delete[] mTranslatedProgramName; - } - const char *translatorName; - const char *translatorEmail; - const char *productName; - TQImage* programLogo; + + TQCString translatorName; + TQCString translatorEmail; + TQCString productName; + TQImage programLogo; TQString customAuthorPlainText, customAuthorRichText; bool customAuthorTextEnabled; - const char *mTranslatedProgramName; + TQCString mTranslatedProgramName; }; -const char *TDEAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org"; - -TDEAboutData::TDEAboutData( const char *appName, - const char *programName, - const char *version, - const char *shortDescription, - int licenseType, - const char *copyrightStatement, - const char *text, - const char *homePageAddress, - const char *bugsEmailAddress - ) : - mProgramName( programName ), - mVersion( version ), - mShortDescription( shortDescription ), - mLicenseKey( licenseType ), - mCopyrightStatement( copyrightStatement ), - mOtherText( text ), - mHomepageAddress( homePageAddress ), - mBugEmailAddress( (bugsEmailAddress!=0)?bugsEmailAddress:defaultBugTracker ), - mLicenseText (0) -{ - d = new TDEAboutDataPrivate; - - if( appName ) { - const char *p = strrchr(appName, '/'); - if( p ) - mAppName = p+1; - else - mAppName = appName; - } else - mAppName = 0; +TQCString TDEAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org"; + +TDEAboutData::TDEAboutData(const char *appName, + const char *programName, + const char *version, + const char *shortDescription, + int licenseType, + const char *copyrightStatement, + const char *text, + const char *homePageAddress, + const char *bugsEmailAddress) + : mProgramName( programName ), + mVersion( version ), + mShortDescription( shortDescription ), + mLicenseKey( licenseType ), + mCopyrightStatement( copyrightStatement ), + mOtherText( text ), + mHomepageAddress( homePageAddress ), + mBugEmailAddress( (bugsEmailAddress != nullptr) ? TQCString(bugsEmailAddress) : TQCString(defaultBugTracker) ), + mLicenseText() +{ + d = new TDEAboutDataPrivate; + + if( appName ) { + const char *p = strrchr(appName, '/'); + if( p ) + mAppName = p+1; + else + mAppName = appName; + } else + mAppName = TQCString(); } TDEAboutData::~TDEAboutData() { - if (mLicenseKey == License_File) - delete [] mLicenseText; delete d; } void TDEAboutData::addAuthor( const char *name, const char *task, - const char *emailAddress, const char *webAddress ) + const char *emailAddress, const char *webAddress ) { mAuthorList.append(TDEAboutPerson(name,task,emailAddress,webAddress)); } void TDEAboutData::addCredit( const char *name, const char *task, - const char *emailAddress, const char *webAddress ) + const char *emailAddress, const char *webAddress ) { mCreditList.append(TDEAboutPerson(name,task,emailAddress,webAddress)); } @@ -242,28 +229,25 @@ TDEAboutData::appName() const const char * TDEAboutData::productName() const { - if (d->productName) - return d->productName; - else - return appName(); + if (!d->productName.isEmpty()) + return d->productName; + else + return appName(); } TQString TDEAboutData::programName() const { - if (mProgramName && *mProgramName) - return i18n(mProgramName); - else - return TQString::null; + return i18n(mProgramName); } const char* TDEAboutData::internalProgramName() const { - if (d->mTranslatedProgramName) - return d->mTranslatedProgramName; - else - return mProgramName; + if (!d->mTranslatedProgramName.isEmpty()) + return d->mTranslatedProgramName; + else + return mProgramName; } // TDECrash should call as few things as possible and should avoid e.g. malloc() @@ -272,8 +256,7 @@ TDEAboutData::internalProgramName() const void TDEAboutData::translateInternalProgramName() const { - delete[] d->mTranslatedProgramName; - d->mTranslatedProgramName = 0; + d->mTranslatedProgramName = TQCString(); if( TDEGlobal::locale() ) d->mTranslatedProgramName = tqstrdup( programName().utf8()); } @@ -281,16 +264,13 @@ TDEAboutData::translateInternalProgramName() const TQImage TDEAboutData::programLogo() const { - return d->programLogo ? (*d->programLogo) : TQImage(); + return d->programLogo; } void TDEAboutData::setProgramLogo(const TQImage& image) { - if (!d->programLogo) - d->programLogo = new TQImage( image ); - else - *d->programLogo = image; + d->programLogo = image; } TQString @@ -302,10 +282,7 @@ TDEAboutData::version() const TQString TDEAboutData::shortDescription() const { - if (mShortDescription && *mShortDescription) - return i18n(mShortDescription); - else - return TQString::null; + return i18n(mShortDescription); } TQString @@ -337,7 +314,7 @@ TDEAboutData::translators() const { TQValueList<TDEAboutTranslator> personList; - if(d->translatorName == 0) + if(d->translatorName.isEmpty()) return personList; TQStringList nameList; @@ -350,7 +327,7 @@ TDEAboutData::translators() const } - if(d->translatorEmail) + if(!d->translatorEmail.isEmpty()) { TQString emails = i18n(d->translatorEmail); @@ -397,10 +374,7 @@ TDEAboutData::aboutTranslationTeam() TQString TDEAboutData::otherText() const { - if (mOtherText && *mOtherText) - return i18n(mOtherText); - else - return TQString::null; + return i18n(mOtherText); } @@ -447,7 +421,7 @@ TDEAboutData::license() const f = locate("data", "LICENSES/QPL_V1.0"); break; case License_Custom: - if (mLicenseText && *mLicenseText) + if (!mLicenseText.isEmpty()) return( i18n(mLicenseText) ); // fall through default: @@ -478,10 +452,7 @@ TDEAboutData::license() const TQString TDEAboutData::copyrightStatement() const { - if (mCopyrightStatement && *mCopyrightStatement) - return i18n(mCopyrightStatement); - else - return TQString::null; + return i18n(mCopyrightStatement); } TQString @@ -501,7 +472,7 @@ TDEAboutData::customAuthorTextEnabled() const { return d->customAuthorTextEnabled; } - + void TDEAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText) { @@ -510,7 +481,7 @@ TDEAboutData::setCustomAuthorText(const TQString &plainText, const TQString &ric d->customAuthorTextEnabled = true; } - + void TDEAboutData::unsetCustomAuthorText() { |