From 998ebd2e683e45140493910f76e692e96887b5d2 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 4 Jul 2012 16:46:19 -0500 Subject: Fix help files, kdevelop->tdevelop branding, fix startup. --- src/Mainpage.dox | 4 ++-- src/kdevideextension.cpp | 2 +- src/languageselectwidget.cpp | 10 +++++----- src/main.cpp | 6 +++--- src/main_assistant.cpp | 6 +++--- src/mainwindowshare.cpp | 6 +++--- src/plugincontroller.cpp | 6 +++--- src/profileengine/editor/main.cpp | 2 +- src/profileengine/editor/profileeditor.cpp | 10 +++++----- src/profileengine/lib/Mainpage.dox | 2 +- src/profileengine/lib/profile.h | 2 +- src/profileengine/lib/profileengine.cpp | 26 +++++++++++++------------- src/profiles/IDE/profile.config | 4 ++-- src/profiles/KDevAssistant/profile.config | 4 ++-- src/profiles/profile.config | 4 ++-- src/projectmanager.cpp | 6 +++--- 16 files changed, 50 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 9eddd809..135e65e4 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -1,7 +1,7 @@ /** @mainpage The KDevelop Generic Shell -This library contains the Shell - a profile-based implementation of KDevelop plugin architecture. +This library contains the Shell - a profile-based implementation of TDevelop plugin architecture. Link with: -lkdevshell @@ -9,7 +9,7 @@ This library contains the Shell - a profile-based implementation of KDevelop plu \section creatingapp Creating an application using generic shell KDevelop platform applications can use generic shell as a ready to use implementation -of KDevelop plugin architecture. +of TDevelop plugin architecture. This is done by creating application %main.cpp file and @ref ShellExtension subclass. Example: diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index 0f31d40e..3a6cdf2c 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -108,7 +108,7 @@ void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) //current item id must be in sync with the enum! config->writeEntry("CompilerOutputLevel",gsw->compileOutputCombo->currentItem()); config->sync(); - if( KDevPlugin *makeExt = API::getInstance()->pluginController()->extension("KDevelop/MakeFrontend")) + if( KDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend")) { static_cast(makeExt)->updateSettingsFromConfig(); } diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index b3950615..51cb3901 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -106,9 +106,9 @@ LanguageSelectWidget::~LanguageSelectWidget() void LanguageSelectWidget::readProjectConfig() { KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), - TQString::fromLatin1("[X-KDevelop-Version] == %1" - ).arg( KDEVELOP_PLUGIN_VERSION )); + KTrader::self()->query(TQString::fromLatin1("TDevelop/LanguageSupport"), + TQString::fromLatin1("[X-TDevelop-Version] == %1" + ).arg( TDEVELOP_PLUGIN_VERSION )); TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language"); TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage"); @@ -116,10 +116,10 @@ void LanguageSelectWidget::readProjectConfig() for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it) { - TQString la = (*it)->property("X-KDevelop-Language").toString(); + TQString la = (*it)->property("X-TDevelop-Language").toString(); if (la == language) continue; - LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-KDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() ); + LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-TDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() ); item->setOn(languages.contains(la)); } diff --git a/src/main.cpp b/src/main.cpp index 44ea0a0e..a0711997 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,10 +29,10 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - static const char description[] = I18N_NOOP("The KDevelop Integrated Development Environment"); - KAboutData aboutData("tdevelop", I18N_NOOP("KDevelop"), + static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment"); + KAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"), VERSION, description, KAboutData::License_GPL, - I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.tdevelop.org"); + I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de"); aboutData.addAuthor("David Nolden", I18N_NOOP("Advanced C++ code completion, C++ support, overall improvements"), "david.nolden.tdevelop@art-master.de"); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 6c0fbd9b..b4b22221 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -29,10 +29,10 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - static const char description[] = I18N_NOOP("The KDevelop Integrated Development Environment:\nassistant and documentation viewer"); - KAboutData aboutData("kdevassistant", I18N_NOOP("KDevelop Assistant"), + static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer"); + KAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"), VERSION, description, KAboutData::License_GPL, - I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.tdevelop.org"); + I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org"); aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de"); aboutData.addAuthor("Bernd Gehrmann", I18N_NOOP("Initial idea, basic architecture, much initial source code"), "bernd@tdevelop.org"); diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 922ccd26..6386f211 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -149,8 +149,8 @@ void MainWindowShare::createActions() action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), m_pMainWnd->actionCollection(), "settings_configure" ); - action->setToolTip( i18n( "Configure KDevelop" ) ); - action->setWhatsThis(TQString("%1

%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop."))); + action->setToolTip( i18n( "Configure TDevelop" ) ); + action->setWhatsThis(TQString("%1

%2").arg(i18n( "Configure TDevelop" )).arg(i18n("Lets you customize TDevelop."))); m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); @@ -295,7 +295,7 @@ void MainWindowShare::slotConfigureNotifications() void MainWindowShare::slotSettings() { - KDialogBase dlg(KDialogBase::IconList, i18n("Configure KDevelop"), + KDialogBase dlg(KDialogBase::IconList, i18n("Configure TDevelop"), KDialogBase::Help|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, m_pMainWnd, "customization dialog"); dlg.setHelp("setup"); diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 6639375b..6d579346 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -49,7 +49,7 @@ namespace template ComponentType *loadDefaultPart( const TQString &serviceType ) { - KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); + KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = offers.begin(); for ( ; serviceIt != offers.end(); ++serviceIt ) { KService::Ptr service = *serviceIt; @@ -173,7 +173,7 @@ void PluginController::unloadProjectPlugins( ) { // this is nasty, but we need to unload the version control plugin too, and the // right moment to do this is here - KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", ""); + KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl", ""); offers += m_engine.offers(m_profile, ProfileEngine::Project); for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) @@ -232,7 +232,7 @@ TQStringList PluginController::argumentsFromService( const KService::Ptr &servic if ( !service ) // service is a reference to a pointer, so a check whether it is 0 is still required return args; - TQVariant prop = service->property( "X-KDevelop-Args" ); + TQVariant prop = service->property( "X-TDevelop-Args" ); if ( prop.isValid() ) args = TQStringList::split( " ", prop.toString() ); return args; diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp index baac2e80..eeff6afc 100644 --- a/src/profileengine/editor/main.cpp +++ b/src/profileengine/editor/main.cpp @@ -30,7 +30,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kdevprofileeditor", I18N_NOOP("KDevelop Profile Editor"), "1", "", + KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org"); KCmdLineArgs::init(argc, argv, &about); diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 0383f332..435e9986 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -115,11 +115,11 @@ void ProfileEditor::refresh() void ProfileEditor::refreshPropertyCombo() { - KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin")); + KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin")); TQStringList props; for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it) { - TQStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList(); + TQStringList currProps = (*it)->property("X-TDevelop-Properties").toStringList(); for (TQStringList::const_iterator p = currProps.constBegin(); p != currProps.constEnd(); ++p) if (!props.contains(*p)) @@ -209,19 +209,19 @@ void ProfileEditor::fillPluginsList(Profile *profile) for (KTrader::OfferList::const_iterator it = coreOffers.constBegin(); it != coreOffers.constEnd(); ++it) new KListViewItem(core, (*it)->desktopEntryName(), (*it)->genericName(), - (*it)->property("X-KDevelop-Properties").toStringList().join(", ")); + (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); KTrader::OfferList globalOffers = engine.offers(profile->name(), ProfileEngine::Global); for (KTrader::OfferList::const_iterator it = globalOffers.constBegin(); it != globalOffers.constEnd(); ++it) new KListViewItem(global, (*it)->desktopEntryName(), (*it)->genericName(), - (*it)->property("X-KDevelop-Properties").toStringList().join(", ")); + (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); KTrader::OfferList projectOffers = engine.offers(profile->name(), ProfileEngine::Project); for (KTrader::OfferList::const_iterator it = projectOffers.constBegin(); it != projectOffers.constEnd(); ++it) new KListViewItem(project, (*it)->desktopEntryName(), (*it)->genericName(), - (*it)->property("X-KDevelop-Properties").toStringList().join(", ")); + (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); } void ProfileEditor::propertyExecuted(TQListBoxItem *item) diff --git a/src/profileengine/lib/Mainpage.dox b/src/profileengine/lib/Mainpage.dox index 88a443dc..eb242dd9 100644 --- a/src/profileengine/lib/Mainpage.dox +++ b/src/profileengine/lib/Mainpage.dox @@ -1,7 +1,7 @@ /** @mainpage The KDevelop Shell Profiles Library -This library contains plugin profiles engine for KDevelop shell. +This library contains plugin profiles engine for TDevelop shell. Link with: -lprofileengine diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h index 857ddf39..dcdc369b 100644 --- a/src/profileengine/lib/profile.h +++ b/src/profileengine/lib/profile.h @@ -40,7 +40,7 @@ public: /**Lists which are held by a profile.*/ enum List { - Properties /**list(Profile::Properties); int i = 0; for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it) - constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). + constraint_add += TQString::fromLatin1(" %1 '%2' in [X-TDevelop-Properties]"). arg((i++)==0?"":"or").arg((*it).name); if (!constraint_add.isEmpty()) constraint += " and ( " + constraint_add + " ) "; @@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType << " " << constraint << endl << endl << endl;*/ //END debug - KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); + KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint); TQStringList names; /* Wrong, this is not what we want to do. @@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType { if (names.contains((*it).name)) continue; - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION); constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name); - KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); + KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint); list += enable; } @@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType KTrader::OfferList ProfileEngine::allOffers(OfferType offerType) { - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Core'"); break; } - return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); + return KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint); } void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile, diff --git a/src/profiles/IDE/profile.config b/src/profiles/IDE/profile.config index 0bb6b317..b4423c8b 100644 --- a/src/profiles/IDE/profile.config +++ b/src/profiles/IDE/profile.config @@ -5,8 +5,8 @@ List= List= [Information] -Description=Generic KDevelop IDE profile -GenericName=KDevelop IDE +Description=Generic TDevelop IDE profile +GenericName=TDevelop IDE [Properties] List=AdditionalTools,CodeEditing,CodeNavigation,Console,Documentation,EditorChooser,FileCreation,FileReplace,FileSearch,GlobalFileManagement,OpenFileNavigation,OptionalCodeEditing,OutputTool,ProjectCreation,ProjectFileGroupsManagement,ProjectFileManagement,UISwitching,ViewManagement,CVSService,ClearcaseVCS,PerforceVCS,SubversionVCS,ProjectPackaging,VCS diff --git a/src/profiles/KDevAssistant/profile.config b/src/profiles/KDevAssistant/profile.config index dc1435a9..46edc970 100644 --- a/src/profiles/KDevAssistant/profile.config +++ b/src/profiles/KDevAssistant/profile.config @@ -5,8 +5,8 @@ List= List= [Information] -Description=KDevelop Assistant profile -GenericName=KDevelop Assistant +Description=TDevelop Assistant profile +GenericName=TDevelop Assistant [Properties] List=GlobalFileManagement,Documentation,UISwitching,ViewManagement diff --git a/src/profiles/profile.config b/src/profiles/profile.config index 9d884533..00654b45 100644 --- a/src/profiles/profile.config +++ b/src/profiles/profile.config @@ -1,3 +1,3 @@ [Information] -GenericName=KDevelop -Description=Default KDevelop profile +GenericName=TDevelop +Description=Default TDevelop profile diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 8c05e84a..91d4d59a 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -536,8 +536,8 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) } KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), - TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::fromLatin1("TDevelop/LanguageSupport"), + TQString::fromLatin1("[X-TDevelop-Language] == '%1' and [X-TDevelop-Version] == %2").arg(lang).arg(TDEVELOP_PLUGIN_VERSION)); if (languageSupportOffers.isEmpty()) { KMessageBox::sorry(TopLevel::getInstance()->main(), @@ -662,7 +662,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) // kdDebug() << "IDX: " << idx << " PROFILE: " << profiles[idx] << endl; // return profiles[idx]; // } -// return "KDevelop"; +// return "TDevelop"; // } #include "projectmanager.moc" -- cgit v1.2.3