diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:31 -0600 |
| commit | fcd5041fd6bf0cea48980d8a035468b2cdb5fff2 (patch) | |
| tree | aa0c8d74da1f6fbe13337d07bdf046ef3df80e35 /kaboodle | |
| parent | ce8519b39b2aeaf3ef667afced239d5a4643ef72 (diff) | |
| download | tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.tar.gz tdemultimedia-fcd5041fd6bf0cea48980d8a035468b2cdb5fff2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kaboodle')
| -rw-r--r-- | kaboodle/kaboodle_factory.cpp | 14 | ||||
| -rw-r--r-- | kaboodle/kaboodle_factory.h | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp index 537bdf5c..818145d6 100644 --- a/kaboodle/kaboodle_factory.cpp +++ b/kaboodle/kaboodle_factory.cpp @@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. K_EXPORT_COMPONENT_FACTORY( libkaboodlepart, Kaboodle::KaboodleFactory) -KInstance *Kaboodle::KaboodleFactory::s_instance = 0; -KAboutData *Kaboodle::KaboodleFactory::s_aboutData = 0; +TDEInstance *Kaboodle::KaboodleFactory::s_instance = 0; +TDEAboutData *Kaboodle::KaboodleFactory::s_aboutData = 0; Kaboodle::KaboodleFactory::KaboodleFactory() : KParts::Factory() { @@ -54,21 +54,21 @@ KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent } } -KInstance *Kaboodle::KaboodleFactory::instance() +TDEInstance *Kaboodle::KaboodleFactory::instance() { if(!s_instance) - s_instance = new KInstance(aboutData()); + s_instance = new TDEInstance(aboutData()); return s_instance; } -const KAboutData *Kaboodle::KaboodleFactory::aboutData() +const TDEAboutData *Kaboodle::KaboodleFactory::aboutData() { if(!s_aboutData) { - s_aboutData = new KAboutData("kaboodle", I18N_NOOP("Kaboodle"), "1.7", + s_aboutData = new TDEAboutData("kaboodle", I18N_NOOP("Kaboodle"), "1.7", I18N_NOOP("The Lean TDE Media Player"), - KAboutData::License_BSD, + TDEAboutData::License_BSD, "(c) 2001-2003 Kaboodle developers", 0, "http://www.freekde.org/neil/kaboodle/"); s_aboutData->addCredit("Carsten Pfeiffer", I18N_NOOP("Maintainer"), "pfeiffer@kde.org"); diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 5ee0a1dc..7a85afb8 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -43,12 +43,12 @@ public: virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static const KAboutData *aboutData(); - static KInstance *instance(); + static const TDEAboutData *aboutData(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_aboutData; + static TDEInstance *s_instance; + static TDEAboutData *s_aboutData; }; } |