feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Cosmetics

Browse Source 
* 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>
This commit is contained in:
Orgad Shaneh
2014-11-16 10:52:41 +02:00
committed by hjk
parent 6804c21179
commit 7f34158041
105 changed files with 390 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/coreplugin/designmode.cpp
View File

@@ -56,7 +56,7 @@ enum {
namespace Internal {
class DesignModeCoreListener : public Core::ICoreListener
class DesignModeCoreListener : public ICoreListener
{
public:
DesignModeCoreListener(DesignMode* mode);
@@ -93,7 +93,7 @@ public:
public:
Internal::DesignModeCoreListener *m_coreListener;
QPointer<Core::IEditor> m_currentEditor;
QPointer<IEditor> m_currentEditor;
bool m_isActive;
bool m_isRequired;
QList<DesignEditorInfo*> m_editors;
@@ -124,11 +124,11 @@ DesignMode::DesignMode()
ExtensionSystem::PluginManager::addObject(d->m_coreListener);
connect(EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(currentEditorChanged(Core::IEditor*)));
connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
this, &DesignMode::currentEditorChanged);
connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
this, SLOT(updateContext(Core::IMode*,Core::IMode*)));
connect(ModeManager::instance(), &ModeManager::currentModeChanged,
this, &DesignMode::updateContext);
}
DesignMode::~DesignMode()
@@ -195,7 +195,7 @@ void DesignMode::unregisterDesignWidget(QWidget *widget)
}
// if editor changes, check if we have valid mimetype registered.
void DesignMode::currentEditorChanged(Core::IEditor *editor)
void DesignMode::currentEditorChanged(IEditor *editor)
{
if (editor && (d->m_currentEditor.data() == editor))
return;
@@ -226,7 +226,7 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
if (!mimeEditorAvailable) {
setActiveContext(Context());
if (ModeManager::currentMode() == this)
ModeManager::activateMode(Core::Constants::MODE_EDIT);
ModeManager::activateMode(Constants::MODE_EDIT);
setEnabled(false);
d->m_currentEditor = 0;
emit actionsUpdated(d->m_currentEditor.data());
@@ -245,7 +245,7 @@ void DesignMode::updateActions()
emit actionsUpdated(d->m_currentEditor.data());
}
void DesignMode::updateContext(Core::IMode *newMode, Core::IMode *oldMode)
void DesignMode::updateContext(IMode *newMode, IMode *oldMode)
{
if (newMode == this)
ICore::addAdditionalContext(d->m_activeContext);
@@ -259,7 +259,7 @@ void DesignMode::setActiveContext(const Context &context)
return;
if (ModeManager::currentMode() == this)
Core::ICore::updateAdditionalContexts(d->m_activeContext, context);
ICore::updateAdditionalContexts(d->m_activeContext, context);
d->m_activeContext = context;
}