Fix build with installed KDDW, do not expose Screen.h

Screen.h depends on KDDockWidgets_p.h which is not installed.
This commit is contained in:
Sergio Martins
2022-08-23 07:57:20 +01:00
parent a74dace6e4
commit 282c3106a4
5 changed files with 9 additions and 10 deletions

View File

@@ -148,9 +148,9 @@ public:
virtual bool isLeftMouseButtonPressed() const = 0;
/// @brief Returns all available screens
virtual Screen::List screens() const = 0;
virtual QVector<std::shared_ptr<Screen>> screens() const = 0;
virtual Screen::Ptr primaryScreen() const = 0;
virtual std::shared_ptr<Screen> primaryScreen() const = 0;
/// @brief For non-C++, managed languages (having a VM) prints a non-native back-trace
/// For example, the flutter frontend implements this to get a dart backtrace

View File

@@ -14,7 +14,6 @@
#include "kddockwidgets/docks_export.h"
#include "kddockwidgets/KDDockWidgets.h"
#include "Controller.h"
#include "Screen.h"
#include <QSize> // TODOm4 Remove Qt headers, introduce Size and Rect structs
#include <QRect>
@@ -222,7 +221,7 @@ public:
bool equals(const std::shared_ptr<View> &) const;
static bool equals(const View *one, const View *two);
Screen::Ptr screen() const;
std::shared_ptr<Screen> screen() const;
/// @brief Returns the views's geometry, but always in global space
QRect globalGeometry() const;

View File

@@ -38,8 +38,8 @@ public:
bool inDisallowedDragView(QPoint globalPos) const override;
bool usesFallbackMouseGrabber() const override;
void ungrabMouse() override;
Screen::List screens() const override;
Screen::Ptr primaryScreen() const override;
QVector<std::shared_ptr<Screen>> screens() const override;
std::shared_ptr<Screen> primaryScreen() const override;
#ifdef DOCKS_DEVELOPER_MODE

View File

@@ -38,8 +38,8 @@ public:
bool inDisallowedDragView(QPoint globalPos) const override;
bool usesFallbackMouseGrabber() const override;
void ungrabMouse() override;
Screen::List screens() const override;
Screen::Ptr primaryScreen() const override;
QVector<std::shared_ptr<Screen>> screens() const override;
std::shared_ptr<Screen> primaryScreen() const override;
#ifdef DOCKS_DEVELOPER_MODE
explicit Platform_flutter(int &argc, char **argv);

View File

@@ -48,7 +48,7 @@ public:
DisplayType displayType() const override;
bool isLeftMouseButtonPressed() const override;
Screen::List screens() const override;
QVector<std::shared_ptr<Screen>> screens() const override;
/// @brief Returns the specified QObject casted to View
/// Nullptr if it's not a view. TODOm3: This is shared between the
@@ -58,7 +58,7 @@ public:
static Platform_qt *instance();
Screen::Ptr primaryScreen() const override;
std::shared_ptr<Screen> primaryScreen() const override;
#ifdef DOCKS_DEVELOPER_MODE
static bool isGammaray();