Move LayoutSaver::Private to the header
This commit is contained in:
@@ -32,11 +32,8 @@
|
|||||||
|
|
||||||
#include <qmath.h>
|
#include <qmath.h>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QSettings>
|
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Some implementation details:
|
* Some implementation details:
|
||||||
*
|
*
|
||||||
@@ -76,38 +73,8 @@ inline InternalRestoreOptions internalRestoreOptions(RestoreOptions options)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class KDDockWidgets::LayoutSaver::Private
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
struct RAIIIsRestoring
|
|
||||||
{
|
|
||||||
RAIIIsRestoring();
|
|
||||||
~RAIIIsRestoring();
|
|
||||||
Q_DISABLE_COPY(RAIIIsRestoring)
|
|
||||||
};
|
|
||||||
|
|
||||||
explicit Private(RestoreOptions options);
|
|
||||||
|
|
||||||
bool matchesAffinity(const QStringList &affinities) const;
|
|
||||||
void floatWidgetsWhichSkipRestore(const QStringList &mainWindowNames);
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
void deserializeWindowGeometry(const T &saved, QWidgetOrQuick *topLevel);
|
|
||||||
void deleteEmptyFrames();
|
|
||||||
void clearRestoredProperty();
|
|
||||||
|
|
||||||
std::unique_ptr<QSettings> settings() const;
|
|
||||||
DockRegistry *const m_dockRegistry;
|
|
||||||
InternalRestoreOptions m_restoreOptions = {};
|
|
||||||
QStringList m_affinityNames;
|
|
||||||
|
|
||||||
static bool s_restoreInProgress;
|
|
||||||
};
|
|
||||||
|
|
||||||
bool LayoutSaver::Private::s_restoreInProgress = false;
|
bool LayoutSaver::Private::s_restoreInProgress = false;
|
||||||
|
|
||||||
|
|
||||||
static QVariantList stringListToVariant(const QStringList &strs)
|
static QVariantList stringListToVariant(const QStringList &strs)
|
||||||
{
|
{
|
||||||
QVariantList variantList;
|
QVariantList variantList;
|
||||||
|
|||||||
@@ -12,14 +12,16 @@
|
|||||||
#ifndef KD_LAYOUTSAVER_P_H
|
#ifndef KD_LAYOUTSAVER_P_H
|
||||||
#define KD_LAYOUTSAVER_P_H
|
#define KD_LAYOUTSAVER_P_H
|
||||||
|
|
||||||
#include "LayoutSaver.h"
|
|
||||||
#include "KDDockWidgets.h"
|
#include "KDDockWidgets.h"
|
||||||
|
#include "LayoutSaver.h"
|
||||||
|
#include "QWidgetAdapter.h"
|
||||||
|
|
||||||
#include <QRect>
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QScreen>
|
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
|
#include <QRect>
|
||||||
|
#include <QScreen>
|
||||||
|
#include <QSettings>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
@@ -35,7 +37,7 @@
|
|||||||
namespace KDDockWidgets {
|
namespace KDDockWidgets {
|
||||||
|
|
||||||
class FloatingWindow;
|
class FloatingWindow;
|
||||||
|
class DockRegistry;
|
||||||
|
|
||||||
/// @brief A more granular version of KDDockWidgets::RestoreOption
|
/// @brief A more granular version of KDDockWidgets::RestoreOption
|
||||||
/// There's some granularity that we don't want to expose to all users but want to allow some users
|
/// There's some granularity that we don't want to expose to all users but want to allow some users
|
||||||
@@ -348,6 +350,33 @@ private:
|
|||||||
Q_DISABLE_COPY(Layout)
|
Q_DISABLE_COPY(Layout)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class LayoutSaver::Private
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
struct RAIIIsRestoring
|
||||||
|
{
|
||||||
|
RAIIIsRestoring();
|
||||||
|
~RAIIIsRestoring();
|
||||||
|
Q_DISABLE_COPY(RAIIIsRestoring)
|
||||||
|
};
|
||||||
|
|
||||||
|
explicit Private(RestoreOptions options);
|
||||||
|
|
||||||
|
bool matchesAffinity(const QStringList &affinities) const;
|
||||||
|
void floatWidgetsWhichSkipRestore(const QStringList &mainWindowNames);
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
void deserializeWindowGeometry(const T &saved, QWidgetOrQuick *topLevel);
|
||||||
|
void deleteEmptyFrames();
|
||||||
|
void clearRestoredProperty();
|
||||||
|
|
||||||
|
std::unique_ptr<QSettings> settings() const;
|
||||||
|
DockRegistry *const m_dockRegistry;
|
||||||
|
InternalRestoreOptions m_restoreOptions = {};
|
||||||
|
QStringList m_affinityNames;
|
||||||
|
|
||||||
|
static bool s_restoreInProgress;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user