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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent c9eedbe0f3
commit e1c88116b3
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/modemanager.h
View File

@@ -26,7 +26,9 @@
#pragma once
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
#include <utils/id.h>
#include <QObject>
QT_BEGIN_NAMESPACE
@@ -56,12 +58,12 @@ public:
static ModeManager *instance();
static IMode *currentMode();
static Id currentModeId();
static Utils::Id currentModeId();
static void addAction(QAction *action, int priority);
static void addProjectSelector(QAction *action);
static void activateMode(Id id);
static void activateMode(Utils::Id id);
static void setFocusToCurrentMode();
static Style modeStyle();
@@ -70,10 +72,10 @@ public slots:
static void cycleModeStyle();
signals:
void currentModeAboutToChange(Core::Id mode);
void currentModeAboutToChange(Utils::Id mode);
// the default argument '=0' is important for connects without the oldMode argument.
void currentModeChanged(Core::Id mode, Core::Id oldMode = Core::Id());
void currentModeChanged(Utils::Id mode, Utils::Id oldMode = {});
private:
explicit ModeManager(Internal::MainWindow *mainWindow, Internal::FancyTabWidget *modeStack);