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

ModeManager: Remove unused constructor argument

Browse Source 
Change-Id: I7856a832db61a27ab5fdabf79ff9a359acdb866a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-10-04 17:01:15 +02:00
parent 58efc778f5
commit 4e8bcc40e7
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/icore.cpp
View File

@@ -1216,7 +1216,7 @@ void ICorePrivate::init()
QApplication::setStyle(new ManhattanStyle(baseName)); QApplication::setStyle(new ManhattanStyle(baseName));
m_modeManager = new ModeManager(m_mainwindow, m_modeStack); m_modeManager = new ModeManager(m_modeStack);
connect(m_modeStack, &FancyTabWidget::topAreaClicked, this, [](Qt::MouseButton, Qt::KeyboardModifiers modifiers) { connect(m_modeStack, &FancyTabWidget::topAreaClicked, this, [](Qt::MouseButton, Qt::KeyboardModifiers modifiers) {
if (modifiers & Qt::ShiftModifier) { if (modifiers & Qt::ShiftModifier) {
QColor color = QColorDialog::getColor(StyleHelper::requestedBaseColor(), ICore::dialogParent()); QColor color = QColorDialog::getColor(StyleHelper::requestedBaseColor(), ICore::dialogParent());

5
src/plugins/coreplugin/modemanager.cpp
View File

@@ -68,7 +68,6 @@ struct ModeManagerPrivate
void activateModeHelper(Id id); void activateModeHelper(Id id);
void extensionsInitializedHelper(); void extensionsInitializedHelper();
Internal::MainWindow *m_mainWindow;
Internal::FancyTabWidget *m_modeStack; Internal::FancyTabWidget *m_modeStack;
Internal::FancyActionBar *m_actionBar; Internal::FancyActionBar *m_actionBar;
QMap<QAction*, int> m_actions; QMap<QAction*, int> m_actions;
@@ -101,12 +100,10 @@ void ModeManagerPrivate::showMenu(int index, QMouseEvent *event)
m_modes.at(index)->menu()->popup(event->globalPosition().toPoint()); m_modes.at(index)->menu()->popup(event->globalPosition().toPoint());
} }
ModeManager::ModeManager(Internal::MainWindow *mainWindow, ModeManager::ModeManager(Internal::FancyTabWidget *modeStack)
Internal::FancyTabWidget *modeStack)
{ {
m_instance = this; m_instance = this;
d = new ModeManagerPrivate(); d = new ModeManagerPrivate();
d->m_mainWindow = mainWindow;
d->m_modeStack = modeStack; d->m_modeStack = modeStack;
d->m_oldCurrent = -1; d->m_oldCurrent = -1;
d->m_actionBar = new Internal::FancyActionBar(modeStack); d->m_actionBar = new Internal::FancyActionBar(modeStack);

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

@@ -21,7 +21,6 @@ class IMode;
namespace Internal { namespace Internal {
class FancyTabWidget; class FancyTabWidget;
class ICorePrivate; class ICorePrivate;
class MainWindow;
} }
class CORE_EXPORT ModeManager : public QObject class CORE_EXPORT ModeManager : public QObject
@@ -60,7 +59,7 @@ signals:
void currentModeChanged(Utils::Id mode, Utils::Id oldMode = {}); void currentModeChanged(Utils::Id mode, Utils::Id oldMode = {});
private: private:
explicit ModeManager(Internal::MainWindow *mainWindow, Internal::FancyTabWidget *modeStack); explicit ModeManager(Internal::FancyTabWidget *modeStack);
~ModeManager() override; ~ModeManager() override;
static void extensionsInitialized(); static void extensionsInitialized();
@@ -71,7 +70,6 @@ private:
friend class ICore; friend class ICore;
friend class IMode; friend class IMode;
friend class Internal::MainWindow;
friend class Internal::ICorePrivate; friend class Internal::ICorePrivate;
}; };