diff --git a/examples/dockwidgets/main.cpp b/examples/dockwidgets/main.cpp index 03d53730..98801857 100644 --- a/examples/dockwidgets/main.cpp +++ b/examples/dockwidgets/main.cpp @@ -170,7 +170,7 @@ int main(int argc, char **argv) // } if (parser.isSet(segmentedIndicators)) - KDDockWidgets::FrameworkWidgetFactory::s_dropIndicatorType = KDDockWidgets::DropIndicatorType::Segmented; + KDDockWidgets::ViewFactory::s_dropIndicatorType = KDDockWidgets::DropIndicatorType::Segmented; MainWindowOptions options = MainWindowOption_None; auto flags = KDDockWidgets::Config::self().flags(); @@ -196,7 +196,7 @@ int main(int argc, char **argv) flags |= KDDockWidgets::Config::Flag_NativeTitleBar; if (parser.isSet(noDropIndicators)) - KDDockWidgets::FrameworkWidgetFactory::s_dropIndicatorType = KDDockWidgets::DropIndicatorType::None; + KDDockWidgets::ViewFactory::s_dropIndicatorType = KDDockWidgets::DropIndicatorType::None; #if defined(Q_OS_WIN) if (parser.isSet(noAeroSnap)) diff --git a/src/Config.cpp b/src/Config.cpp index a9f32e09..4721d1a7 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -51,7 +51,7 @@ public: MainWindowFactoryFunc m_mainWindowFactoryFunc = nullptr; TabbingAllowedFunc m_tabbingAllowedFunc = nullptr; DropIndicatorAllowedFunc m_dropIndicatorAllowedFunc = nullptr; - FrameworkWidgetFactory *m_frameworkWidgetFactory = nullptr; + ViewFactory *m_frameworkWidgetFactory = nullptr; Flags m_flags = Flag_Default; InternalFlags m_internalFlags = InternalFlag_None; CustomizableWidgets m_disabledPaintEvents = CustomizableWidget_None; @@ -127,14 +127,14 @@ MainWindowFactoryFunc Config::mainWindowFactoryFunc() const return d->m_mainWindowFactoryFunc; } -void Config::setFrameworkWidgetFactory(FrameworkWidgetFactory *wf) +void Config::setFrameworkWidgetFactory(ViewFactory *wf) { Q_ASSERT(wf); delete d->m_frameworkWidgetFactory; d->m_frameworkWidgetFactory = wf; } -FrameworkWidgetFactory *Config::frameworkWidgetFactory() const +ViewFactory *Config::frameworkWidgetFactory() const { return d->m_frameworkWidgetFactory; } diff --git a/src/Config.h b/src/Config.h index 50637869..96a42acd 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ class DockWidget; class MainWindow; } -class FrameworkWidgetFactory; +class ViewFactory; typedef KDDockWidgets::Controllers::DockWidget *(*DockWidgetFactoryFunc)(const QString &name); typedef KDDockWidgets::Controllers::MainWindow *(*MainWindowFactoryFunc)(const QString &name); @@ -185,10 +185,10 @@ public: * Also potentially useful to return QtQuick classes instead of the QtWidget based ones. * Ownership is taken. */ - void setFrameworkWidgetFactory(FrameworkWidgetFactory *); + void setFrameworkWidgetFactory(ViewFactory *); ///@brief getter for the framework widget factory - FrameworkWidgetFactory *frameworkWidgetFactory() const; + ViewFactory *frameworkWidgetFactory() const; /** * @brief Returns the thickness of the separator. diff --git a/src/FrameworkWidgetFactory.cpp b/src/FrameworkWidgetFactory.cpp index 2951b236..59446153 100644 --- a/src/FrameworkWidgetFactory.cpp +++ b/src/FrameworkWidgetFactory.cpp @@ -13,8 +13,8 @@ using namespace KDDockWidgets; -DropIndicatorType FrameworkWidgetFactory::s_dropIndicatorType = DropIndicatorType::Classic; +DropIndicatorType ViewFactory::s_dropIndicatorType = DropIndicatorType::Classic; -FrameworkWidgetFactory::~FrameworkWidgetFactory() +ViewFactory::~ViewFactory() { } diff --git a/src/FrameworkWidgetFactory.h b/src/FrameworkWidgetFactory.h index b60a011c..8fe7e673 100644 --- a/src/FrameworkWidgetFactory.h +++ b/src/FrameworkWidgetFactory.h @@ -54,15 +54,15 @@ class SegmentedIndicators; * * @sa Config::setFrameworkWidgetFactory() */ -class DOCKS_EXPORT FrameworkWidgetFactory : public QObject +class DOCKS_EXPORT ViewFactory : public QObject { Q_OBJECT public: - FrameworkWidgetFactory() = default; + ViewFactory() = default; ///@brief Destructor.Don't delete FrameworkWidgetFactory directly, it's owned /// by the framework. - virtual ~FrameworkWidgetFactory(); + virtual ~ViewFactory(); virtual View *createDockWidget(Controllers::DockWidget *, Qt::WindowFlags) const = 0; virtual View *createMainWindow(Controllers::MainWindow *, View *parent, Qt::WindowFlags) const = 0; @@ -139,7 +139,7 @@ public: static DropIndicatorType s_dropIndicatorType; private: - Q_DISABLE_COPY(FrameworkWidgetFactory) + Q_DISABLE_COPY(ViewFactory) }; } diff --git a/src/Platform.h b/src/Platform.h index c0403046..fc670fa5 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -33,7 +33,7 @@ class ClassicIndicators; class SegmentedIndicators; } -class FrameworkWidgetFactory; +class ViewFactory; class Window; /// @brief implements functions specific to a particular platform @@ -65,7 +65,7 @@ public: virtual QVector> windows() const = 0; /// @brief Creates and returns the default FrameworkWidgetFactory - virtual FrameworkWidgetFactory *createDefaultFrameworkWidgetFactory() = 0; + virtual ViewFactory *createDefaultFrameworkWidgetFactory() = 0; /// @brief Returns the window at the specified global coordinates virtual std::shared_ptr windowAt(QPoint globalPos) const = 0; diff --git a/src/controllers/DropArea.cpp b/src/controllers/DropArea.cpp index 2d52e5dc..f63fd457 100644 --- a/src/controllers/DropArea.cpp +++ b/src/controllers/DropArea.cpp @@ -45,7 +45,7 @@ static Controllers::DropIndicatorOverlay *createDropIndicatorOverlay(Controllers return new SegmentedIndicators(dropArea); #endif - switch (FrameworkWidgetFactory::s_dropIndicatorType) { + switch (ViewFactory::s_dropIndicatorType) { case DropIndicatorType::Classic: return new Controllers::ClassicIndicators(dropArea); case DropIndicatorType::Segmented: diff --git a/src/qtquick/FrameworkWidgetFactory_qtquick.h b/src/qtquick/FrameworkWidgetFactory_qtquick.h index fb914150..1995d990 100644 --- a/src/qtquick/FrameworkWidgetFactory_qtquick.h +++ b/src/qtquick/FrameworkWidgetFactory_qtquick.h @@ -48,7 +48,7 @@ class MainWindow; /** * @brief The FrameworkWidgetFactory that's used if none is specified. */ -class DOCKS_EXPORT DefaultWidgetFactory_qtquick : public FrameworkWidgetFactory +class DOCKS_EXPORT DefaultWidgetFactory_qtquick : public ViewFactory { Q_OBJECT public: diff --git a/src/qtquick/Platform_qtquick.cpp b/src/qtquick/Platform_qtquick.cpp index c3f52932..4af3c133 100644 --- a/src/qtquick/Platform_qtquick.cpp +++ b/src/qtquick/Platform_qtquick.cpp @@ -74,7 +74,7 @@ std::shared_ptr Platform_qtquick::windowFromQWindow(QWindow *qwindow) co return std::shared_ptr(new Window_qtquick(qwindow)); } -FrameworkWidgetFactory *Platform_qtquick::createDefaultFrameworkWidgetFactory() +ViewFactory *Platform_qtquick::createDefaultFrameworkWidgetFactory() { return new DefaultWidgetFactory_qtquick(); } diff --git a/src/qtquick/Platform_qtquick.h b/src/qtquick/Platform_qtquick.h index 92974047..4915d22a 100644 --- a/src/qtquick/Platform_qtquick.h +++ b/src/qtquick/Platform_qtquick.h @@ -31,7 +31,7 @@ public: const char *name() const override; std::shared_ptr qobjectAsView(QObject *) const override; std::shared_ptr windowFromQWindow(QWindow *) const override; - FrameworkWidgetFactory *createDefaultFrameworkWidgetFactory() override; + ViewFactory *createDefaultFrameworkWidgetFactory() override; DefaultWidgetFactory_qtquick *frameworkWidgetFactory() const; Window::Ptr windowAt(QPoint globalPos) const override; using Platform_qt::screenNumberFor; diff --git a/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.h b/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.h index f406b3e0..abdde638 100644 --- a/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.h +++ b/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.h @@ -48,7 +48,7 @@ class MainWindow; /** * @brief The FrameworkWidgetFactory that's used if none is specified. */ -class DOCKS_EXPORT DefaultWidgetFactory_qtwidgets : public FrameworkWidgetFactory +class DOCKS_EXPORT DefaultWidgetFactory_qtwidgets : public ViewFactory { Q_OBJECT public: diff --git a/src/qtwidgets/Platform_qtwidgets.cpp b/src/qtwidgets/Platform_qtwidgets.cpp index fe69db7e..87fa4a19 100644 --- a/src/qtwidgets/Platform_qtwidgets.cpp +++ b/src/qtwidgets/Platform_qtwidgets.cpp @@ -75,7 +75,7 @@ std::shared_ptr Platform_qtwidgets::windowFromQWindow(QWindow *qwindow) return std::shared_ptr(new Window_qtwidgets(qwindow)); } -FrameworkWidgetFactory *Platform_qtwidgets::createDefaultFrameworkWidgetFactory() +ViewFactory *Platform_qtwidgets::createDefaultFrameworkWidgetFactory() { return new DefaultWidgetFactory_qtwidgets(); } diff --git a/src/qtwidgets/Platform_qtwidgets.h b/src/qtwidgets/Platform_qtwidgets.h index 12532639..c0c386f0 100644 --- a/src/qtwidgets/Platform_qtwidgets.h +++ b/src/qtwidgets/Platform_qtwidgets.h @@ -27,7 +27,7 @@ public: bool hasActivePopup() const override; std::shared_ptr qobjectAsView(QObject *) const override; std::shared_ptr windowFromQWindow(QWindow *) const override; - FrameworkWidgetFactory *createDefaultFrameworkWidgetFactory() override; + ViewFactory *createDefaultFrameworkWidgetFactory() override; std::shared_ptr windowAt(QPoint globalPos) const override; using Platform_qt::screenNumberFor;