summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/coreplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-01-23 09:09:46 +0100
committerhjk <hjk@qt.io>2018-01-23 09:18:55 +0000
commit2b76504bd2c764f1a01b1a5e474307be110b84c5 (patch)
treef7f1a476c91ed7a039c2a04d4fd69563ef0686a0 /src/plugins/coreplugin/coreplugin.cpp
parentfba61c5b55052c382e030748fa6e2703abb5401d (diff)
downloadqt-creator-2b76504bd2c764f1a01b1a5e474307be110b84c5.tar.gz
DesignMode: Apply 'static pattern'
Also: - and replace some occurrences of DesignMode::instance()->id() by Core::Constants::MODE_DESIGN for less dependence on the lifetime of the DesignMode object (and less indirection) - remove storage if DesignMode::instance() values when direct use of the static functions suffice - remove some unused items from the interface - use member-initialization in DesignMode::Private. Change-Id: Ie66c06da0fc0a3ccc588b8079e51db6b39284152 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/coreplugin.cpp')
-rw-r--r--src/plugins/coreplugin/coreplugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 577a9f9487..379e198d13 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -91,7 +91,7 @@ CorePlugin::~CorePlugin()
}
if (m_designMode) {
- if (m_designMode->designModeIsRequired())
+ if (DesignMode::designModeIsRequired())
removeObject(m_designMode);
delete m_designMode;
}
@@ -226,7 +226,7 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
void CorePlugin::extensionsInitialized()
{
- if (m_designMode->designModeIsRequired())
+ if (DesignMode::designModeIsRequired())
addObject(m_designMode);
Find::extensionsInitialized();
m_locator->extensionsInitialized();