From 063251ebbc6d896bc19fc54fe8626ae05412aae3 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 30 Jan 2015 11:02:24 +0100 Subject: Port to new connect api Change-Id: I873a36601d54065b61d0666558b93dc839ad0dfc Reviewed-by: hjk --- src/plugins/cpptools/cpptoolsplugin.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp') diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 532ef6b02a..b12170c9d7 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -152,11 +152,11 @@ 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)); @@ -184,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); @@ -192,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", -- cgit v1.2.1