diff options
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 7631da86bc..36c9552260 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -44,6 +44,7 @@ #include "cpptoolsreuse.h" #include "cppprojectfile.h" #include "cpplocatordata.h" +#include "cppincludesfilter.h" #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> @@ -53,6 +54,7 @@ #include <coreplugin/jsexpander.h> #include <coreplugin/vcsmanager.h> #include <cppeditor/cppeditorconstants.h> +#include <projectexplorer/projecttree.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> @@ -150,15 +152,16 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) JsExpander::registerQObjectForJs(QLatin1String("Cpp"), new CppToolsJsExtension); CppLocatorData *locatorData = new CppLocatorData; - connect(modelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)), - locatorData, SLOT(onDocumentUpdated(CPlusPlus::Document::Ptr))); + connect(modelManager, &CppModelManager::documentUpdated, + locatorData, &CppLocatorData::onDocumentUpdated); - connect(modelManager, SIGNAL(aboutToRemoveFiles(QStringList)), - locatorData, SLOT(onAboutToRemoveFiles(QStringList))); + connect(modelManager, &CppModelManager::aboutToRemoveFiles, + locatorData, &CppLocatorData::onAboutToRemoveFiles); addAutoReleasedObject(locatorData); addAutoReleasedObject(new CppLocatorFilter(locatorData)); addAutoReleasedObject(new CppClassesFilter(locatorData)); + addAutoReleasedObject(new CppIncludesFilter); addAutoReleasedObject(new CppFunctionsFilter(locatorData)); addAutoReleasedObject(new CppCurrentDocumentFilter(modelManager, m_stringTable)); addAutoReleasedObject(new CppFileSettingsPage(m_fileSettings)); @@ -181,7 +184,8 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) Command *command = ActionManager::registerAction(switchAction, Constants::SWITCH_HEADER_SOURCE, context, true); command->setDefaultKeySequence(QKeySequence(Qt::Key_F4)); mcpptools->addAction(command); - connect(switchAction, SIGNAL(triggered()), this, SLOT(switchHeaderSource())); + connect(switchAction, &QAction::triggered, + this, &CppToolsPlugin::switchHeaderSource); QAction *openInNextSplitAction = new QAction(tr("Open Corresponding Header/Source in Next Split"), this); command = ActionManager::registerAction(openInNextSplitAction, Constants::OPEN_HEADER_SOURCE_IN_NEXT_SPLIT, context, true); @@ -189,7 +193,8 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) ? tr("Meta+E, F4") : tr("Ctrl+E, F4"))); mcpptools->addAction(command); - connect(openInNextSplitAction, SIGNAL(triggered()), this, SLOT(switchHeaderSourceInNextSplit())); + connect(openInNextSplitAction, &QAction::triggered, + this, &CppToolsPlugin::switchHeaderSourceInNextSplit); Utils::MacroExpander *expander = Utils::globalMacroExpander(); expander->registerVariable("Cpp:LicenseTemplate", @@ -235,7 +240,7 @@ void CppToolsPlugin::switchHeaderSource() void CppToolsPlugin::switchHeaderSourceInNextSplit() { QString otherFile = correspondingHeaderOrSource( - EditorManager::currentDocument()->filePath()); + EditorManager::currentDocument()->filePath().toString()); if (!otherFile.isEmpty()) EditorManager::openEditor(otherFile, Id(), EditorManager::OpenInOtherSplit); } @@ -431,7 +436,7 @@ QString correspondingHeaderOrSource(const QString &fileName, bool *wasHeader) } // Find files in the current project - ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectExplorerPlugin::currentProject(); + ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject(); if (currentProject) { const QString path = correspondingHeaderOrSourceInProject(fi, candidateFileNames, currentProject); |