Core: Swap ICore and MainWindow "ownership"

Change-Id: Ibfa223da0f4d5195ae2f2783352346ca72b920bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-09-15 14:53:59 +02:00
parent 8ba5174415
commit 61270e910f
7 changed files with 64 additions and 44 deletions

View File

@@ -46,10 +46,10 @@ class CORE_EXPORT ICore : public QObject
friend class Internal::MainWindow;
friend class Internal::MainWindowPrivate;
public:
ICore();
~ICore() override;
public:
enum class ContextPriority {
High,
Low
@@ -91,6 +91,7 @@ public:
static Utils::InfoBar *infoBar();
static void raiseWindow(QWidget *widget);
static void raiseMainWindow();
static IContext *currentContextObject();
static QWidget *currentContextWidget();
@@ -157,6 +158,12 @@ public:
static void saveSettings(SaveSettingsReason reason);
static void setNewDialogFactory(const std::function<NewDialog *(QWidget *)> &newFactory);
static void updateNewItemDialogState();
static void setOverrideColor(const QColor &color);
static void init();
static void extensionsInitialized();
static void aboutToShutdown();
};
namespace Internal {
@@ -169,10 +176,6 @@ public:
MainWindow();
~MainWindow() override;
void init();
void extensionsInitialized();
void aboutToShutdown();
IContext *contextObject(QWidget *widget) const;
void addContextObject(IContext *context);
void removeContextObject(IContext *context);
@@ -189,8 +192,6 @@ public:
void updateAdditionalContexts(const Context &remove, const Context &add,
ICore::ContextPriority priority);
void setOverrideColor(const QColor &color);
QStringList additionalAboutInformation() const;
void clearAboutInformation();
void appendAboutInformation(const QString &line);