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

Fix after changing ModeManager::currentModeChanged

Browse Source 
Change-Id: Id71b0992fef9c0cb544d68078fb2b654777f0a2e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-04-12 14:47:15 +02:00
parent 176f925770
commit 9b7fa05bf3
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/helpplugin.cpp
View File

@@ -241,8 +241,8 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
SLOT(showLinkInHelpMode(QUrl))); SLOT(showLinkInHelpMode(QUrl)));
QDesktopServices::setUrlHandler(QLatin1String("qthelp"), HelpManager::instance(), "handleHelpRequest"); QDesktopServices::setUrlHandler(QLatin1String("qthelp"), HelpManager::instance(), "handleHelpRequest");
connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)), connect(ModeManager::instance(), &ModeManager::currentModeChanged,
this, SLOT(modeChanged(Core::IMode*,Core::IMode*))); this, &HelpPlugin::modeChanged);
m_mode = new HelpMode; m_mode = new HelpMode;
m_mode->setWidget(m_centralWidget); m_mode->setWidget(m_centralWidget);
@@ -445,10 +445,10 @@ void HelpPlugin::slotHideRightPane()
RightPaneWidget::instance()->setShown(false); RightPaneWidget::instance()->setShown(false);
} }
void HelpPlugin::modeChanged(IMode *mode, IMode *old) void HelpPlugin::modeChanged(Core::Id mode, Core::Id old)
{ {
Q_UNUSED(old) Q_UNUSED(old)
if (mode == m_mode) { if (mode == m_mode->id()) {
qApp->setOverrideCursor(Qt::WaitCursor); qApp->setOverrideCursor(Qt::WaitCursor);
doSetupIfNeeded(); doSetupIfNeeded();
qApp->restoreOverrideCursor(); qApp->restoreOverrideCursor();

3
src/plugins/help/helpplugin.h
View File

@@ -42,7 +42,6 @@ class QUrl;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Core { namespace Core {
class IMode;
class MiniSplitter; class MiniSplitter;
class SideBar; class SideBar;
class SideBarItem; class SideBarItem;
@@ -79,7 +78,7 @@ public:
static HelpViewer *createHelpViewer(qreal zoom); static HelpViewer *createHelpViewer(qreal zoom);
private slots: private slots:
void modeChanged(Core::IMode *mode, Core::IMode *old); void modeChanged(Core::Id mode, Core::Id old);
void showContextHelp(); void showContextHelp();
void activateIndex(); void activateIndex();

13
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -203,9 +203,8 @@ void QmlDesignerPlugin::createDesignModeWidget()
this, this,
SLOT(onTextEditorsClosed(QList<Core::IEditor*>))); SLOT(onTextEditorsClosed(QList<Core::IEditor*>)));
connect(Core::ModeManager::instance(), connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeChanged,
SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)), this, &QmlDesignerPlugin::onCurrentModeChanged);
SLOT(onCurrentModeChanged(Core::IMode*,Core::IMode*)));
} }
@@ -392,21 +391,21 @@ void QmlDesignerPlugin::onCurrentEditorChanged(Core::IEditor *editor)
} }
} }
static bool isDesignerMode(Core::IMode *mode) static bool isDesignerMode(Core::Id mode)
{ {
return mode == Core::DesignMode::instance(); return mode == Core::DesignMode::instance()->id();
} }
static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::IMode *newMode) static bool documentIsAlreadyOpen(DesignDocument *designDocument, Core::IEditor *editor, Core::Id newMode)
{ {
return designDocument return designDocument
&& editor == designDocument->editor() && editor == designDocument->editor()
&& isDesignerMode(newMode); && isDesignerMode(newMode);
} }
void QmlDesignerPlugin::onCurrentModeChanged(Core::IMode *newMode, Core::IMode *oldMode) void QmlDesignerPlugin::onCurrentModeChanged(Core::Id newMode, Core::Id oldMode)
{ {
if (data if (data
&& Core::EditorManager::currentEditor() && Core::EditorManager::currentEditor()

3
src/plugins/qmldesigner/qmldesignerplugin.h
View File

@@ -44,7 +44,6 @@ QT_END_NAMESPACE
namespace Core { namespace Core {
class IEditor; class IEditor;
class IMode;
} }
namespace QmlDesigner { namespace QmlDesigner {
@@ -90,7 +89,7 @@ private slots:
void switschToTextMode(); void switschToTextMode();
void onTextEditorsClosed(QList<Core::IEditor *> editors); void onTextEditorsClosed(QList<Core::IEditor *> editors);
void onCurrentEditorChanged(Core::IEditor *editor); void onCurrentEditorChanged(Core::IEditor *editor);
void onCurrentModeChanged(Core::IMode *mode, Core::IMode *oldMode); void onCurrentModeChanged(Core::Id mode, Core::Id oldMode);
private: // functions private: // functions
void createDesignModeWidget(); void createDesignModeWidget();