summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/editmode.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-11-16 10:52:41 +0200
committerhjk <hjk121@nokiamail.com>2014-11-26 13:46:38 +0100
commit7f341580412847d325ffa4f7a82d27a763ff598f (patch)
treeaa1f40058022372d26876d8ed6b7649425ab3f69 /src/plugins/coreplugin/editmode.cpp
parent6804c2117915e84dd37a793ae5c99321acbdd85b (diff)
downloadqt-creator-7f341580412847d325ffa4f7a82d27a763ff598f.tar.gz
Core: Cosmetics
* Remove redundant namespace qualifiers * Qt5-ify some signal/slot connections * Replace some using Core::Internal with explicit namespace scopes Change-Id: Id1aae05e2c6fc2992c2716e1f8f9e985c6e56122 Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/coreplugin/editmode.cpp')
-rw-r--r--src/plugins/coreplugin/editmode.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 0dbfb62e93..47189e370b 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -44,8 +44,8 @@
#include <QWidget>
#include <QIcon>
-using namespace Core;
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
EditMode::EditMode() :
m_splitter(new MiniSplitter),
@@ -73,7 +73,7 @@ EditMode::EditMode() :
MiniSplitter *splitter = new MiniSplitter;
splitter->setOrientation(Qt::Vertical);
splitter->insertWidget(0, rightPaneSplitter);
- QWidget *outputPane = new Core::OutputPanePlaceHolder(this, splitter);
+ QWidget *outputPane = new OutputPanePlaceHolder(this, splitter);
outputPane->setObjectName(QLatin1String("EditModeOutputPanePlaceHolder"));
splitter->insertWidget(1, outputPane);
splitter->setStretchFactor(0, 3);
@@ -84,8 +84,8 @@ EditMode::EditMode() :
m_splitter->setStretchFactor(0, 0);
m_splitter->setStretchFactor(1, 1);
- connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
- this, SLOT(grabEditorManager(Core::IMode*)));
+ connect(ModeManager::instance(), &ModeManager::currentModeChanged,
+ this, &EditMode::grabEditorManager);
m_splitter->setFocusProxy(editorPlaceHolder);
IContext *modeContextObject = new IContext(this);
@@ -103,7 +103,7 @@ EditMode::~EditMode()
delete m_splitter;
}
-void EditMode::grabEditorManager(Core::IMode *mode)
+void EditMode::grabEditorManager(IMode *mode)
{
if (mode != this)
return;
@@ -111,3 +111,6 @@ void EditMode::grabEditorManager(Core::IMode *mode)
if (EditorManager::currentEditor())
EditorManager::currentEditor()->widget()->setFocus();
}
+
+} // namespace Internal
+} // namespace Core