Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2018-07-21 10:16:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Sat Jul 21 10:16:16 2018 rev:59 rq:623319 version:5.48.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2018-06-22 13:24:37.586505207 +0200 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2018-07-21 10:16:19.555085095 +0200 @@ -1,0 +2,11 @@ +Mon Jul 16 04:37:45 UTC 2018 - lbeltr...@kde.org + +- Update to 5.48.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.48.0.php +- Changes since 5.47.0: + * Use consistently nullptr + * Use consistently override + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.47.0.tar.xz New: ---- kwindowsystem-5.48.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.5rTykK/_old 2018-07-21 10:16:21.839084556 +0200 +++ /var/tmp/diff_new_pack.5rTykK/_new 2018-07-21 10:16:21.871084549 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5WindowSystem5 -%define _tar_path 5.47 +%define _tar_path 5.48 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) -%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kwindowsystem -Version: 5.47.0 +Version: 5.48.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ kwindowsystem-5.47.0.tar.xz -> kwindowsystem-5.48.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/CMakeLists.txt new/kwindowsystem-5.48.0/CMakeLists.txt --- old/kwindowsystem-5.47.0/CMakeLists.txt 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/CMakeLists.txt 2018-07-08 00:33:30.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_VERSION "5.48.0") # handled by release scripts project(KWindowSystem VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.47.0 NO_MODULE) +find_package(ECM 5.48.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/autotests/kwindowsystem_threadtest.cpp new/kwindowsystem-5.48.0/autotests/kwindowsystem_threadtest.cpp --- old/kwindowsystem-5.47.0/autotests/kwindowsystem_threadtest.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/autotests/kwindowsystem_threadtest.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -45,7 +45,7 @@ class KWindowSystemCreator : public QRunnable { public: - void run() Q_DECL_OVERRIDE + void run() override { (void)KWindowSystem::self(); } @@ -54,7 +54,7 @@ class WindowInfoLister : public QThread { public: - void run() Q_DECL_OVERRIDE + void run() override { // simulate some activity in another thread gathering window information const QList<WId> windows = KWindowSystem::stackingOrder(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/po/zh_CN/kwindowsystem5_qt.po new/kwindowsystem-5.48.0/po/zh_CN/kwindowsystem5_qt.po --- old/kwindowsystem-5.47.0/po/zh_CN/kwindowsystem5_qt.po 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/po/zh_CN/kwindowsystem5_qt.po 2018-07-08 00:33:30.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-05-18 06:23-0400\n" +"PO-Revision-Date: 2018-07-03 17:35\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/kstartupinfo.cpp new/kwindowsystem-5.48.0/src/kstartupinfo.cpp --- old/kwindowsystem-5.47.0/src/kstartupinfo.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/kstartupinfo.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -191,7 +191,7 @@ void createConnections() { #if KWINDOWSYSTEM_HAVE_X11 - // d == NULL means "disabled" + // d == nullptr means "disabled" if (!QX11Info::isPlatformX11() || !QX11Info::display()) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/kstartupinfo.h new/kwindowsystem-5.48.0/src/kstartupinfo.h --- old/kwindowsystem-5.47.0/src/kstartupinfo.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/kstartupinfo.h 2018-07-08 00:33:30.000000000 +0200 @@ -182,7 +182,7 @@ #ifndef KWINDOWSYSTEM_NO_DEPRECATED KWINDOWSYSTEM_DEPRECATED explicit KStartupInfo(bool clean_on_cantdetect, QObject *parent = nullptr); #endif - virtual ~KStartupInfo(); + ~KStartupInfo() override; /** * Sends given notification data about started application * with the given startup identification. If no notification for this identification @@ -424,7 +424,7 @@ /** * */ - void customEvent(QEvent *e_P) Q_DECL_OVERRIDE; + void customEvent(QEvent *e_P) override; private: Q_PRIVATE_SLOT(d, void startups_cleanup()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/kwindoweffects_dummy_p.h new/kwindowsystem-5.48.0/src/kwindoweffects_dummy_p.h --- old/kwindowsystem-5.47.0/src/kwindoweffects_dummy_p.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/kwindoweffects_dummy_p.h 2018-07-08 00:33:30.000000000 +0200 @@ -25,17 +25,17 @@ { public: KWindowEffectsPrivateDummy(); - virtual ~KWindowEffectsPrivateDummy(); - bool isEffectAvailable(KWindowEffects::Effect effect) Q_DECL_OVERRIDE; - void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int offset) Q_DECL_OVERRIDE; - void slideWindow(QWidget* widget, KWindowEffects::SlideFromLocation location) Q_DECL_OVERRIDE; - QList< QSize > windowSizes(const QList<WId> &ids) Q_DECL_OVERRIDE; - void presentWindows(WId controller, const QList<WId> &ids) Q_DECL_OVERRIDE; - void presentWindows(WId controller, int desktop = NET::OnAllDesktops) Q_DECL_OVERRIDE; - void highlightWindows(WId controller, const QList<WId> &ids) Q_DECL_OVERRIDE; - void enableBlurBehind(WId window, bool enable = true, const QRegion& region = QRegion()) Q_DECL_OVERRIDE; - void enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()) Q_DECL_OVERRIDE; - void markAsDashboard(WId window) Q_DECL_OVERRIDE; + ~KWindowEffectsPrivateDummy() override; + bool isEffectAvailable(KWindowEffects::Effect effect) override; + void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int offset) override; + void slideWindow(QWidget* widget, KWindowEffects::SlideFromLocation location) override; + QList< QSize > windowSizes(const QList<WId> &ids) override; + void presentWindows(WId controller, const QList<WId> &ids) override; + void presentWindows(WId controller, int desktop = NET::OnAllDesktops) override; + void highlightWindows(WId controller, const QList<WId> &ids) override; + void enableBlurBehind(WId window, bool enable = true, const QRegion& region = QRegion()) override; + void enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()) override; + void markAsDashboard(WId window) override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/kwindowinfo_dummy_p.h new/kwindowsystem-5.48.0/src/kwindowinfo_dummy_p.h --- old/kwindowsystem-5.47.0/src/kwindowinfo_dummy_p.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/kwindowinfo_dummy_p.h 2018-07-08 00:33:30.000000000 +0200 @@ -29,33 +29,33 @@ { public: KWindowInfoPrivateDummy(WId window, NET::Properties properties, NET::Properties2 properties2); - ~KWindowInfoPrivateDummy(); + ~KWindowInfoPrivateDummy() override; - bool valid(bool withdrawn_is_valid) const Q_DECL_OVERRIDE; - NET::States state() const Q_DECL_OVERRIDE; - bool isMinimized() const Q_DECL_OVERRIDE; - NET::MappingState mappingState() const Q_DECL_OVERRIDE; - NETExtendedStrut extendedStrut() const Q_DECL_OVERRIDE; - NET::WindowType windowType(NET::WindowTypes supported_types) const Q_DECL_OVERRIDE; - QString visibleName() const Q_DECL_OVERRIDE; - QString visibleNameWithState() const Q_DECL_OVERRIDE; - QString name() const Q_DECL_OVERRIDE; - QString visibleIconName() const Q_DECL_OVERRIDE; - QString visibleIconNameWithState() const Q_DECL_OVERRIDE; - QString iconName() const Q_DECL_OVERRIDE; - bool onAllDesktops() const Q_DECL_OVERRIDE; - bool isOnDesktop(int desktop) const Q_DECL_OVERRIDE; - int desktop() const Q_DECL_OVERRIDE; - QStringList activities() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - QRect frameGeometry() const Q_DECL_OVERRIDE; - WId transientFor() const Q_DECL_OVERRIDE; - WId groupLeader() const Q_DECL_OVERRIDE; - QByteArray windowClassClass() const Q_DECL_OVERRIDE; - QByteArray windowClassName() const Q_DECL_OVERRIDE; - QByteArray windowRole() const Q_DECL_OVERRIDE; - QByteArray clientMachine() const Q_DECL_OVERRIDE; - bool actionSupported(NET::Action action) const Q_DECL_OVERRIDE; + bool valid(bool withdrawn_is_valid) const override; + NET::States state() const override; + bool isMinimized() const override; + NET::MappingState mappingState() const override; + NETExtendedStrut extendedStrut() const override; + NET::WindowType windowType(NET::WindowTypes supported_types) const override; + QString visibleName() const override; + QString visibleNameWithState() const override; + QString name() const override; + QString visibleIconName() const override; + QString visibleIconNameWithState() const override; + QString iconName() const override; + bool onAllDesktops() const override; + bool isOnDesktop(int desktop) const override; + int desktop() const override; + QStringList activities() const override; + QRect geometry() const override; + QRect frameGeometry() const override; + WId transientFor() const override; + WId groupLeader() const override; + QByteArray windowClassClass() const override; + QByteArray windowClassName() const override; + QByteArray windowRole() const override; + QByteArray clientMachine() const override; + bool actionSupported(NET::Action action) const override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/kwindowsystem.h new/kwindowsystem-5.48.0/src/kwindowsystem.h --- old/kwindowsystem-5.47.0/src/kwindowsystem.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/kwindowsystem.h 2018-07-08 00:33:30.000000000 +0200 @@ -749,7 +749,7 @@ void compositingChanged(bool enabled); protected: - void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &signal) override; private: friend class KWindowSystemStaticContainer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/kwindowsystem_dummy_p.h new/kwindowsystem-5.48.0/src/kwindowsystem_dummy_p.h --- old/kwindowsystem-5.47.0/src/kwindowsystem_dummy_p.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/kwindowsystem_dummy_p.h 2018-07-08 00:33:30.000000000 +0200 @@ -25,55 +25,55 @@ class KWindowSystemPrivateDummy : public KWindowSystemPrivate { public: - QList<WId> windows() Q_DECL_OVERRIDE; - QList<WId> stackingOrder() Q_DECL_OVERRIDE; - WId activeWindow() Q_DECL_OVERRIDE; - void activateWindow(WId win, long time) Q_DECL_OVERRIDE; - void forceActiveWindow(WId win, long time) Q_DECL_OVERRIDE; - void demandAttention(WId win, bool set) Q_DECL_OVERRIDE; - bool compositingActive() Q_DECL_OVERRIDE; - int currentDesktop() Q_DECL_OVERRIDE; - int numberOfDesktops() Q_DECL_OVERRIDE; - void setCurrentDesktop(int desktop) Q_DECL_OVERRIDE; - void setOnAllDesktops(WId win, bool b) Q_DECL_OVERRIDE; - void setOnDesktop(WId win, int desktop) Q_DECL_OVERRIDE; - void setOnActivities(WId win, const QStringList &activities) Q_DECL_OVERRIDE; + QList<WId> windows() override; + QList<WId> stackingOrder() override; + WId activeWindow() override; + void activateWindow(WId win, long time) override; + void forceActiveWindow(WId win, long time) override; + void demandAttention(WId win, bool set) override; + bool compositingActive() override; + int currentDesktop() override; + int numberOfDesktops() override; + void setCurrentDesktop(int desktop) override; + void setOnAllDesktops(WId win, bool b) override; + void setOnDesktop(WId win, int desktop) override; + void setOnActivities(WId win, const QStringList &activities) override; #ifndef KWINDOWSYSTEM_NO_DEPRECATED - WId transientFor(WId window) Q_DECL_OVERRIDE; - WId groupLeader(WId window) Q_DECL_OVERRIDE; + WId transientFor(WId window) override; + WId groupLeader(WId window) override; #endif - QPixmap icon(WId win, int width, int height, bool scale, int flags) Q_DECL_OVERRIDE; - void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) Q_DECL_OVERRIDE; - void setType(WId win, NET::WindowType windowType) Q_DECL_OVERRIDE; - void setState(WId win, NET::States state) Q_DECL_OVERRIDE; - void clearState(WId win, NET::States state) Q_DECL_OVERRIDE; - void minimizeWindow(WId win) Q_DECL_OVERRIDE; - void unminimizeWindow(WId win) Q_DECL_OVERRIDE; - void raiseWindow(WId win) Q_DECL_OVERRIDE; - void lowerWindow(WId win) Q_DECL_OVERRIDE; - bool icccmCompliantMappingState() Q_DECL_OVERRIDE; - QRect workArea(int desktop) Q_DECL_OVERRIDE; - QRect workArea(const QList<WId> &excludes, int desktop) Q_DECL_OVERRIDE; - QString desktopName(int desktop) Q_DECL_OVERRIDE; - void setDesktopName(int desktop, const QString &name) Q_DECL_OVERRIDE; - bool showingDesktop() Q_DECL_OVERRIDE; - void setShowingDesktop(bool showing) Q_DECL_OVERRIDE; - void setUserTime(WId win, long time) Q_DECL_OVERRIDE; + QPixmap icon(WId win, int width, int height, bool scale, int flags) override; + void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) override; + void setType(WId win, NET::WindowType windowType) override; + void setState(WId win, NET::States state) override; + void clearState(WId win, NET::States state) override; + void minimizeWindow(WId win) override; + void unminimizeWindow(WId win) override; + void raiseWindow(WId win) override; + void lowerWindow(WId win) override; + bool icccmCompliantMappingState() override; + QRect workArea(int desktop) override; + QRect workArea(const QList<WId> &excludes, int desktop) override; + QString desktopName(int desktop) override; + void setDesktopName(int desktop, const QString &name) override; + bool showingDesktop() override; + void setShowingDesktop(bool showing) override; + void setUserTime(WId win, long time) override; void setExtendedStrut(WId win, int left_width, int left_start, int left_end, int right_width, int right_start, int right_end, int top_width, int top_start, int top_end, - int bottom_width, int bottom_start, int bottom_end) Q_DECL_OVERRIDE; - void setStrut(WId win, int left, int right, int top, int bottom) Q_DECL_OVERRIDE; - bool allowedActionsSupported() Q_DECL_OVERRIDE; - QString readNameProperty(WId window, unsigned long atom) Q_DECL_OVERRIDE; - void allowExternalProcessWindowActivation(int pid) Q_DECL_OVERRIDE; - void setBlockingCompositing(WId window, bool active) Q_DECL_OVERRIDE; - bool mapViewport() Q_DECL_OVERRIDE; - int viewportToDesktop(const QPoint &pos) Q_DECL_OVERRIDE; - int viewportWindowToDesktop(const QRect &r) Q_DECL_OVERRIDE; - QPoint desktopToViewport(int desktop, bool absolute) Q_DECL_OVERRIDE; - QPoint constrainViewportRelativePosition(const QPoint &pos) Q_DECL_OVERRIDE; + int bottom_width, int bottom_start, int bottom_end) override; + void setStrut(WId win, int left, int right, int top, int bottom) override; + bool allowedActionsSupported() override; + QString readNameProperty(WId window, unsigned long atom) override; + void allowExternalProcessWindowActivation(int pid) override; + void setBlockingCompositing(WId window, bool active) override; + bool mapViewport() override; + int viewportToDesktop(const QPoint &pos) override; + int viewportWindowToDesktop(const QRect &r) override; + QPoint desktopToViewport(int desktop, bool absolute) override; + QPoint constrainViewportRelativePosition(const QPoint &pos) override; - void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &signal) override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/kwindowsystemplugininterface_p.h new/kwindowsystem-5.48.0/src/kwindowsystemplugininterface_p.h --- old/kwindowsystem-5.47.0/src/kwindowsystemplugininterface_p.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/kwindowsystemplugininterface_p.h 2018-07-08 00:33:30.000000000 +0200 @@ -34,7 +34,7 @@ Q_OBJECT public: explicit KWindowSystemPluginInterface(QObject *parent = nullptr); - virtual ~KWindowSystemPluginInterface(); + ~KWindowSystemPluginInterface() override; virtual KWindowEffectsPrivate *createEffects(); virtual KWindowSystemPrivate *createWindowSystem(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/osx/kwindowinfo.cpp new/kwindowsystem-5.48.0/src/platforms/osx/kwindowinfo.cpp --- old/kwindowsystem-5.47.0/src/platforms/osx/kwindowinfo.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/osx/kwindowinfo.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -123,13 +123,13 @@ // this one is only to make QList<> or similar happy KWindowInfo::KWindowInfo() - : d(NULL) + : d(nullptr) { } KWindowInfo::~KWindowInfo() { - if (d != NULL) { + if (d != nullptr) { if (--d->ref == 0) { delete d; } @@ -139,7 +139,7 @@ KWindowInfo::KWindowInfo(const KWindowInfo &wininfo) : d(wininfo.d) { - if (d != NULL) { + if (d != nullptr) { ++d->ref; } } @@ -147,12 +147,12 @@ KWindowInfo &KWindowInfo::operator=(const KWindowInfo &wininfo) { if (d != wininfo.d) { - if (d != NULL) + if (d != nullptr) if (--d->ref == 0) { delete d; } d = wininfo.d; - if (d != NULL) { + if (d != nullptr) { ++d->ref; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/osx/kwindowsystem.cpp new/kwindowsystem-5.48.0/src/platforms/osx/kwindowsystem.cpp --- old/kwindowsystem-5.47.0/src/platforms/osx/kwindowsystem.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/osx/kwindowsystem.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -103,7 +103,7 @@ kind = GetEventKind(inEvent); ProcessSerialNumber psn; - if (GetEventParameter(inEvent, kEventParamProcessID, typeProcessSerialNumber, NULL, sizeof psn, NULL, &psn) != noErr) { + if (GetEventParameter(inEvent, kEventParamProcessID, typeProcessSerialNumber, nullptr, sizeof psn, nullptr, &psn) != noErr) { kWarning() << "Error getting event parameter in application event"; return eventNotHandledErr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/wayland/kwindowsystem_p_wayland.h new/kwindowsystem-5.48.0/src/platforms/wayland/kwindowsystem_p_wayland.h --- old/kwindowsystem-5.47.0/src/platforms/wayland/kwindowsystem_p_wayland.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/wayland/kwindowsystem_p_wayland.h 2018-07-08 00:33:30.000000000 +0200 @@ -25,55 +25,55 @@ class KWindowSystemPrivateWayland : public KWindowSystemPrivate { public: - QList<WId> windows() Q_DECL_OVERRIDE; - QList<WId> stackingOrder() Q_DECL_OVERRIDE; - WId activeWindow() Q_DECL_OVERRIDE; - void activateWindow(WId win, long time) Q_DECL_OVERRIDE; - void forceActiveWindow(WId win, long time) Q_DECL_OVERRIDE; - void demandAttention(WId win, bool set) Q_DECL_OVERRIDE; - bool compositingActive() Q_DECL_OVERRIDE; - int currentDesktop() Q_DECL_OVERRIDE; - int numberOfDesktops() Q_DECL_OVERRIDE; - void setCurrentDesktop(int desktop) Q_DECL_OVERRIDE; - void setOnAllDesktops(WId win, bool b) Q_DECL_OVERRIDE; - void setOnDesktop(WId win, int desktop) Q_DECL_OVERRIDE; - void setOnActivities(WId win, const QStringList &activities) Q_DECL_OVERRIDE; + QList<WId> windows() override; + QList<WId> stackingOrder() override; + WId activeWindow() override; + void activateWindow(WId win, long time) override; + void forceActiveWindow(WId win, long time) override; + void demandAttention(WId win, bool set) override; + bool compositingActive() override; + int currentDesktop() override; + int numberOfDesktops() override; + void setCurrentDesktop(int desktop) override; + void setOnAllDesktops(WId win, bool b) override; + void setOnDesktop(WId win, int desktop) override; + void setOnActivities(WId win, const QStringList &activities) override; #ifndef KWINDOWSYSTEM_NO_DEPRECATED - WId transientFor(WId window) Q_DECL_OVERRIDE; - WId groupLeader(WId window) Q_DECL_OVERRIDE; + WId transientFor(WId window) override; + WId groupLeader(WId window) override; #endif - QPixmap icon(WId win, int width, int height, bool scale, int flags) Q_DECL_OVERRIDE; - void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) Q_DECL_OVERRIDE; - void setType(WId win, NET::WindowType windowType) Q_DECL_OVERRIDE; - void setState(WId win, NET::States state) Q_DECL_OVERRIDE; - void clearState(WId win, NET::States state) Q_DECL_OVERRIDE; - void minimizeWindow(WId win) Q_DECL_OVERRIDE; - void unminimizeWindow(WId win) Q_DECL_OVERRIDE; - void raiseWindow(WId win) Q_DECL_OVERRIDE; - void lowerWindow(WId win) Q_DECL_OVERRIDE; - bool icccmCompliantMappingState() Q_DECL_OVERRIDE; - QRect workArea(int desktop) Q_DECL_OVERRIDE; - QRect workArea(const QList<WId> &excludes, int desktop) Q_DECL_OVERRIDE; - QString desktopName(int desktop) Q_DECL_OVERRIDE; - void setDesktopName(int desktop, const QString &name) Q_DECL_OVERRIDE; - bool showingDesktop() Q_DECL_OVERRIDE; - void setShowingDesktop(bool showing) Q_DECL_OVERRIDE; - void setUserTime(WId win, long time) Q_DECL_OVERRIDE; + QPixmap icon(WId win, int width, int height, bool scale, int flags) override; + void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) override; + void setType(WId win, NET::WindowType windowType) override; + void setState(WId win, NET::States state) override; + void clearState(WId win, NET::States state) override; + void minimizeWindow(WId win) override; + void unminimizeWindow(WId win) override; + void raiseWindow(WId win) override; + void lowerWindow(WId win) override; + bool icccmCompliantMappingState() override; + QRect workArea(int desktop) override; + QRect workArea(const QList<WId> &excludes, int desktop) override; + QString desktopName(int desktop) override; + void setDesktopName(int desktop, const QString &name) override; + bool showingDesktop() override; + void setShowingDesktop(bool showing) override; + void setUserTime(WId win, long time) override; void setExtendedStrut(WId win, int left_width, int left_start, int left_end, int right_width, int right_start, int right_end, int top_width, int top_start, int top_end, - int bottom_width, int bottom_start, int bottom_end) Q_DECL_OVERRIDE; - void setStrut(WId win, int left, int right, int top, int bottom) Q_DECL_OVERRIDE; - bool allowedActionsSupported() Q_DECL_OVERRIDE; - QString readNameProperty(WId window, unsigned long atom) Q_DECL_OVERRIDE; - void allowExternalProcessWindowActivation(int pid) Q_DECL_OVERRIDE; - void setBlockingCompositing(WId window, bool active) Q_DECL_OVERRIDE; - bool mapViewport() Q_DECL_OVERRIDE; - int viewportToDesktop(const QPoint &pos) Q_DECL_OVERRIDE; - int viewportWindowToDesktop(const QRect &r) Q_DECL_OVERRIDE; - QPoint desktopToViewport(int desktop, bool absolute) Q_DECL_OVERRIDE; - QPoint constrainViewportRelativePosition(const QPoint &pos) Q_DECL_OVERRIDE; + int bottom_width, int bottom_start, int bottom_end) override; + void setStrut(WId win, int left, int right, int top, int bottom) override; + bool allowedActionsSupported() override; + QString readNameProperty(WId window, unsigned long atom) override; + void allowExternalProcessWindowActivation(int pid) override; + void setBlockingCompositing(WId window, bool active) override; + bool mapViewport() override; + int viewportToDesktop(const QPoint &pos) override; + int viewportWindowToDesktop(const QRect &r) override; + QPoint desktopToViewport(int desktop, bool absolute) override; + QPoint constrainViewportRelativePosition(const QPoint &pos) override; - void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &signal) override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/wayland/plugin.h new/kwindowsystem-5.48.0/src/platforms/wayland/plugin.h --- old/kwindowsystem-5.47.0/src/platforms/wayland/plugin.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/wayland/plugin.h 2018-07-08 00:33:30.000000000 +0200 @@ -30,9 +30,9 @@ public: explicit WaylandPlugin(QObject *parent = nullptr); - virtual ~WaylandPlugin(); + ~WaylandPlugin() override; - KWindowSystemPrivate *createWindowSystem() Q_DECL_OVERRIDE; + KWindowSystemPrivate *createWindowSystem() override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/windows/kwindowinfo.cpp new/kwindowsystem-5.48.0/src/platforms/windows/kwindowinfo.cpp --- old/kwindowsystem-5.47.0/src/platforms/windows/kwindowinfo.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/windows/kwindowinfo.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -52,14 +52,14 @@ } KWindowInfo::KWindowInfo() - : d(NULL) + : d(nullptr) { } KWindowInfo::~KWindowInfo() { - if (d != NULL) { + if (d != nullptr) { if (--d->ref == 0) { delete d; } @@ -69,7 +69,7 @@ KWindowInfo::KWindowInfo(const KWindowInfo &wininfo) : d(wininfo.d) { - if (d != NULL) { + if (d != nullptr) { ++d->ref; } } @@ -77,12 +77,12 @@ KWindowInfo &KWindowInfo::operator=(const KWindowInfo &wininfo) { if (d != wininfo.d) { - if (d != NULL) + if (d != nullptr) if (--d->ref == 0) { delete d; } d = wininfo.d; - if (d != NULL) { + if (d != nullptr) { ++d->ref; } } @@ -288,7 +288,7 @@ // Implemented per http://tronche.com/gui/x/icccm/sec-4.html#WM_CLASS (but only 2nd and 3rd choices, -name ignored) char *resourcenamevar; resourcenamevar = getenv("RESOURCE_NAME"); - if (resourcenamevar != NULL) { + if (resourcenamevar != nullptr) { return QByteArray(resourcenamevar); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/windows/kwindowsystem.cpp new/kwindowsystem-5.48.0/src/platforms/windows/kwindowsystem.cpp --- old/kwindowsystem-5.47.0/src/platforms/windows/kwindowsystem.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/windows/kwindowsystem.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -83,7 +83,7 @@ void activate(); protected: - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; private: bool activated; @@ -447,7 +447,7 @@ //to bring a window to the front while the user is active in a different apllication we //have to atach our self to the current active window HWND hwndActiveWin = GetForegroundWindow(); - int idActive = GetWindowThreadProcessId(hwndActiveWin, NULL); + int idActive = GetWindowThreadProcessId(hwndActiveWin, nullptr); if (AttachThreadInput(GetCurrentThreadId(), idActive, TRUE)) { SetForegroundWindow(hwnd); SetFocus(hwnd); @@ -489,7 +489,7 @@ size = ICON_SMALL; } HICON hIcon = (HICON)SendMessage(reinterpret_cast<HWND>(win), WM_GETICON, size, 0); - if (hIcon != NULL) { + if (hIcon != nullptr) { pm = QtWin::fromHICON(hIcon); } } @@ -596,7 +596,7 @@ //to bring a window to the front while the user is active in a different apllication we //have to atach our self to the current active window HWND hwndActiveWin = GetForegroundWindow(); - int idActive = GetWindowThreadProcessId(hwndActiveWin, NULL); + int idActive = GetWindowThreadProcessId(hwndActiveWin, nullptr); if (AttachThreadInput(GetCurrentThreadId(), idActive, TRUE)) { SetForegroundWindow(reinterpret_cast<HWND>(win)); AttachThreadInput(GetCurrentThreadId(), idActive, FALSE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionowner.cpp new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionowner.cpp --- old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionowner.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionowner.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -109,7 +109,7 @@ static Private *create(KSelectionOwner *owner, const char *selection_P, xcb_connection_t *c, xcb_window_t root); protected: - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE { + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override { Q_UNUSED(result); if (eventType != "xcb_generic_event_t") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionowner.h new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionowner.h --- old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionowner.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionowner.h 2018-07-08 00:33:30.000000000 +0200 @@ -55,7 +55,7 @@ * * @param selection atom representing the manager selection * @param screen X screen, or -1 for default - * @param parent parent object, or NULL if there is none + * @param parent parent object, or nullptr if there is none */ explicit KSelectionOwner(xcb_atom_t selection, int screen = -1, QObject *parent = nullptr); @@ -66,7 +66,7 @@ * * @param selection name of the manager selection * @param screen X screen, or -1 for default - * @param parent parent object, or NULL if there is none + * @param parent parent object, or nullptr if there is none */ explicit KSelectionOwner(const char *selection, int screen = -1, QObject *parent = nullptr); /** @@ -78,7 +78,7 @@ * @param selection atom representing the manager selection * @param c the xcb connection this KSelectionWatcher should use * @param root the root window this KSelectionWatcher should use - * @param parent parent object, or NULL if there is none + * @param parent parent object, or nullptr if there is none * @since 5.8 **/ explicit KSelectionOwner(xcb_atom_t selection, xcb_connection_t *c, xcb_window_t root, QObject *parent = nullptr); @@ -92,7 +92,7 @@ * @param selection name of the manager selection * @param c the xcb connection this KSelectionWatcher should use * @param root the root window this KSelectionWatcher should use - * @param parent parent object, or NULL if there is none + * @param parent parent object, or nullptr if there is none * @since 5.8 **/ explicit KSelectionOwner(const char *selection, xcb_connection_t *c, xcb_window_t root, QObject *parent = nullptr); @@ -100,7 +100,7 @@ /** * Destructor. Calls release(). */ - virtual ~KSelectionOwner(); + ~KSelectionOwner() override; /** * Try to claim ownership of the manager selection using the current X timestamp. @@ -137,7 +137,7 @@ /** * @internal */ - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; Q_SIGNALS: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionwatcher.cpp new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionwatcher.cpp --- old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionwatcher.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionwatcher.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -89,7 +89,7 @@ static Private *create(KSelectionWatcher *watcher, const char *selection_P, xcb_connection_t *c, xcb_window_t root); protected: - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE { + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override { Q_UNUSED(result); if (eventType != "xcb_generic_event_t") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionwatcher.h new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionwatcher.h --- old/kwindowsystem-5.47.0/src/platforms/xcb/kselectionwatcher.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kselectionwatcher.h 2018-07-08 00:33:30.000000000 +0200 @@ -54,7 +54,7 @@ * * @param selection atom representing the manager selection * @param screen X screen, or -1 for default - * @param parent parent object, or NULL if there is none + * @param parent parent object, or nullptr if there is none */ explicit KSelectionWatcher(xcb_atom_t selection, int screen = -1, QObject *parent = nullptr); /** @@ -64,7 +64,7 @@ * * @param selection name of the manager selection * @param screen X screen, or -1 for default - * @param parent parent object, or NULL if there is none + * @param parent parent object, or nullptr if there is none */ explicit KSelectionWatcher(const char *selection, int screen = -1, QObject *parent = nullptr); /** @@ -91,7 +91,7 @@ * @since 5.8 **/ explicit KSelectionWatcher(const char *selection, xcb_connection_t *c, xcb_window_t root, QObject *parent = nullptr); - virtual ~KSelectionWatcher(); + ~KSelectionWatcher() override; /** * Return the current owner of the manager selection, if any. Note that if the event * informing about the owner change is still in the input queue, newOwner() might diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kwindoweffects_x11.h new/kwindowsystem-5.48.0/src/platforms/xcb/kwindoweffects_x11.h --- old/kwindowsystem-5.47.0/src/platforms/xcb/kwindoweffects_x11.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kwindoweffects_x11.h 2018-07-08 00:33:30.000000000 +0200 @@ -25,17 +25,17 @@ { public: KWindowEffectsPrivateX11(); - virtual ~KWindowEffectsPrivateX11(); - bool isEffectAvailable(KWindowEffects::Effect effect) Q_DECL_OVERRIDE; - void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int offset) Q_DECL_OVERRIDE; - void slideWindow(QWidget* widget, KWindowEffects::SlideFromLocation location) Q_DECL_OVERRIDE; - QList< QSize > windowSizes(const QList<WId> &ids) Q_DECL_OVERRIDE; - void presentWindows(WId controller, const QList<WId> &ids) Q_DECL_OVERRIDE; - void presentWindows(WId controller, int desktop = NET::OnAllDesktops) Q_DECL_OVERRIDE; - void highlightWindows(WId controller, const QList<WId> &ids) Q_DECL_OVERRIDE; - void enableBlurBehind(WId window, bool enable = true, const QRegion& region = QRegion()) Q_DECL_OVERRIDE; - void enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()) Q_DECL_OVERRIDE; - void markAsDashboard(WId window) Q_DECL_OVERRIDE; + ~KWindowEffectsPrivateX11() override; + bool isEffectAvailable(KWindowEffects::Effect effect) override; + void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int offset) override; + void slideWindow(QWidget* widget, KWindowEffects::SlideFromLocation location) override; + QList< QSize > windowSizes(const QList<WId> &ids) override; + void presentWindows(WId controller, const QList<WId> &ids) override; + void presentWindows(WId controller, int desktop = NET::OnAllDesktops) override; + void highlightWindows(WId controller, const QList<WId> &ids) override; + void enableBlurBehind(WId window, bool enable = true, const QRegion& region = QRegion()) override; + void enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()) override; + void markAsDashboard(WId window) override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kwindowinfo_p_x11.h new/kwindowsystem-5.48.0/src/platforms/xcb/kwindowinfo_p_x11.h --- old/kwindowsystem-5.47.0/src/platforms/xcb/kwindowinfo_p_x11.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kwindowinfo_p_x11.h 2018-07-08 00:33:30.000000000 +0200 @@ -28,37 +28,37 @@ { public: KWindowInfoPrivateX11(WId window, NET::Properties properties, NET::Properties2 properties2); - ~KWindowInfoPrivateX11(); + ~KWindowInfoPrivateX11() override; - bool valid(bool withdrawn_is_valid) const Q_DECL_OVERRIDE; - NET::States state() const Q_DECL_OVERRIDE; - bool isMinimized() const Q_DECL_OVERRIDE; - NET::MappingState mappingState() const Q_DECL_OVERRIDE; - NETExtendedStrut extendedStrut() const Q_DECL_OVERRIDE; - NET::WindowType windowType(NET::WindowTypes supported_types) const Q_DECL_OVERRIDE; - QString visibleName() const Q_DECL_OVERRIDE; - QString visibleNameWithState() const Q_DECL_OVERRIDE; - QString name() const Q_DECL_OVERRIDE; - QString visibleIconName() const Q_DECL_OVERRIDE; - QString visibleIconNameWithState() const Q_DECL_OVERRIDE; - QString iconName() const Q_DECL_OVERRIDE; - bool onAllDesktops() const Q_DECL_OVERRIDE; - bool isOnDesktop(int desktop) const Q_DECL_OVERRIDE; - int desktop() const Q_DECL_OVERRIDE; - QStringList activities() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - QRect frameGeometry() const Q_DECL_OVERRIDE; - WId transientFor() const Q_DECL_OVERRIDE; - WId groupLeader() const Q_DECL_OVERRIDE; - QByteArray windowClassClass() const Q_DECL_OVERRIDE; - QByteArray windowClassName() const Q_DECL_OVERRIDE; - QByteArray windowRole() const Q_DECL_OVERRIDE; - QByteArray clientMachine() const Q_DECL_OVERRIDE; - bool actionSupported(NET::Action action) const Q_DECL_OVERRIDE; + bool valid(bool withdrawn_is_valid) const override; + NET::States state() const override; + bool isMinimized() const override; + NET::MappingState mappingState() const override; + NETExtendedStrut extendedStrut() const override; + NET::WindowType windowType(NET::WindowTypes supported_types) const override; + QString visibleName() const override; + QString visibleNameWithState() const override; + QString name() const override; + QString visibleIconName() const override; + QString visibleIconNameWithState() const override; + QString iconName() const override; + bool onAllDesktops() const override; + bool isOnDesktop(int desktop) const override; + int desktop() const override; + QStringList activities() const override; + QRect geometry() const override; + QRect frameGeometry() const override; + WId transientFor() const override; + WId groupLeader() const override; + QByteArray windowClassClass() const override; + QByteArray windowClassName() const override; + QByteArray windowRole() const override; + QByteArray clientMachine() const override; + bool actionSupported(NET::Action action) const override; - QByteArray desktopFileName() const Q_DECL_OVERRIDE; + QByteArray desktopFileName() const override; - int pid() const Q_DECL_OVERRIDE; + int pid() const override; private: QScopedPointer<NETWinInfo> m_info; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kwindowsystem_p_x11.h new/kwindowsystem-5.48.0/src/platforms/xcb/kwindowsystem_p_x11.h --- old/kwindowsystem-5.47.0/src/platforms/xcb/kwindowsystem_p_x11.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kwindowsystem_p_x11.h 2018-07-08 00:33:30.000000000 +0200 @@ -30,56 +30,56 @@ class KWindowSystemPrivateX11 : public KWindowSystemPrivate { public: - QList<WId> windows() Q_DECL_OVERRIDE; - QList<WId> stackingOrder() Q_DECL_OVERRIDE; - WId activeWindow() Q_DECL_OVERRIDE; - void activateWindow(WId win, long time) Q_DECL_OVERRIDE; - void forceActiveWindow(WId win, long time) Q_DECL_OVERRIDE; - void demandAttention(WId win, bool set) Q_DECL_OVERRIDE; - bool compositingActive() Q_DECL_OVERRIDE; - int currentDesktop() Q_DECL_OVERRIDE; - int numberOfDesktops() Q_DECL_OVERRIDE; - void setCurrentDesktop(int desktop) Q_DECL_OVERRIDE; - void setOnAllDesktops(WId win, bool b) Q_DECL_OVERRIDE; - void setOnDesktop(WId win, int desktop) Q_DECL_OVERRIDE; - void setOnActivities(WId win, const QStringList &activities) Q_DECL_OVERRIDE; + QList<WId> windows() override; + QList<WId> stackingOrder() override; + WId activeWindow() override; + void activateWindow(WId win, long time) override; + void forceActiveWindow(WId win, long time) override; + void demandAttention(WId win, bool set) override; + bool compositingActive() override; + int currentDesktop() override; + int numberOfDesktops() override; + void setCurrentDesktop(int desktop) override; + void setOnAllDesktops(WId win, bool b) override; + void setOnDesktop(WId win, int desktop) override; + void setOnActivities(WId win, const QStringList &activities) override; #ifndef KWINDOWSYSTEM_NO_DEPRECATED - WId transientFor(WId window) Q_DECL_OVERRIDE; - WId groupLeader(WId window) Q_DECL_OVERRIDE; + WId transientFor(WId window) override; + WId groupLeader(WId window) override; #endif - QPixmap icon(WId win, int width, int height, bool scale, int flags) Q_DECL_OVERRIDE; - QPixmap iconFromNetWinInfo(int width, int height, bool scale, int flags, NETWinInfo *info) Q_DECL_OVERRIDE; - void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) Q_DECL_OVERRIDE; - void setType(WId win, NET::WindowType windowType) Q_DECL_OVERRIDE; - void setState(WId win, NET::States state) Q_DECL_OVERRIDE; - void clearState(WId win, NET::States state) Q_DECL_OVERRIDE; - void minimizeWindow(WId win) Q_DECL_OVERRIDE; - void unminimizeWindow(WId win) Q_DECL_OVERRIDE; - void raiseWindow(WId win) Q_DECL_OVERRIDE; - void lowerWindow(WId win) Q_DECL_OVERRIDE; - bool icccmCompliantMappingState() Q_DECL_OVERRIDE; - QRect workArea(int desktop) Q_DECL_OVERRIDE; - QRect workArea(const QList<WId> &excludes, int desktop) Q_DECL_OVERRIDE; - QString desktopName(int desktop) Q_DECL_OVERRIDE; - void setDesktopName(int desktop, const QString &name) Q_DECL_OVERRIDE; - bool showingDesktop() Q_DECL_OVERRIDE; - void setShowingDesktop(bool showing) Q_DECL_OVERRIDE; - void setUserTime(WId win, long time) Q_DECL_OVERRIDE; + QPixmap icon(WId win, int width, int height, bool scale, int flags) override; + QPixmap iconFromNetWinInfo(int width, int height, bool scale, int flags, NETWinInfo *info) override; + void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) override; + void setType(WId win, NET::WindowType windowType) override; + void setState(WId win, NET::States state) override; + void clearState(WId win, NET::States state) override; + void minimizeWindow(WId win) override; + void unminimizeWindow(WId win) override; + void raiseWindow(WId win) override; + void lowerWindow(WId win) override; + bool icccmCompliantMappingState() override; + QRect workArea(int desktop) override; + QRect workArea(const QList<WId> &excludes, int desktop) override; + QString desktopName(int desktop) override; + void setDesktopName(int desktop, const QString &name) override; + bool showingDesktop() override; + void setShowingDesktop(bool showing) override; + void setUserTime(WId win, long time) override; void setExtendedStrut(WId win, int left_width, int left_start, int left_end, int right_width, int right_start, int right_end, int top_width, int top_start, int top_end, - int bottom_width, int bottom_start, int bottom_end) Q_DECL_OVERRIDE; - void setStrut(WId win, int left, int right, int top, int bottom) Q_DECL_OVERRIDE; - bool allowedActionsSupported() Q_DECL_OVERRIDE; - QString readNameProperty(WId window, unsigned long atom) Q_DECL_OVERRIDE; - void allowExternalProcessWindowActivation(int pid) Q_DECL_OVERRIDE; - void setBlockingCompositing(WId window, bool active) Q_DECL_OVERRIDE; - bool mapViewport() Q_DECL_OVERRIDE; - int viewportToDesktop(const QPoint &pos) Q_DECL_OVERRIDE; - int viewportWindowToDesktop(const QRect &r) Q_DECL_OVERRIDE; - QPoint desktopToViewport(int desktop, bool absolute) Q_DECL_OVERRIDE; - QPoint constrainViewportRelativePosition(const QPoint &pos) Q_DECL_OVERRIDE; + int bottom_width, int bottom_start, int bottom_end) override; + void setStrut(WId win, int left, int right, int top, int bottom) override; + bool allowedActionsSupported() override; + QString readNameProperty(WId window, unsigned long atom) override; + void allowExternalProcessWindowActivation(int pid) override; + void setBlockingCompositing(WId window, bool active) override; + bool mapViewport() override; + int viewportToDesktop(const QPoint &pos) override; + int viewportWindowToDesktop(const QRect &r) override; + QPoint desktopToViewport(int desktop, bool absolute) override; + QPoint constrainViewportRelativePosition(const QPoint &pos) override; - void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &signal) override; enum FilterInfo { INFO_BASIC = 1, // desktop info, not per-window @@ -111,7 +111,7 @@ { public: NETEventFilter(KWindowSystemPrivateX11::FilterInfo _what); - ~NETEventFilter(); + ~NETEventFilter() override; void activate(); QList<WId> windows; QList<WId> stackingOrder; @@ -132,14 +132,14 @@ int xfixesEventBase; bool mapViewport(); - bool nativeEventFilter(const QByteArray &eventType, void *message, long int *result) Q_DECL_OVERRIDE; + bool nativeEventFilter(const QByteArray &eventType, void *message, long int *result) override; void updateStackingOrder(); bool removeStrutWindow(WId); protected: - void addClient(xcb_window_t) Q_DECL_OVERRIDE; - void removeClient(xcb_window_t) Q_DECL_OVERRIDE; + void addClient(xcb_window_t) override; + void removeClient(xcb_window_t) override; private: bool nativeEventFilter(xcb_generic_event_t *event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kxerrorhandler.cpp new/kwindowsystem-5.48.0/src/platforms/xcb/kxerrorhandler.cpp --- old/kwindowsystem-5.47.0/src/platforms/xcb/kxerrorhandler.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kxerrorhandler.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -176,9 +176,9 @@ Display *dpy2 = XOpenDisplay(XDisplayString(dpy)); int nextensions; char **extensions = XListExtensions(dpy2, &nextensions); - int *majors = NULL; - int *error_bases = NULL; - if (extensions == NULL) { + int *majors = nullptr; + int *error_bases = nullptr; + if (extensions == nullptr) { nextensions = 0; } else { majors = new int[ nextensions ]; @@ -238,7 +238,7 @@ if (event.resourceid != 0) { ret += QByteArray(", resource: 0x") + QByteArray::number((qlonglong)event.resourceid, 16); } - if (extensions != NULL) { + if (extensions != nullptr) { XFreeExtensionList(extensions); } delete[] majors; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kxmessages.cpp new/kwindowsystem-5.48.0/src/platforms/xcb/kxmessages.cpp --- old/kwindowsystem-5.47.0/src/platforms/xcb/kxmessages.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kxmessages.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -135,7 +135,7 @@ xcb_connection_t *connection; xcb_window_t rootWindow; - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override { Q_UNUSED(result); // A faster comparison than eventType != "xcb_generic_event_t" @@ -285,7 +285,7 @@ bool KXMessages::sendMessageX(Display *disp, WId w_P, const char *msg_type_P, const QString &message_P) { - if (disp == NULL) { + if (disp == nullptr) { return false; } Atom a2 = XInternAtom(disp, msg_type_P, false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/kxmessages.h new/kwindowsystem-5.48.0/src/platforms/xcb/kxmessages.h --- old/kwindowsystem-5.47.0/src/platforms/xcb/kxmessages.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/kxmessages.h 2018-07-08 00:33:30.000000000 +0200 @@ -55,7 +55,7 @@ /** * Creates an instance which will receive X messages. * - * @param accept_broadcast if non-NULL, all broadcast messages with + * @param accept_broadcast if non-nullptr, all broadcast messages with * this message type will be received. * @param parent the parent of this widget */ @@ -67,14 +67,14 @@ * * @param connection The xcb connection * @param rootWindow The rootWindow to use - * @param accept_broadcast if non-NULL, all broadcast messages with + * @param accept_broadcast if non-nullptr, all broadcast messages with * this message type will be received. * @param parent the parent of this object * @since 5.8 **/ explicit KXMessages(xcb_connection_t *connection, xcb_window_t rootWindow, const char *accept_broadcast = nullptr, QObject *parent = nullptr); - virtual ~KXMessages(); + ~KXMessages() override; /** * Broadcasts the given message with the given message type. * @param msg_type the type of the message diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/src/platforms/xcb/plugin.h new/kwindowsystem-5.48.0/src/platforms/xcb/plugin.h --- old/kwindowsystem-5.47.0/src/platforms/xcb/plugin.h 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/src/platforms/xcb/plugin.h 2018-07-08 00:33:30.000000000 +0200 @@ -30,11 +30,11 @@ public: explicit X11Plugin(QObject *parent = nullptr); - virtual ~X11Plugin(); + ~X11Plugin() override; - KWindowEffectsPrivate *createEffects() Q_DECL_OVERRIDE; - KWindowSystemPrivate *createWindowSystem() Q_DECL_OVERRIDE; - KWindowInfoPrivate *createWindowInfo(WId window, NET::Properties properties, NET::Properties2 properties2) Q_DECL_OVERRIDE; + KWindowEffectsPrivate *createEffects() override; + KWindowSystemPrivate *createWindowSystem() override; + KWindowInfoPrivate *createWindowInfo(WId window, NET::Properties properties, NET::Properties2 properties2) override; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/tests/backgroundcontrasttest.cpp new/kwindowsystem-5.48.0/tests/backgroundcontrasttest.cpp --- old/kwindowsystem-5.47.0/tests/backgroundcontrasttest.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/tests/backgroundcontrasttest.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -29,7 +29,7 @@ public: ContrastTestWindow(); - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) override; private: QPushButton *m_btnNothing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.47.0/tests/blurbehindtest.cpp new/kwindowsystem-5.48.0/tests/blurbehindtest.cpp --- old/kwindowsystem-5.47.0/tests/blurbehindtest.cpp 2018-06-02 20:09:11.000000000 +0200 +++ new/kwindowsystem-5.48.0/tests/blurbehindtest.cpp 2018-07-08 00:33:30.000000000 +0200 @@ -28,7 +28,7 @@ public: BlurTestWindow(); - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) override; private: QPushButton *m_btnNothing;
