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 /parts/appwizard | |
| parent | 5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff) | |
| download | tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'parts/appwizard')
| -rw-r--r-- | parts/appwizard/appwizarddlg.cpp | 6 | ||||
| -rw-r--r-- | parts/appwizard/appwizardfactory.cpp | 4 | ||||
| -rw-r--r-- | parts/appwizard/appwizardfactory.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 38dba43f..92632de0 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -511,9 +511,9 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); - // This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE} - // and unsurprisingly, KAboutData doesn't cover every imaginable case. - // These are the licenses known to KDE-3.2 KAboutData, KDevelop doesn't have all of these as prepared options today + // This isn't too pretty, but we have several templates that use TDEAboutData::License_${LICENSE} + // and unsurprisingly, TDEAboutData doesn't cover every imaginable case. + // These are the licenses known to KDE-3.2 TDEAboutData, KDevelop doesn't have all of these as prepared options today TQString license = license_combo->currentText(); if ( license == "GPL" || license == "GPL_V2" || license == "LGPL" || license == "LGPL_V2"|| license == "BSD" || license == "NCSA" || license == "MIT" || license == "Artistic" || diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp index 76b25836..f60a23dc 100644 --- a/parts/appwizard/appwizardfactory.cpp +++ b/parts/appwizard/appwizardfactory.cpp @@ -23,9 +23,9 @@ AppWizardFactory::AppWizardFactory() { } -KInstance *AppWizardFactory::createInstance() +TDEInstance *AppWizardFactory::createInstance() { - KInstance *instance = KDevGenericFactory<AppWizardPart>::createInstance(); + TDEInstance *instance = KDevGenericFactory<AppWizardPart>::createInstance(); KStandardDirs *dirs = instance->dirs(); dirs->addResourceType("apptemplates", KStandardDirs::kde_default("data") + "kdevappwizard/templates/"); dirs->addResourceType("appimports", KStandardDirs::kde_default("data") + "kdevappwizard/imports/"); diff --git a/parts/appwizard/appwizardfactory.h b/parts/appwizard/appwizardfactory.h index 23fdfe29..57af5b3c 100644 --- a/parts/appwizard/appwizardfactory.h +++ b/parts/appwizard/appwizardfactory.h @@ -26,7 +26,7 @@ public: static const KDevPluginInfo *info(); protected: - virtual KInstance *createInstance(); + virtual TDEInstance *createInstance(); }; #endif |