diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
| commit | 3a044decb0a5d7be822c888b2d5374573d7df96e (patch) | |
| tree | ddf4681e0233c25203fc927596aa7b3bdb5f2efa /lib/interfaces/kdevplugininfo.cpp | |
| parent | 5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff) | |
| download | tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/interfaces/kdevplugininfo.cpp')
| -rw-r--r-- | lib/interfaces/kdevplugininfo.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp index 81d58902..4af7fb8e 100644 --- a/lib/interfaces/kdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -42,7 +42,7 @@ struct KDevPluginInfo::Private { TQValueList<KAboutPerson> m_authors; TQValueList<KAboutPerson> m_credits; - KAboutData *m_data; + TDEAboutData *m_data; }; @@ -67,21 +67,21 @@ KDevPluginInfo::KDevPluginInfo(const TQString &pluginName) TQString lic = offer->property("X-TDevelop-Plugin-License").toString(); if (lic == "GPL") - d->m_licenseType = KAboutData::License_GPL; + d->m_licenseType = TDEAboutData::License_GPL; else if (lic == "LGPL") - d->m_licenseType = KAboutData::License_LGPL; + d->m_licenseType = TDEAboutData::License_LGPL; else if (lic == "BSD") - d->m_licenseType = KAboutData::License_BSD; + d->m_licenseType = TDEAboutData::License_BSD; else if (lic == "QPL") - d->m_licenseType = KAboutData::License_QPL; + d->m_licenseType = TDEAboutData::License_QPL; else if (lic == "Artistic") - d->m_licenseType = KAboutData::License_Artistic; + d->m_licenseType = TDEAboutData::License_Artistic; else if (lic == "Custom") - d->m_licenseType = KAboutData::License_Custom; + d->m_licenseType = TDEAboutData::License_Custom; else - d->m_licenseType = KAboutData::License_Unknown; + d->m_licenseType = TDEAboutData::License_Unknown; - d->m_data = new KAboutData(d->m_pluginName.ascii(), d->m_rawGenericName.ascii(), "1", 0, d->m_licenseType); + d->m_data = new TDEAboutData(d->m_pluginName.ascii(), d->m_rawGenericName.ascii(), "1", 0, d->m_licenseType); } else kdDebug() << "Unable to load information for plugin: " << pluginName @@ -89,7 +89,7 @@ KDevPluginInfo::KDevPluginInfo(const TQString &pluginName) } -KDevPluginInfo::operator KAboutData *() const +KDevPluginInfo::operator TDEAboutData *() const { return d->m_data; } @@ -127,8 +127,8 @@ int KDevPluginInfo::licenseType() const TQString KDevPluginInfo::license() const { KDevPluginInfo &info = *const_cast<KDevPluginInfo*>(this); -// return KAboutData(info).license(); - KAboutData *data = info; +// return TDEAboutData(info).license(); + TDEAboutData *data = info; return data->license(); } |