TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

temp commit: api fixes related to python 3 binding issues

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
fix/api-for-python
Michele Calgaro 2 years ago
parent 8d96e85f7d
commit af2ffa121e
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 108 additions and 147 deletions
Show Stats Download Patch File Download Diff File

71
tdecore/tdeaboutdata.cpp
Unescape View File

@ -34,10 +34,7 @@ TDEAboutPerson::name() const
TQString TQString
TDEAboutPerson::task() const TDEAboutPerson::task() const
{ {
if (mTask && *mTask)
return i18n(mTask); return i18n(mTask);
else
return TQString::null;
} }
TQString TQString
@ -77,28 +74,21 @@ public:
TDEAboutDataPrivate() TDEAboutDataPrivate()
: translatorName("_: NAME OF TRANSLATORS\nYour names") : translatorName("_: NAME OF TRANSLATORS\nYour names")
, translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails") , translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails")
, productName(0)
, programLogo(0)
, customAuthorTextEnabled(false) , customAuthorTextEnabled(false)
, mTranslatedProgramName( 0 )
{} {}
~TDEAboutDataPrivate()
{ TQCString translatorName;
delete programLogo; TQCString translatorEmail;
delete[] mTranslatedProgramName; TQCString productName;
} TQImage programLogo;
const char *translatorName;
const char *translatorEmail;
const char *productName;
TQImage* programLogo;
TQString customAuthorPlainText, customAuthorRichText; TQString customAuthorPlainText, customAuthorRichText;
bool customAuthorTextEnabled; bool customAuthorTextEnabled;
const char *mTranslatedProgramName; TQCString mTranslatedProgramName;
}; };
const char *TDEAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org"; TQCString TDEAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org";
TDEAboutData::TDEAboutData( const char *appName, TDEAboutData::TDEAboutData(const char *appName,
const char *programName, const char *programName,
const char *version, const char *version,
const char *shortDescription, const char *shortDescription,
@ -106,17 +96,16 @@ TDEAboutData::TDEAboutData( const char *appName,
const char *copyrightStatement, const char *copyrightStatement,
const char *text, const char *text,
const char *homePageAddress, const char *homePageAddress,
const char *bugsEmailAddress const char *bugsEmailAddress)
) : : mProgramName( programName ),
mProgramName( programName ),
mVersion( version ), mVersion( version ),
mShortDescription( shortDescription ), mShortDescription( shortDescription ),
mLicenseKey( licenseType ), mLicenseKey( licenseType ),
mCopyrightStatement( copyrightStatement ), mCopyrightStatement( copyrightStatement ),
mOtherText( text ), mOtherText( text ),
mHomepageAddress( homePageAddress ), mHomepageAddress( homePageAddress ),
mBugEmailAddress( (bugsEmailAddress!=0)?bugsEmailAddress:defaultBugTracker ), mBugEmailAddress( (bugsEmailAddress != nullptr) ? TQCString(bugsEmailAddress) : TQCString(defaultBugTracker) ),
mLicenseText (0) mLicenseText()
{ {
d = new TDEAboutDataPrivate; d = new TDEAboutDataPrivate;
@ -127,13 +116,11 @@ TDEAboutData::TDEAboutData( const char *appName,
else else
mAppName = appName; mAppName = appName;
} else } else
mAppName = 0; mAppName = TQCString();
} }
TDEAboutData::~TDEAboutData() TDEAboutData::~TDEAboutData()
{ {
if (mLicenseKey == License_File)
delete [] mLicenseText;
delete d; delete d;
} }
@ -242,7 +229,7 @@ TDEAboutData::appName() const
const char * const char *
TDEAboutData::productName() const TDEAboutData::productName() const
{ {
if (d->productName) if (!d->productName.isEmpty())
return d->productName; return d->productName;
else else
return appName(); return appName();
@ -251,16 +238,13 @@ TDEAboutData::productName() const
TQString TQString
TDEAboutData::programName() const TDEAboutData::programName() const
{ {
if (mProgramName && *mProgramName)
return i18n(mProgramName); return i18n(mProgramName);
else
return TQString::null;
} }
const char* const char*
TDEAboutData::internalProgramName() const TDEAboutData::internalProgramName() const
{ {
if (d->mTranslatedProgramName) if (!d->mTranslatedProgramName.isEmpty())
return d->mTranslatedProgramName; return d->mTranslatedProgramName;
else else
return mProgramName; return mProgramName;
@ -272,8 +256,7 @@ TDEAboutData::internalProgramName() const
void void
TDEAboutData::translateInternalProgramName() const TDEAboutData::translateInternalProgramName() const
{ {
delete[] d->mTranslatedProgramName; d->mTranslatedProgramName = TQCString();
d->mTranslatedProgramName = 0;
if( TDEGlobal::locale() ) if( TDEGlobal::locale() )
d->mTranslatedProgramName = tqstrdup( programName().utf8()); d->mTranslatedProgramName = tqstrdup( programName().utf8());
} }
@ -281,16 +264,13 @@ TDEAboutData::translateInternalProgramName() const
TQImage TQImage
TDEAboutData::programLogo() const TDEAboutData::programLogo() const
{ {
return d->programLogo ? (*d->programLogo) : TQImage(); return d->programLogo;
} }
void void
TDEAboutData::setProgramLogo(const TQImage& image) TDEAboutData::setProgramLogo(const TQImage& image)
{ {
if (!d->programLogo) d->programLogo = image;
d->programLogo = new TQImage( image );
else
*d->programLogo = image;
} }
TQString TQString
@ -302,10 +282,7 @@ TDEAboutData::version() const
TQString TQString
TDEAboutData::shortDescription() const TDEAboutData::shortDescription() const
{ {
if (mShortDescription && *mShortDescription)
return i18n(mShortDescription); return i18n(mShortDescription);
else
return TQString::null;
} }
TQString TQString
@ -337,7 +314,7 @@ TDEAboutData::translators() const
{ {
TQValueList<TDEAboutTranslator> personList; TQValueList<TDEAboutTranslator> personList;
if(d->translatorName == 0) if(d->translatorName.isEmpty())
return personList; return personList;
TQStringList nameList; TQStringList nameList;
@ -350,7 +327,7 @@ TDEAboutData::translators() const
} }
if(d->translatorEmail) if(!d->translatorEmail.isEmpty())
{ {
TQString emails = i18n(d->translatorEmail); TQString emails = i18n(d->translatorEmail);
@ -397,10 +374,7 @@ TDEAboutData::aboutTranslationTeam()
TQString TQString
TDEAboutData::otherText() const TDEAboutData::otherText() const
{ {
if (mOtherText && *mOtherText)
return i18n(mOtherText); return i18n(mOtherText);
else
return TQString::null;
} }
@ -447,7 +421,7 @@ TDEAboutData::license() const
f = locate("data", "LICENSES/QPL_V1.0"); f = locate("data", "LICENSES/QPL_V1.0");
break; break;
case License_Custom: case License_Custom:
if (mLicenseText && *mLicenseText) if (!mLicenseText.isEmpty())
return( i18n(mLicenseText) ); return( i18n(mLicenseText) );
// fall through // fall through
default: default:
@ -478,10 +452,7 @@ TDEAboutData::license() const
TQString TQString
TDEAboutData::copyrightStatement() const TDEAboutData::copyrightStatement() const
{ {
if (mCopyrightStatement && *mCopyrightStatement)
return i18n(mCopyrightStatement); return i18n(mCopyrightStatement);
else
return TQString::null;
} }
TQString TQString

56
tdecore/tdeaboutdata.h
Unescape View File

@ -27,7 +27,6 @@
#ifndef _TDEABOUTDATA_H_ #ifndef _TDEABOUTDATA_H_
#define _TDEABOUTDATA_H_ #define _TDEABOUTDATA_H_
class TDEAboutPersonPrivate;
class TDEAboutDataPrivate; class TDEAboutDataPrivate;
/** /**
@ -67,19 +66,14 @@ public:
* *
* @param webAddress Home page of the person. * @param webAddress Home page of the person.
*/ */
TDEAboutPerson( const char *name, const char *task, TDEAboutPerson(const char *name = nullptr, const char *task = nullptr,
const char *emailAddress, const char *webAddress ) const char *emailAddress = nullptr, const char *webAddress = nullptr)
{ {
mName = name; mName = name;
mTask = task; mTask = task;
mEmailAddress = emailAddress; mEmailAddress = emailAddress;
mWebAddress = webAddress; mWebAddress = webAddress;
} }
/**
* @internal
* Don't use. Required by QValueList
*/
TDEAboutPerson() {}
/** /**
* The person's name * The person's name
@ -109,16 +103,13 @@ public:
*/ */
TQString webAddress() const; TQString webAddress() const;
private: protected:
const char *mName; TQCString mName;
const char *mTask; TQCString mTask;
const char *mEmailAddress; TQCString mEmailAddress;
const char *mWebAddress; TQCString mWebAddress;
TDEAboutPersonPrivate *d;
}; };
class TDEAboutTranslatorPrivate;
/** /**
* This structure is used to store information about a translator. * This structure is used to store information about a translator.
* It can store the translator's name and an email address. * It can store the translator's name and an email address.
@ -161,7 +152,6 @@ public:
private: private:
TQString mName; TQString mName;
TQString mEmail; TQString mEmail;
TDEAboutTranslatorPrivate* d;
}; };
@ -237,15 +227,15 @@ class TDECORE_EXPORT TDEAboutData
* This defaults to the trinitydesktop.org bug system. * This defaults to the trinitydesktop.org bug system.
* *
*/ */
TDEAboutData( const char *appName, TDEAboutData(const char *appName,
const char *programName, const char *programName,
const char *version, const char *version,
const char *shortDescription = 0, const char *shortDescription = nullptr,
int licenseType = License_Unknown, int licenseType = License_Unknown,
const char *copyrightStatement = 0, const char *copyrightStatement = nullptr,
const char *text = 0, const char *text = nullptr,
const char *homePageAddress = 0, const char *homePageAddress = nullptr,
const char *bugsEmailAddress = 0 const char *bugsEmailAddress = nullptr
); );
~TDEAboutData(); ~TDEAboutData();
@ -611,19 +601,19 @@ class TDECORE_EXPORT TDEAboutData
void unsetCustomAuthorText(); void unsetCustomAuthorText();
private: private:
const char *mAppName; TQCString mAppName;
const char *mProgramName; TQCString mProgramName;
const char *mVersion; TQCString mVersion;
const char *mShortDescription; TQCString mShortDescription;
int mLicenseKey; int mLicenseKey;
const char *mCopyrightStatement; TQCString mCopyrightStatement;
const char *mOtherText; TQCString mOtherText;
const char *mHomepageAddress; TQCString mHomepageAddress;
const char *mBugEmailAddress; TQCString mBugEmailAddress;
TQValueList<TDEAboutPerson> mAuthorList; TQValueList<TDEAboutPerson> mAuthorList;
TQValueList<TDEAboutPerson> mCreditList; TQValueList<TDEAboutPerson> mCreditList;
const char *mLicenseText; TQCString mLicenseText;
static const char *defaultBugTracker; static TQCString defaultBugTracker;
TDEAboutDataPrivate *d; TDEAboutDataPrivate *d;
}; };

Write Preview
Loading…
Cancel
Save