diff options
author | hjk <hjk121@nokiamail.com> | 2013-08-29 19:00:34 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2013-08-30 11:34:39 +0200 |
commit | d66369e21df4629d276dcf394047da5439de3687 (patch) | |
tree | eb4edd3e4b956c5f9ace5385a5cc730a8b19ea87 | |
parent | 975e1be2ab94711e51ec0c24ca3101de9a3a3367 (diff) | |
download | qt-creator-d66369e21df4629d276dcf394047da5439de3687.tar.gz |
Core/Help: Clean up HelpManager interface and users
Change-Id: Ia6edf583f2a002d7c6f4878df670a78614ea087d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
20 files changed, 197 insertions, 231 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index fd0b1cc97a..0a477daee9 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -114,7 +114,7 @@ void CorePlugin::extensionsInitialized() bool CorePlugin::delayedInitialize() { - HelpManager::instance()->setupHelpManager(); + HelpManager::setupHelpManager(); return true; } diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp index 49ca75161e..e2bb16d471 100644 --- a/src/plugins/coreplugin/helpmanager.cpp +++ b/src/plugins/coreplugin/helpmanager.cpp @@ -99,7 +99,7 @@ HelpManager::~HelpManager() delete d; } -HelpManager *HelpManager::instance() +QObject *HelpManager::instance() { Q_ASSERT(m_instance); return m_instance; @@ -145,7 +145,7 @@ void HelpManager::registerDocumentation(const QStringList &files) } } if (docsChanged) - emit documentationChanged(); + emit m_instance->documentationChanged(); } void HelpManager::unregisterDocumentation(const QStringList &nameSpaces) @@ -166,7 +166,7 @@ void HelpManager::unregisterDocumentation(const QStringList &nameSpaces) } } if (docsChanged) - emit documentationChanged(); + emit m_instance->documentationChanged(); } static QUrl buildQUrl(const QString &ns, const QString &folder, @@ -181,7 +181,7 @@ static QUrl buildQUrl(const QString &ns, const QString &folder, } // This should go into Qt 4.8 once we start using it for Qt Creator -QMap<QString, QUrl> HelpManager::linksForKeyword(const QString &key) const +QMap<QString, QUrl> HelpManager::linksForKeyword(const QString &key) { QMap<QString, QUrl> links; if (d->m_needsSetup) @@ -214,7 +214,7 @@ QMap<QString, QUrl> HelpManager::linksForKeyword(const QString &key) const return links; } -QMap<QString, QUrl> HelpManager::linksForIdentifier(const QString &id) const +QMap<QString, QUrl> HelpManager::linksForIdentifier(const QString &id) { if (d->m_needsSetup) return QMap<QString, QUrl>(); @@ -223,7 +223,7 @@ QMap<QString, QUrl> HelpManager::linksForIdentifier(const QString &id) const // This should go into Qt 4.8 once we start using it for Qt Creator QStringList HelpManager::findKeywords(const QString &key, Qt::CaseSensitivity caseSensitivity, - int maxHits) const + int maxHits) { if (d->m_needsSetup) return QStringList(); @@ -267,14 +267,14 @@ QStringList HelpManager::findKeywords(const QString &key, Qt::CaseSensitivity ca return keywordsSorted + keywords.toList(); } -QUrl HelpManager::findFile(const QUrl &url) const +QUrl HelpManager::findFile(const QUrl &url) { if (d->m_needsSetup) return QUrl(); return d->m_helpEngine->findFile(url); } -QByteArray HelpManager::fileData(const QUrl &url) const +QByteArray HelpManager::fileData(const QUrl &url) { if (d->m_needsSetup) return QByteArray(); @@ -283,24 +283,24 @@ QByteArray HelpManager::fileData(const QUrl &url) const void HelpManager::handleHelpRequest(const QString &url) { - emit helpRequested(QUrl(url)); + emit m_instance->helpRequested(QUrl(url)); } -QStringList HelpManager::registeredNamespaces() const +QStringList HelpManager::registeredNamespaces() { if (d->m_needsSetup) return QStringList(); return d->m_helpEngine->registeredDocumentations(); } -QString HelpManager::namespaceFromFile(const QString &file) const +QString HelpManager::namespaceFromFile(const QString &file) { if (d->m_needsSetup) return QString(); return d->m_helpEngine->namespaceName(file); } -QString HelpManager::fileFromNamespace(const QString &nameSpace) const +QString HelpManager::fileFromNamespace(const QString &nameSpace) { if (d->m_needsSetup) return QString(); @@ -314,17 +314,17 @@ void HelpManager::setCustomValue(const QString &key, const QVariant &value) return; } if (d->m_helpEngine->setCustomValue(key, value)) - emit collectionFileChanged(); + emit m_instance->collectionFileChanged(); } -QVariant HelpManager::customValue(const QString &key, const QVariant &value) const +QVariant HelpManager::customValue(const QString &key, const QVariant &value) { if (d->m_needsSetup) return QVariant(); return d->m_helpEngine->customValue(key, value); } -HelpManager::Filters HelpManager::filters() const +HelpManager::Filters HelpManager::filters() { if (d->m_needsSetup) return Filters(); @@ -336,7 +336,7 @@ HelpManager::Filters HelpManager::filters() const return filters; } -HelpManager::Filters HelpManager::fixedFilters() const +HelpManager::Filters HelpManager::fixedFilters() { Filters fixedFilters; if (d->m_needsSetup) @@ -365,7 +365,7 @@ HelpManager::Filters HelpManager::fixedFilters() const return fixedFilters; } -HelpManager::Filters HelpManager::userDefinedFilters() const +HelpManager::Filters HelpManager::userDefinedFilters() { if (d->m_needsSetup) return Filters(); @@ -383,7 +383,7 @@ void HelpManager::removeUserDefinedFilter(const QString &filter) return; if (d->m_helpEngine->removeCustomFilter(filter)) - emit collectionFileChanged(); + emit m_instance->collectionFileChanged(); } void HelpManager::addUserDefinedFilter(const QString &filter, const QStringList &attr) @@ -392,7 +392,7 @@ void HelpManager::addUserDefinedFilter(const QString &filter, const QStringList return; if (d->m_helpEngine->addCustomFilter(filter, attr)) - emit collectionFileChanged(); + emit m_instance->collectionFileChanged(); } // -- private slots @@ -403,7 +403,7 @@ void HelpManager::setupHelpManager() return; d->m_needsSetup = false; - d->m_helpEngine = new QHelpEngineCore(collectionFilePath(), this); + d->m_helpEngine = new QHelpEngineCore(collectionFilePath(), m_instance); d->m_helpEngine->setAutoSaveFilter(false); d->m_helpEngine->setCurrentFilter(tr("Unfiltered")); d->m_helpEngine->setupData(); @@ -425,7 +425,7 @@ void HelpManager::setupHelpManager() for (it = d->m_customValues.constBegin(); it != d->m_customValues.constEnd(); ++it) setCustomValue(it.key(), it.value()); - emit setupFinished(); + emit m_instance->setupFinished(); } // -- private diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h index 5fc41cad29..da11acd994 100644 --- a/src/plugins/coreplugin/helpmanager.h +++ b/src/plugins/coreplugin/helpmanager.h @@ -55,37 +55,37 @@ class CORE_EXPORT HelpManager : public QObject public: typedef QHash<QString, QStringList> Filters; - static HelpManager* instance(); + static QObject *instance(); static QString collectionFilePath(); - void registerDocumentation(const QStringList &fileNames); - void unregisterDocumentation(const QStringList &nameSpaces); + static void registerDocumentation(const QStringList &fileNames); + static void unregisterDocumentation(const QStringList &nameSpaces); - QMap<QString, QUrl> linksForKeyword(const QString &key) const; - QMap<QString, QUrl> linksForIdentifier(const QString &id) const; - QStringList findKeywords(const QString &key, + static QMap<QString, QUrl> linksForKeyword(const QString &key); + static QMap<QString, QUrl> linksForIdentifier(const QString &id); + static QStringList findKeywords(const QString &key, Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive, - int maxHits = INT_MAX) const; + int maxHits = INT_MAX); - QUrl findFile(const QUrl &url) const; - QByteArray fileData(const QUrl &url) const; + static QUrl findFile(const QUrl &url); + static QByteArray fileData(const QUrl &url); - QStringList registeredNamespaces() const; - QString namespaceFromFile(const QString &file) const; - QString fileFromNamespace(const QString &nameSpace) const; + static QStringList registeredNamespaces(); + static QString namespaceFromFile(const QString &file); + static QString fileFromNamespace(const QString &nameSpace); - void setCustomValue(const QString &key, const QVariant &value); - QVariant customValue(const QString &key, const QVariant &value = QVariant()) const; + static void setCustomValue(const QString &key, const QVariant &value); + static QVariant customValue(const QString &key, const QVariant &value = QVariant()); - Filters filters() const; - Filters fixedFilters() const; + static Filters filters(); + static Filters fixedFilters(); - Filters userDefinedFilters() const; - void removeUserDefinedFilter(const QString &filter); - void addUserDefinedFilter(const QString &filter, const QStringList &attr); + static Filters userDefinedFilters(); + static void removeUserDefinedFilter(const QString &filter); + static void addUserDefinedFilter(const QString &filter, const QStringList &attr); public slots: - void handleHelpRequest(const QString &url); + static void handleHelpRequest(const QString &url); signals: void setupFinished(); @@ -95,10 +95,10 @@ signals: private: explicit HelpManager(QObject *parent = 0); - virtual ~HelpManager(); + ~HelpManager(); - void setupHelpManager(); - void verifyDocumenation(); + static void setupHelpManager(); + static void verifyDocumenation(); friend class Core::Internal::CorePlugin; // setupHelpManager friend class Core::Internal::MainWindow; // constructor/destructor }; diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 3e8f4f3ed1..f4fd3e5908 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -422,11 +422,6 @@ MimeDatabase *ICore::mimeDatabase() return m_mainwindow->mimeDatabase(); } -HelpManager *ICore::helpManager() -{ - return m_mainwindow->helpManager(); -} - QSettings *ICore::settings(QSettings::Scope scope) { return m_mainwindow->settings(scope); diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index b7835b99a0..df29a1c0ed 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -53,7 +53,6 @@ class ActionManager; class Context; class EditorManager; class DocumentManager; -class HelpManager; class IContext; class MessageManager; class MimeDatabase; @@ -96,7 +95,6 @@ public: static ProgressManager *progressManager(); static VcsManager *vcsManager(); static MimeDatabase *mimeDatabase(); - static HelpManager *helpManager(); static QSettings *settings(QSettings::Scope scope = QSettings::UserScope); static SettingsDatabase *settingsDatabase(); diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index cf7d3bab47..bd69c13eae 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -79,12 +79,11 @@ void CppHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos) setToolTip(cppElement->tooltip); QStringList candidates = cppElement->helpIdCandidates; candidates.removeDuplicates(); - HelpManager *hm = HelpManager::instance(); foreach (const QString &helpId, candidates) { if (helpId.isEmpty()) continue; - const QMap<QString, QUrl> helpLinks = hm->linksForIdentifier(helpId); + const QMap<QString, QUrl> helpLinks = Core::HelpManager::linksForIdentifier(helpId); if (!helpLinks.isEmpty()) { setLastHelpItemIdentified(TextEditor::HelpItem(helpId, cppElement->helpMark, diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 29f2178984..a4d62a3385 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -479,8 +479,7 @@ void QmlEngine::errorMessageBoxFinished(int result) break; } case QMessageBox::Help: { - Core::HelpManager *helpManager = Core::HelpManager::instance(); - helpManager->handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html")); + Core::HelpManager::handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html")); // fall through } default: diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index 28421c2b39..627aaab13f 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -38,6 +38,7 @@ #include <QKeyEvent> #include <QMessageBox> +using namespace Core; using namespace Help::Internal; DocSettingsPage::DocSettingsPage() @@ -59,11 +60,10 @@ QWidget *DocSettingsPage::createPage(QWidget *parent) m_ui.docsListWidget->installEventFilter(this); - Core::HelpManager *manager = Core::HelpManager::instance(); - const QStringList &nameSpaces = manager->registeredNamespaces(); + const QStringList nameSpaces = HelpManager::registeredNamespaces(); foreach (const QString &nameSpace, nameSpaces) { - addItem(nameSpace, manager->fileFromNamespace(nameSpace)); - m_filesToRegister.insert(nameSpace, manager->fileFromNamespace(nameSpace)); + addItem(nameSpace, HelpManager::fileFromNamespace(nameSpace)); + m_filesToRegister.insert(nameSpace, HelpManager::fileFromNamespace(nameSpace)); } m_filesToUnregister.clear(); @@ -84,10 +84,9 @@ void DocSettingsPage::addDocumentation() m_recentDialogPath = QFileInfo(files.first()).canonicalPath(); NameSpaceToPathHash docsUnableToRegister; - Core::HelpManager *manager = Core::HelpManager::instance(); foreach (const QString &file, files) { const QString filePath = QDir::cleanPath(file); - const QString &nameSpace = manager->namespaceFromFile(filePath); + const QString &nameSpace = HelpManager::namespaceFromFile(filePath); if (nameSpace.isEmpty()) { docsUnableToRegister.insertMulti(QLatin1String("UnknownNamespace"), QDir::toNativeSeparators(filePath)); @@ -150,10 +149,8 @@ void DocSettingsPage::removeDocumentation() void DocSettingsPage::apply() { - Core::HelpManager *manager = Core::HelpManager::instance(); - - manager->unregisterDocumentation(m_filesToUnregister.keys()); - manager->registerDocumentation(m_filesToRegister.values()); + HelpManager::unregisterDocumentation(m_filesToUnregister.keys()); + HelpManager::registerDocumentation(m_filesToRegister.values()); m_filesToUnregister.clear(); } @@ -166,7 +163,7 @@ bool DocSettingsPage::matches(const QString &s) const bool DocSettingsPage::eventFilter(QObject *object, QEvent *event) { if (object != m_ui.docsListWidget) - return Core::IOptionsPage::eventFilter(object, event); + return IOptionsPage::eventFilter(object, event); if (event->type() == QEvent::KeyPress) { QKeyEvent *ke = static_cast<QKeyEvent*>(event); @@ -178,7 +175,7 @@ bool DocSettingsPage::eventFilter(QObject *object, QEvent *event) } } - return Core::IOptionsPage::eventFilter(object, event); + return IOptionsPage::eventFilter(object, event); } void DocSettingsPage::removeDocumentation(const QList<QListWidgetItem*> items) @@ -187,12 +184,11 @@ void DocSettingsPage::removeDocumentation(const QList<QListWidgetItem*> items) return; int row = 0; - Core::HelpManager *manager = Core::HelpManager::instance(); foreach (QListWidgetItem* item, items) { const QString nameSpace = item->text(); m_filesToRegister.remove(nameSpace); - m_filesToUnregister.insertMulti(nameSpace, QDir::cleanPath(manager->fileFromNamespace(nameSpace))); + m_filesToUnregister.insertMulti(nameSpace, QDir::cleanPath(HelpManager::fileFromNamespace(nameSpace))); row = m_ui.docsListWidget->row(item); delete m_ui.docsListWidget->takeItem(row); diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index 023d7a99cd..0a028bb561 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -40,6 +40,7 @@ #include <QMessageBox> using namespace Help::Internal; +using namespace Core; FilterSettingsPage::FilterSettingsPage() { @@ -65,7 +66,7 @@ QWidget *FilterSettingsPage::createPage(QWidget *parent) connect(m_ui.filterAddButton, SIGNAL(clicked()), this, SLOT(addFilter())); connect(m_ui.filterRemoveButton, SIGNAL(clicked()), this, SLOT(removeFilter())); - connect(Core::HelpManager::instance(), SIGNAL(documentationChanged()), + connect(HelpManager::instance(), SIGNAL(documentationChanged()), this, SLOT(updateFilterPage())); if (m_searchKeywords.isEmpty()) { @@ -84,14 +85,13 @@ void FilterSettingsPage::updateFilterPage() QString lastTrUnfiltered; const QString trUnfiltered = tr("Unfiltered"); - Core::HelpManager *manager = Core::HelpManager::instance(); - if (manager->customValue(Help::Constants::WeAddedFilterKey).toInt() == 1) { + if (HelpManager::customValue(Help::Constants::WeAddedFilterKey).toInt() == 1) { lastTrUnfiltered = - manager->customValue(Help::Constants::PreviousFilterNameKey).toString(); + HelpManager::customValue(Help::Constants::PreviousFilterNameKey).toString(); } - Core::HelpManager::Filters filters = manager->userDefinedFilters(); - Core::HelpManager::Filters::const_iterator it; + HelpManager::Filters filters = HelpManager::userDefinedFilters(); + HelpManager::Filters::const_iterator it; for (it = filters.constBegin(); it != filters.constEnd(); ++it) { const QString &filter = it.key(); if (filter == trUnfiltered || filter == lastTrUnfiltered) @@ -104,7 +104,7 @@ void FilterSettingsPage::updateFilterPage() m_ui.filterWidget->addItems(m_filterMap.keys()); QSet<QString> attributes; - filters = manager->filters(); + filters = HelpManager::filters(); for (it = filters.constBegin(); it != filters.constEnd(); ++it) attributes += it.value().toSet(); @@ -213,13 +213,12 @@ void FilterSettingsPage::apply() } if (changed) { - Core::HelpManager *manager = Core::HelpManager::instance(); foreach (const QString &filter, m_removedFilters) - manager->removeUserDefinedFilter(filter); + HelpManager::removeUserDefinedFilter(filter); FilterMap::const_iterator it; for (it = m_filterMap.constBegin(); it != m_filterMap.constEnd(); ++it) - manager->addUserDefinedFilter(it.key(), it.value()); + HelpManager::addUserDefinedFilter(it.key(), it.value()); // emit this signal to the help plugin, since we don't want // to force gui help engine setup if we are not in help mode @@ -229,7 +228,7 @@ void FilterSettingsPage::apply() void FilterSettingsPage::finish() { - disconnect(Core::HelpManager::instance(), SIGNAL(documentationChanged()), + disconnect(HelpManager::instance(), SIGNAL(documentationChanged()), this, SLOT(updateFilterPage())); } diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index 7d951747b0..1fbee2fce5 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -53,6 +53,7 @@ #include <QWebSettings> #endif +using namespace Core; using namespace Help::Internal; GeneralSettingsPage::GeneralSettingsPage() @@ -78,27 +79,25 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent) m_ui->sizeComboBox->setEditable(false); m_ui->styleComboBox->setEditable(false); - Core::HelpManager *manager = Core::HelpManager::instance(); - m_font = qvariant_cast<QFont>(manager->customValue(QLatin1String("font"), - m_font)); + m_font = qvariant_cast<QFont>(HelpManager::customValue(QLatin1String("font"), m_font)); updateFontSize(); updateFontStyle(); updateFontFamily(); - m_homePage = manager->customValue(QLatin1String("HomePage"), QString()) + m_homePage = HelpManager::customValue(QLatin1String("HomePage"), QString()) .toString(); if (m_homePage.isEmpty()) { - m_homePage = manager->customValue(QLatin1String("DefaultHomePage"), + m_homePage = HelpManager::customValue(QLatin1String("DefaultHomePage"), Help::Constants::AboutBlank).toString(); } m_ui->homePageLineEdit->setText(m_homePage); - m_startOption = manager->customValue(QLatin1String("StartOption"), + m_startOption = HelpManager::customValue(QLatin1String("StartOption"), Help::Constants::ShowLastPages).toInt(); m_ui->helpStartComboBox->setCurrentIndex(m_startOption); - m_contextOption = manager->customValue(QLatin1String("ContextHelpOption"), + m_contextOption = HelpManager::customValue(QLatin1String("ContextHelpOption"), Help::Constants::SideBySideIfPossible).toInt(); m_ui->contextHelpComboBox->setCurrentIndex(m_contextOption); @@ -120,7 +119,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent) m_searchKeywords.remove(QLatin1Char('&')); } - m_returnOnClose = manager->customValue(QLatin1String("ReturnOnClose"), + m_returnOnClose = HelpManager::customValue(QLatin1String("ReturnOnClose"), false).toBool(); m_ui->m_returnOnClose->setChecked(m_returnOnClose); @@ -157,10 +156,9 @@ void GeneralSettingsPage::apply() if (weight >= 0) // Weight < 0 asserts... newFont.setWeight(weight); - Core::HelpManager *manager = Core::HelpManager::instance(); if (newFont != m_font) { m_font = newFont; - manager->setCustomValue(QLatin1String("font"), newFont); + HelpManager::setCustomValue(QLatin1String("font"), newFont); emit fontChanged(); } @@ -170,19 +168,19 @@ void GeneralSettingsPage::apply() m_ui->homePageLineEdit->setText(homePage); if (m_homePage != homePage) { m_homePage = homePage; - manager->setCustomValue(QLatin1String("HomePage"), homePage); + HelpManager::setCustomValue(QLatin1String("HomePage"), homePage); } const int startOption = m_ui->helpStartComboBox->currentIndex(); if (m_startOption != startOption) { m_startOption = startOption; - manager->setCustomValue(QLatin1String("StartOption"), startOption); + HelpManager::setCustomValue(QLatin1String("StartOption"), startOption); } const int helpOption = m_ui->contextHelpComboBox->currentIndex(); if (m_contextOption != helpOption) { m_contextOption = helpOption; - manager->setCustomValue(QLatin1String("ContextHelpOption"), helpOption); + HelpManager::setCustomValue(QLatin1String("ContextHelpOption"), helpOption); QSettings *settings = Core::ICore::settings(); settings->beginGroup(QLatin1String(Help::Constants::ID_MODE_HELP)); @@ -195,7 +193,7 @@ void GeneralSettingsPage::apply() const bool close = m_ui->m_returnOnClose->isChecked(); if (m_returnOnClose != close) { m_returnOnClose = close; - manager->setCustomValue(QLatin1String("ReturnOnClose"), close); + HelpManager::setCustomValue(QLatin1String("ReturnOnClose"), close); emit returnOnCloseChanged(); } } @@ -214,9 +212,8 @@ void GeneralSettingsPage::setBlankPage() void GeneralSettingsPage::setDefaultPage() { - const QString &defaultHomePage = Core::HelpManager::instance() - ->customValue(QLatin1String("DefaultHomePage"), QString()).toString(); - m_ui->homePageLineEdit->setText(defaultHomePage); + m_ui->homePageLineEdit->setText( + HelpManager::customValue(QLatin1String("DefaultHomePage"), QString()).toString()); } void GeneralSettingsPage::importBookmarks() diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 7ee6737cdc..934c1b8c5e 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -62,9 +62,9 @@ QList<FilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<Locator::FilterE { QStringList keywords; if (entry.length() < 2) - keywords = Core::HelpManager::instance()->findKeywords(entry, caseSensitivity(entry), 200); + keywords = Core::HelpManager::findKeywords(entry, caseSensitivity(entry), 200); else - keywords = Core::HelpManager::instance()->findKeywords(entry, caseSensitivity(entry)); + keywords = Core::HelpManager::findKeywords(entry, caseSensitivity(entry)); QList<FilterEntry> entries; foreach (const QString &keyword, keywords) { @@ -79,7 +79,7 @@ QList<FilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<Locator::FilterE void HelpIndexFilter::accept(FilterEntry selection) const { const QString &key = selection.displayName; - const QMap<QString, QUrl> &links = Core::HelpManager::instance()->linksForKeyword(key); + const QMap<QString, QUrl> &links = Core::HelpManager::linksForKeyword(key); if (links.size() == 1) { emit linkActivated(links.begin().value()); diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index e77911d42d..a4d259832d 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -150,14 +150,14 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) { Q_UNUSED(arguments) Q_UNUSED(error) - Core::Context globalcontext(Core::Constants::C_GLOBAL); - Core::Context modecontext(Constants::C_MODE_HELP); + Context globalcontext(Core::Constants::C_GLOBAL); + Context modecontext(Constants::C_MODE_HELP); - const QString &locale = Core::ICore::userInterfaceLanguage(); + const QString &locale = ICore::userInterfaceLanguage(); if (!locale.isEmpty()) { QTranslator *qtr = new QTranslator(this); QTranslator *qhelptr = new QTranslator(this); - const QString &creatorTrPath = Core::ICore::resourcePath() + const QString &creatorTrPath = ICore::resourcePath() + QLatin1String("/translations"); const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); const QString &trFile = QLatin1String("assistant_") + locale; @@ -180,19 +180,19 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) SLOT(contextHelpOptionChanged())); connect(m_generalSettingsPage, SIGNAL(returnOnCloseChanged()), this, SLOT(updateCloseButton())); - connect(Core::HelpManager::instance(), SIGNAL(helpRequested(QUrl)), this, + connect(HelpManager::instance(), SIGNAL(helpRequested(QUrl)), this, SLOT(handleHelpRequest(QUrl))); connect(m_filterSettingsPage, SIGNAL(filtersChanged()), this, SLOT(setupHelpEngineIfNeeded())); - connect(Core::HelpManager::instance(), SIGNAL(documentationChanged()), this, + connect(HelpManager::instance(), SIGNAL(documentationChanged()), this, SLOT(setupHelpEngineIfNeeded())); - connect(Core::HelpManager::instance(), SIGNAL(collectionFileChanged()), this, + connect(HelpManager::instance(), SIGNAL(collectionFileChanged()), this, SLOT(setupHelpEngineIfNeeded())); - connect(Core::HelpManager::instance(), SIGNAL(setupFinished()), this, + connect(HelpManager::instance(), SIGNAL(setupFinished()), this, SLOT(unregisterOldQtCreatorDocumentation())); - m_splitter = new Core::MiniSplitter; + m_splitter = new MiniSplitter; m_centralWidget = new Help::Internal::CentralWidget(); connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this, SLOT(updateSideBarSource(QUrl))); @@ -202,21 +202,20 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) // Add Home, Previous and Next actions (used in the toolbar) QAction *action = new QAction(QIcon(QLatin1String(IMAGEPATH "home.png")), tr("Home"), this); - Core::ActionManager::registerAction(action, "Help.Home", globalcontext); + ActionManager::registerAction(action, "Help.Home", globalcontext); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(home())); action = new QAction(QIcon(QLatin1String(IMAGEPATH "previous.png")), tr("Previous Page"), this); - Core::Command *cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Previous"), modecontext); + Command *cmd = ActionManager::registerAction(action, "Help.Previous", modecontext); cmd->setDefaultKeySequence(QKeySequence::Back); action->setEnabled(m_centralWidget->isBackwardAvailable()); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(backward())); connect(m_centralWidget, SIGNAL(backwardAvailable(bool)), action, SLOT(setEnabled(bool))); - action = new QAction(QIcon(QLatin1String(IMAGEPATH "next.png")), tr("Next Page"), - this); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Next"), modecontext); + action = new QAction(QIcon(QLatin1String(IMAGEPATH "next.png")), tr("Next Page"), this); + cmd = ActionManager::registerAction(action, "Help.Next", modecontext); cmd->setDefaultKeySequence(QKeySequence::Forward); action->setEnabled(m_centralWidget->isForwardAvailable()); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(forward())); @@ -225,98 +224,96 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) action = new QAction(QIcon(QLatin1String(IMAGEPATH "bookmark.png")), tr("Add Bookmark"), this); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.AddBookmark"), - modecontext); - cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+M") : tr("Ctrl+M"))); + cmd = ActionManager::registerAction(action, "Help.AddBookmark", modecontext); + cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+M") : tr("Ctrl+M"))); connect(action, SIGNAL(triggered()), this, SLOT(addBookmark())); // Add Contents, Index, and Context menu items and a separator to the Help menu action = new QAction(QIcon::fromTheme(QLatin1String("help-contents")), tr(SB_CONTENTS), this); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Contents"), globalcontext); - Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); + cmd = ActionManager::registerAction(action, "Help.Contents", globalcontext); + ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, SIGNAL(triggered()), this, SLOT(activateContents())); action = new QAction(tr(SB_INDEX), this); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Index"), globalcontext); - Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); + cmd = ActionManager::registerAction(action, "Help.Index", globalcontext); + ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, SIGNAL(triggered()), this, SLOT(activateIndex())); action = new QAction(tr("Context Help"), this); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Context"), globalcontext); - Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); + cmd = ActionManager::registerAction(action, "Help.Context", globalcontext); + ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); cmd->setDefaultKeySequence(QKeySequence(Qt::Key_F1)); connect(action, SIGNAL(triggered()), this, SLOT(activateContext())); if (!Utils::HostOsInfo::isMacHost()) { action = new QAction(this); action->setSeparator(true); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Separator"), globalcontext); - Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); + cmd = ActionManager::registerAction(action, "Help.Separator", globalcontext); + ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); } action = new QAction(tr("Technical Support"), this); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.TechSupport"), globalcontext); - Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); + cmd = ActionManager::registerAction(action, "Help.TechSupport", globalcontext); + ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, SIGNAL(triggered()), this, SLOT(slotOpenSupportPage())); action = new QAction(tr("Report Bug..."), this); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.ReportBug"), globalcontext); - Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); + cmd = ActionManager::registerAction(action, "Help.ReportBug", globalcontext); + ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); connect(action, SIGNAL(triggered()), this, SLOT(slotReportBug())); if (!Utils::HostOsInfo::isMacHost()) { action = new QAction(this); action->setSeparator(true); - cmd = Core::ActionManager::registerAction(action, Core::Id("Help.Separator2"), globalcontext); - Core::ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); + cmd = ActionManager::registerAction(action, "Help.Separator2", globalcontext); + ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP); } action = new QAction(this); - Core::ActionManager::registerAction(action, Core::Constants::PRINT, modecontext); + ActionManager::registerAction(action, Core::Constants::PRINT, modecontext); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(print())); action = new QAction(this); - cmd = Core::ActionManager::registerAction(action, Core::Constants::COPY, modecontext); + cmd = ActionManager::registerAction(action, Core::Constants::COPY, modecontext); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(copy())); action->setText(cmd->action()->text()); action->setIcon(cmd->action()->icon()); - if (Core::ActionContainer *advancedMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED)) { + if (ActionContainer *advancedMenu = ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED)) { // reuse TextEditor constants to avoid a second pair of menu actions action = new QAction(tr("Increase Font Size"), this); - cmd = Core::ActionManager::registerAction(action, TextEditor::Constants::INCREASE_FONT_SIZE, - modecontext); + cmd = ActionManager::registerAction(action, TextEditor::Constants::INCREASE_FONT_SIZE, modecontext); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(zoomIn())); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); action = new QAction(tr("Decrease Font Size"), this); - cmd = Core::ActionManager::registerAction(action, TextEditor::Constants::DECREASE_FONT_SIZE, - modecontext); + cmd = ActionManager::registerAction(action, TextEditor::Constants::DECREASE_FONT_SIZE, modecontext); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(zoomOut())); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); action = new QAction(tr("Reset Font Size"), this); - cmd = Core::ActionManager::registerAction(action, TextEditor::Constants::RESET_FONT_SIZE, - modecontext); + cmd = ActionManager::registerAction(action, TextEditor::Constants::RESET_FONT_SIZE, modecontext); connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(resetZoom())); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); } - if (Core::ActionContainer *windowMenu = Core::ActionManager::actionContainer(Core::Constants::M_WINDOW)) { + if (ActionContainer *windowMenu = ActionManager::actionContainer(Core::Constants::M_WINDOW)) { // reuse EditorManager constants to avoid a second pair of menu actions + // Goto Previous In History Action action = new QAction(QApplication::translate("EditorManager", "Next Open Document in History"), this); - Core::Command *ctrlTab = Core::ActionManager::registerAction(action, Core::Constants::GOTOPREVINHISTORY, - modecontext); // Goto Previous In History Action + Command *ctrlTab = ActionManager::registerAction(action, Core::Constants::GOTOPREVINHISTORY, + modecontext); windowMenu->addAction(ctrlTab, Core::Constants::G_WINDOW_NAVIGATE); connect(action, SIGNAL(triggered()), &OpenPagesManager::instance(), SLOT(gotoPreviousPage())); + // Goto Next In History Action action = new QAction(QApplication::translate("EditorManager", "Previous Open Document in History"), this); - Core::Command *ctrlShiftTab = Core::ActionManager::registerAction(action, Core::Constants::GOTONEXTINHISTORY, - modecontext); // Goto Next In History Action + Command *ctrlShiftTab = ActionManager::registerAction(action, Core::Constants::GOTONEXTINHISTORY, + modecontext); windowMenu->addAction(ctrlShiftTab, Core::Constants::G_WINDOW_NAVIGATE); connect(action, SIGNAL(triggered()), &OpenPagesManager::instance(), SLOT(gotoNextPage())); @@ -344,7 +341,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) if (QLayout *layout = m_centralWidget->layout()) { layout->setSpacing(0); - Core::FindToolBarPlaceHolder *fth = new Core::FindToolBarPlaceHolder(m_centralWidget); + FindToolBarPlaceHolder *fth = new FindToolBarPlaceHolder(m_centralWidget); fth->setObjectName(QLatin1String("HelpFindToolBarPlaceHolder")); layout->addWidget(fth); } @@ -360,8 +357,8 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) SLOT(switchToHelpMode(QUrl))); QDesktopServices::setUrlHandler(QLatin1String("qthelp"), this, "handleHelpRequest"); - connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*, - Core::IMode*)), this, SLOT(modeChanged(Core::IMode*,Core::IMode*))); + connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)), + this, SLOT(modeChanged(Core::IMode*,Core::IMode*))); m_externalWindow = new ExternalHelpWindow; m_mode = new HelpMode; @@ -385,13 +382,13 @@ void HelpPlugin::extensionsInitialized() QStringList filesToRegister; // we might need to register creators inbuild help filesToRegister.append(ICore::documentationPath() + QLatin1String("/qtcreator.qch")); - Core::HelpManager::instance()->registerDocumentation(filesToRegister); + HelpManager::registerDocumentation(filesToRegister); } ExtensionSystem::IPlugin::ShutdownFlag HelpPlugin::aboutToShutdown() { if (m_sideBar) { - QSettings *settings = Core::ICore::settings(); + QSettings *settings = ICore::settings(); m_sideBar->saveSettings(settings, QLatin1String("HelpSideBar")); // keep a boolean value to avoid to modify the sidebar class, at least some qml stuff // depends on the always visible property of the sidebar... @@ -412,73 +409,69 @@ void HelpPlugin::unregisterOldQtCreatorDocumentation() const QString &nsInternal = QString::fromLatin1("org.qt-project.qtcreator.%1%2%3") .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE); - Core::HelpManager *helpManager = Core::HelpManager::instance(); QStringList documentationToUnregister; - foreach (const QString &ns, helpManager->registeredNamespaces()) { + foreach (const QString &ns, HelpManager::registeredNamespaces()) { if (ns.startsWith(QLatin1String("org.qt-project.qtcreator.")) && ns != nsInternal) { documentationToUnregister << ns; } } if (!documentationToUnregister.isEmpty()) - helpManager->unregisterDocumentation(documentationToUnregister); + HelpManager::unregisterDocumentation(documentationToUnregister); } void HelpPlugin::setupUi() { // side bar widgets and shortcuts - Core::Context modecontext(Constants::C_MODE_HELP); + Context modecontext(Constants::C_MODE_HELP); IndexWindow *indexWindow = new IndexWindow(); indexWindow->setWindowTitle(tr(SB_INDEX)); - m_indexItem = new Core::SideBarItem(indexWindow, QLatin1String(SB_INDEX)); + m_indexItem = new SideBarItem(indexWindow, QLatin1String(SB_INDEX)); connect(indexWindow, SIGNAL(linkActivated(QUrl)), m_centralWidget, SLOT(setSource(QUrl))); connect(indexWindow, SIGNAL(linksActivated(QMap<QString,QUrl>,QString)), m_centralWidget, SLOT(showTopicChooser(QMap<QString,QUrl>,QString))); - QMap<QString, Core::Command*> shortcutMap; + QMap<QString, Command*> shortcutMap; QShortcut *shortcut = new QShortcut(m_splitter); shortcut->setWhatsThis(tr("Activate Index in Help mode")); - Core::Command* cmd = Core::ActionManager::registerShortcut(shortcut, - Core::Id("Help.IndexShortcut"), modecontext); - cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+I") : tr("Ctrl+Shift+I"))); + Command *cmd = ActionManager::registerShortcut(shortcut, "Help.IndexShortcut", modecontext); + cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+I") : tr("Ctrl+Shift+I"))); connect(shortcut, SIGNAL(activated()), this, SLOT(activateIndex())); shortcutMap.insert(QLatin1String(SB_INDEX), cmd); ContentWindow *contentWindow = new ContentWindow(); contentWindow->setWindowTitle(tr(SB_CONTENTS)); - m_contentItem = new Core::SideBarItem(contentWindow, QLatin1String(SB_CONTENTS)); + m_contentItem = new SideBarItem(contentWindow, QLatin1String(SB_CONTENTS)); connect(contentWindow, SIGNAL(linkActivated(QUrl)), m_centralWidget, SLOT(setSource(QUrl))); shortcut = new QShortcut(m_splitter); shortcut->setWhatsThis(tr("Activate Contents in Help mode")); - cmd = Core::ActionManager::registerShortcut(shortcut, Core::Id("Help.ContentsShortcut"), - modecontext); - cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Shift+C") : tr("Ctrl+Shift+C"))); + cmd = ActionManager::registerShortcut(shortcut, "Help.ContentsShortcut", modecontext); + cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Shift+C") : tr("Ctrl+Shift+C"))); connect(shortcut, SIGNAL(activated()), this, SLOT(activateContents())); shortcutMap.insert(QLatin1String(SB_CONTENTS), cmd); SearchWidget *searchWidget = new SearchWidget(); searchWidget->setWindowTitle(tr(SB_SEARCH)); - m_searchItem = new Core::SideBarItem(searchWidget, QLatin1String(SB_SEARCH)); + m_searchItem = new SideBarItem(searchWidget, QLatin1String(SB_SEARCH)); connect(searchWidget, SIGNAL(linkActivated(QUrl)), m_centralWidget, SLOT(setSourceFromSearch(QUrl))); shortcut = new QShortcut(m_splitter); shortcut->setWhatsThis(tr("Activate Search in Help mode")); - cmd = Core::ActionManager::registerShortcut(shortcut, Core::Id("Help.SearchShortcut"), - modecontext); - cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+/") : tr("Ctrl+Shift+/"))); + cmd = ActionManager::registerShortcut(shortcut, "Help.SearchShortcut", modecontext); + cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+/") : tr("Ctrl+Shift+/"))); connect(shortcut, SIGNAL(activated()), this, SLOT(activateSearch())); shortcutMap.insert(QLatin1String(SB_SEARCH), cmd); BookmarkManager *manager = &LocalHelpManager::bookmarkManager(); BookmarkWidget *bookmarkWidget = new BookmarkWidget(manager, 0, false); bookmarkWidget->setWindowTitle(tr(SB_BOOKMARKS)); - m_bookmarkItem = new Core::SideBarItem(bookmarkWidget, QLatin1String(SB_BOOKMARKS)); + m_bookmarkItem = new SideBarItem(bookmarkWidget, QLatin1String(SB_BOOKMARKS)); connect(bookmarkWidget, SIGNAL(linkActivated(QUrl)), m_centralWidget, SLOT(setSource(QUrl))); connect(bookmarkWidget, SIGNAL(createPage(QUrl,bool)), &OpenPagesManager::instance(), @@ -486,28 +479,26 @@ void HelpPlugin::setupUi() shortcut = new QShortcut(m_splitter); shortcut->setWhatsThis(tr("Activate Bookmarks in Help mode")); - cmd = Core::ActionManager::registerShortcut(shortcut, Core::Id("Help.BookmarkShortcut"), - modecontext); - cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+B") : tr("Ctrl+Shift+B"))); + cmd = ActionManager::registerShortcut(shortcut, "Help.BookmarkShortcut", modecontext); + cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+B") : tr("Ctrl+Shift+B"))); connect(shortcut, SIGNAL(activated()), this, SLOT(activateBookmarks())); shortcutMap.insert(QLatin1String(SB_BOOKMARKS), cmd); QWidget *openPagesWidget = OpenPagesManager::instance().openPagesWidget(); openPagesWidget->setWindowTitle(tr("Open Pages")); - m_openPagesItem = new Core::SideBarItem(openPagesWidget, QLatin1String(SB_OPENPAGES)); + m_openPagesItem = new SideBarItem(openPagesWidget, QLatin1String(SB_OPENPAGES)); shortcut = new QShortcut(m_splitter); shortcut->setWhatsThis(tr("Activate Open Pages in Help mode")); - cmd = Core::ActionManager::registerShortcut(shortcut, Core::Id("Help.PagesShortcut"), - modecontext); - cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+O") : tr("Ctrl+Shift+O"))); + cmd = ActionManager::registerShortcut(shortcut, "Help.PagesShortcut", modecontext); + cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+O") : tr("Ctrl+Shift+O"))); connect(shortcut, SIGNAL(activated()), this, SLOT(activateOpenPages())); shortcutMap.insert(QLatin1String(SB_OPENPAGES), cmd); - QList<Core::SideBarItem*> itemList; + QList<SideBarItem*> itemList; itemList << m_contentItem << m_indexItem << m_searchItem << m_bookmarkItem << m_openPagesItem; - m_sideBar = new Core::SideBar(itemList, QList<Core::SideBarItem*>() + m_sideBar = new SideBar(itemList, QList<SideBarItem*>() << m_contentItem << m_openPagesItem); m_sideBar->setCloseWhenEmpty(true); m_sideBar->setShortcutMap(shortcutMap); @@ -517,14 +508,14 @@ void HelpPlugin::setupUi() m_splitter->insertWidget(0, m_sideBar); m_splitter->setStretchFactor(0, 0); m_splitter->setStretchFactor(1, 1); - m_sideBar->readSettings(Core::ICore::settings(), QLatin1String("HelpSideBar")); + m_sideBar->readSettings(ICore::settings(), QLatin1String("HelpSideBar")); m_splitter->setSizes(QList<int>() << m_sideBar->size().width() << 300); m_toggleSideBarAction = new QAction(QIcon(QLatin1String(Core::Constants::ICON_TOGGLE_SIDEBAR)), tr("Show Sidebar"), this); m_toggleSideBarAction->setCheckable(true); connect(m_toggleSideBarAction, SIGNAL(triggered(bool)), this, SLOT(showHideSidebar())); - cmd = Core::ActionManager::registerAction(m_toggleSideBarAction, Core::Constants::TOGGLE_SIDEBAR, modecontext); + cmd = ActionManager::registerAction(m_toggleSideBarAction, Core::Constants::TOGGLE_SIDEBAR, modecontext); } void HelpPlugin::resetFilter() @@ -602,7 +593,7 @@ void HelpPlugin::createRightPaneContextViewer() rightPaneLayout->setSpacing(0); rightPaneLayout->addWidget(toolBar); rightPaneLayout->addWidget(m_helpViewerForSideBar); - Core::FindToolBarPlaceHolder *fth = new Core::FindToolBarPlaceHolder(m_rightPaneSideBarWidget); + FindToolBarPlaceHolder *fth = new FindToolBarPlaceHolder(m_rightPaneSideBarWidget); fth->setObjectName(QLatin1String("HelpRightPaneFindToolBarPlaceHolder")); rightPaneLayout->addWidget(fth); m_rightPaneSideBarWidget->setFocusProxy(m_helpViewerForSideBar); @@ -611,15 +602,14 @@ void HelpPlugin::createRightPaneContextViewer() agg->add(m_helpViewerForSideBar); agg->add(new HelpViewerFindSupport(m_helpViewerForSideBar)); - Core::Context context(Constants::C_HELP_SIDEBAR); - Core::IContext *icontext = new Core::IContext(this); + Context context(Constants::C_HELP_SIDEBAR); + IContext *icontext = new IContext(this); icontext->setContext(context); icontext->setWidget(m_helpViewerForSideBar); - Core::ICore::addContextObject(icontext); + ICore::addContextObject(icontext); QAction *copy = new QAction(this); - Core::Command *cmd = Core::ActionManager::registerAction(copy, - Core::Constants::COPY, context); + Command *cmd = ActionManager::registerAction(copy, Core::Constants::COPY, context); copy->setText(cmd->action()->text()); copy->setIcon(cmd->action()->icon()); connect(copy, SIGNAL(triggered()), m_helpViewerForSideBar, SLOT(copy())); @@ -634,23 +624,20 @@ void HelpPlugin::createRightPaneContextViewer() connect(m_helpViewerForSideBar, SIGNAL(backwardAvailable(bool)), back, SLOT(setEnabled(bool))); - if (Core::ActionContainer *advancedMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED)) { + if (ActionContainer *advancedMenu = ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED)) { // reuse TextEditor constants to avoid a second pair of menu actions QAction *action = new QAction(tr("Increase Font Size"), this); - cmd = Core::ActionManager::registerAction(action, TextEditor::Constants::INCREASE_FONT_SIZE, - context); + cmd = ActionManager::registerAction(action, TextEditor::Constants::INCREASE_FONT_SIZE, context); connect(action, SIGNAL(triggered()), this, SLOT(scaleRightPaneUp())); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); action = new QAction(tr("Decrease Font Size"), this); - cmd = Core::ActionManager::registerAction(action, TextEditor::Constants::DECREASE_FONT_SIZE, - context); + cmd = ActionManager::registerAction(action, TextEditor::Constants::DECREASE_FONT_SIZE, context); connect(action, SIGNAL(triggered()), this, SLOT(scaleRightPaneDown())); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); action = new QAction(tr("Reset Font Size"), this); - cmd = Core::ActionManager::registerAction(action, TextEditor::Constants::RESET_FONT_SIZE, - context); + cmd = ActionManager::registerAction(action, TextEditor::Constants::RESET_FONT_SIZE, context); connect(action, SIGNAL(triggered()), this, SLOT(resetRightPaneScale())); advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT); } @@ -681,7 +668,7 @@ void HelpPlugin::resetRightPaneScale() void HelpPlugin::activateHelpMode() { if (contextHelpOption() != Help::Constants::ExternalHelpAlways) - Core::ModeManager::activateMode(Id(Constants::ID_MODE_HELP)); + ModeManager::activateMode(Id(Constants::ID_MODE_HELP)); else showExternalWindow(); } @@ -700,7 +687,7 @@ void HelpPlugin::switchToHelpMode(const QUrl &source) void HelpPlugin::slotHideRightPane() { - Core::RightPaneWidget::instance()->setShown(false); + RightPaneWidget::instance()->setShown(false); } void HelpPlugin::showHideSidebar() @@ -716,12 +703,12 @@ void HelpPlugin::showExternalWindow() m_externalWindow->show(); connectExternalHelpWindow(); if (firstTime) - Core::ICore::raiseWindow(Core::ICore::mainWindow()); + ICore::raiseWindow(ICore::mainWindow()); else - Core::ICore::raiseWindow(m_externalWindow); + ICore::raiseWindow(m_externalWindow); } -void HelpPlugin::modeChanged(Core::IMode *mode, Core::IMode *old) +void HelpPlugin::modeChanged(IMode *mode, IMode *old) { if (mode == m_mode) { m_oldMode = old; @@ -748,8 +735,7 @@ void HelpPlugin::updateSideBarSource(const QUrl &newUrl) void HelpPlugin::updateCloseButton() { - Core::HelpManager *manager = Core::HelpManager::instance(); - const bool closeOnReturn = manager->customValue(QLatin1String("ReturnOnClose"), + const bool closeOnReturn = HelpManager::customValue(QLatin1String("ReturnOnClose"), false).toBool(); m_closeButton->setEnabled((OpenPagesManager::instance().pageCount() > 1) | closeOnReturn); @@ -835,7 +821,7 @@ void HelpPlugin::contextHelpOptionChanged() void HelpPlugin::setupHelpEngineIfNeeded() { m_helpManager->setEngineNeedsUpdate(); - if (Core::ModeManager::currentMode() == m_mode + if (ModeManager::currentMode() == m_mode || contextHelpOption() == Help::Constants::ExternalHelpAlways) m_helpManager->setupGuiHelpEngine(); } @@ -900,7 +886,7 @@ void HelpPlugin::activateContext() QMap<QString, QUrl> links; if (IContext *context = Core::ICore::currentContextObject()) { m_idFromContext = context->contextHelpId(); - links = Core::HelpManager::instance()->linksForIdentifier(m_idFromContext); + links = HelpManager::linksForIdentifier(m_idFromContext); if (links.isEmpty()) { // Maybe this is already an URL... QUrl url(m_idFromContext); @@ -1155,7 +1141,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url) return; QString address = url.toString(); - if (!Core::HelpManager::instance()->findFile(url).isValid()) { + if (!HelpManager::findFile(url).isValid()) { if (address.startsWith(QLatin1String("qthelp://org.qt-project.")) || address.startsWith(QLatin1String("qthelp://com.nokia.")) || address.startsWith(QLatin1String("qthelp://com.trolltech."))) { diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp index f4cd9206bf..8bc3471d1e 100644 --- a/src/plugins/help/openpagesmanager.cpp +++ b/src/plugins/help/openpagesmanager.cpp @@ -49,6 +49,7 @@ #include <coreplugin/helpmanager.h> #include <coreplugin/modemanager.h> +using namespace Core; using namespace Help::Internal; OpenPagesManager *OpenPagesManager::m_instance = 0; @@ -235,12 +236,11 @@ void OpenPagesManager::closeCurrentPage() if (indexes.isEmpty()) return; - Core::HelpManager *manager = Core::HelpManager::instance(); - const bool closeOnReturn = manager->customValue(QLatin1String("ReturnOnClose"), + const bool closeOnReturn = HelpManager::customValue(QLatin1String("ReturnOnClose"), false).toBool(); if (m_model->rowCount() == 1 && closeOnReturn) { - Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); + ModeManager::activateMode(Core::Constants::MODE_EDIT); } else { Q_ASSERT(indexes.count() == 1); removePage(indexes.first().row()); diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 3193298a30..7027db7251 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -160,21 +160,21 @@ bool HoverHandler::setQmlTypeHelp(const ScopeChain &scopeChain, const Document:: helpIdPieces.prepend(moduleName); helpIdPieces.prepend(QLatin1String("QML")); helpId = helpIdPieces.join(QLatin1String(".")); - if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) + if (!HelpManager::linksForIdentifier(helpId).isEmpty()) break; if (helpIdPieces.size() > 3) { QString lm = helpIdPieces.value(2); helpIdPieces.removeAt(2); helpId = helpIdPieces.join(QLatin1String(".")); - if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) + if (!HelpManager::linksForIdentifier(helpId).isEmpty()) break; helpIdPieces.replace(1, lm); - if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) + if (!HelpManager::linksForIdentifier(helpId).isEmpty()) break; } helpIdPieces.removeAt(1); helpId = helpIdPieces.join(QLatin1String(".")); - if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) + if (!HelpManager::linksForIdentifier(helpId).isEmpty()) break; return false; } while (0); @@ -483,13 +483,13 @@ bool HoverHandler::setQmlHelpItem(const ScopeChain &scopeChain, do { helpId = QLatin1String("QML.") + moduleName + QLatin1Char('.') + className + QLatin1String("::") + name; - if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) + if (!HelpManager::linksForIdentifier(helpId).isEmpty()) break; helpId = QLatin1String("QML.") + className + QLatin1String("::") + name; - if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) + if (!HelpManager::linksForIdentifier(helpId).isEmpty()) break; helpId = className + QLatin1String("::") + name; - if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) + if (!HelpManager::linksForIdentifier(helpId).isEmpty()) break; helpId.clear(); } while (0); diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index 0dff45f4d5..6282c5c0e6 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -51,6 +51,7 @@ #include <QTcpServer> using namespace Analyzer; +using namespace Core; using namespace ProjectExplorer; namespace QmlProfiler { @@ -75,8 +76,8 @@ public: // QmlProfilerEngine // -QmlProfilerRunControl::QmlProfilerRunControl(const Analyzer::AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration) +QmlProfilerRunControl::QmlProfilerRunControl(const AnalyzerStartParameters &sp, + RunConfiguration *runConfiguration) : AnalyzerRunControl(sp, runConfiguration) , d(new QmlProfilerEnginePrivate) { @@ -215,7 +216,7 @@ void QmlProfilerRunControl::logApplicationMessage(const QString &msg, Utils::Out void QmlProfilerRunControl::wrongSetupMessageBox(const QString &errorMessage) { - QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow()); + QMessageBox *infoBox = new QMessageBox(ICore::mainWindow()); infoBox->setIcon(QMessageBox::Critical); infoBox->setWindowTitle(tr("Qt Creator")); //: %1 is detailed error message @@ -239,15 +240,14 @@ void QmlProfilerRunControl::wrongSetupMessageBox(const QString &errorMessage) void QmlProfilerRunControl::wrongSetupMessageBoxFinished(int button) { if (button == QMessageBox::Help) { - Core::HelpManager *helpManager = Core::HelpManager::instance(); - helpManager->handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html" + HelpManager::handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html" "#setting-up-qml-debugging")); } } void QmlProfilerRunControl::showNonmodalWarning(const QString &warningMsg) { - QMessageBox *noExecWarning = new QMessageBox(Core::ICore::mainWindow()); + QMessageBox *noExecWarning = new QMessageBox(ICore::mainWindow()); noExecWarning->setIcon(QMessageBox::Warning); noExecWarning->setWindowTitle(tr("QML Profiler")); noExecWarning->setText(warningMsg); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index c1f34f1951..5927d7caca 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -587,8 +587,7 @@ QMessageBox *QmlProfilerTool::requestMessageBox() void QmlProfilerTool::handleHelpRequest(const QString &link) { - HelpManager *helpManager = HelpManager::instance(); - helpManager->handleHelpRequest(link); + HelpManager::handleHelpRequest(link); } void QmlProfilerTool::profilerStateChanged() diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp index 3210c1ccbc..5a8587ceda 100644 --- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp +++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp @@ -149,7 +149,7 @@ void ProFileHoverHandler::identifyDocFragment(ProFileHoverHandler::ManualKind ma if (m_manualKind == FunctionManual) { QUrl url(QString::fromLatin1("qthelp://com.trolltech.qmake/qdoc/qmake-%1-reference.html").arg(manualName())); - const QByteArray &html = Core::HelpManager::instance()->fileData(url); + const QByteArray html = Core::HelpManager::fileData(url); Utils::HtmlDocExtractor htmlExtractor; htmlExtractor.setMode(Utils::HtmlDocExtractor::FirstParagraph); diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 0ad1763da3..38186c8b36 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -137,7 +137,7 @@ public slots: if (Core::HelpManager::instance()) { QMutexLocker dataLock(&m_dataMutex); - m_fetchedData = Core::HelpManager::instance()->fileData(url); + m_fetchedData = Core::HelpManager::fileData(url); } m_waitcondition.wakeAll(); } @@ -306,12 +306,12 @@ ExamplesWelcomePage::Id ExamplesWelcomePage::id() const void ExamplesWelcomePage::openSplitHelp(const QUrl &help) { - Core::ICore::helpManager()->handleHelpRequest(help.toString()+QLatin1String("?view=split")); + Core::HelpManager::handleHelpRequest(help.toString()+QLatin1String("?view=split")); } void ExamplesWelcomePage::openHelp(const QUrl &help) { - Core::ICore::helpManager()->handleHelpRequest(help.toString()); + Core::HelpManager::handleHelpRequest(help.toString()); } void ExamplesWelcomePage::openUrl(const QUrl &url) @@ -433,7 +433,7 @@ void ExamplesWelcomePage::openProject(const QString &projectFile, const QStringL project->configureAsExampleProject(platforms); Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); if (help.isValid()) - Core::ICore::helpManager()->handleHelpRequest(help.toString() + QLatin1String("?view=split")); + Core::HelpManager::handleHelpRequest(help.toString() + QLatin1String("?view=split")); } if (!errorMessage.isEmpty()) QMessageBox::critical(Core::ICore::mainWindow(), tr("Failed to Open Project"), errorMessage); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index e23b07768c..cfe894fb40 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -426,8 +426,6 @@ void QtVersionManager::removeVersion(BaseQtVersion *version) void QtVersionManager::updateDocumentation() { - Core::HelpManager *helpManager = Core::HelpManager::instance(); - Q_ASSERT(helpManager); QStringList files; foreach (BaseQtVersion *v, m_versions) { const QStringList docPaths = QStringList() << v->documentationPath() + QLatin1Char('/') @@ -439,7 +437,7 @@ void QtVersionManager::updateDocumentation() files << docPath + helpFile; } } - helpManager->registerDocumentation(files); + Core::HelpManager::registerDocumentation(files); } void QtVersionManager::updateDumpFor(const FileName &qmakeCommand) diff --git a/src/plugins/texteditor/helpitem.cpp b/src/plugins/texteditor/helpitem.cpp index 48ce056510..eca956d29b 100644 --- a/src/plugins/texteditor/helpitem.cpp +++ b/src/plugins/texteditor/helpitem.cpp @@ -99,7 +99,7 @@ QString HelpItem::extractContent(bool extended) const helpLinks.insert(m_helpId, m_helpId); } foreach (const QUrl &url, helpLinks) { - const QString html = QString::fromUtf8(Core::HelpManager::instance()->fileData(url)); + const QString html = QString::fromUtf8(Core::HelpManager::fileData(url)); switch (m_category) { case Brief: contents = htmlExtractor.getClassOrNamespaceBrief(html, m_docMark); @@ -142,6 +142,6 @@ QString HelpItem::extractContent(bool extended) const QMap<QString, QUrl> HelpItem::retrieveHelpLinks() const { if (m_helpLinks.isEmpty()) - m_helpLinks = Core::HelpManager::instance()->linksForIdentifier(m_helpId); + m_helpLinks = Core::HelpManager::linksForIdentifier(m_helpId); return m_helpLinks; } |