Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2017-07-05 23:53:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Wed Jul 5 23:53:38 2017 rev:46 rq:502976 version:5.35.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2017-06-01 16:21:52.291027614 +0200 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2017-07-05 23:53:39.356653369 +0200 @@ -1,0 +2,17 @@ +Sun Jun 11 09:27:43 CEST 2017 - [email protected] + +- Update to 5.35.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.35.0.php +- Changes since 5.34.0: + * Better fix for NetRootInfoTestWM in path with spaces + * Revert broken fix TestKWindowsystemPlatformWayland in path with spaces + * Un-bitrot debug code + * Fix TestKWindowsystemPlatformWayland & NetRootInfoTestWM in path with spaces + * use Q_FALLTHROUGH + * Use explicit flag values or explicit constructor instead of nullptr + * Add .arcconfig + * API dox: Fix usage of @link, using JavaDoc style + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.34.0.tar.xz New: ---- kwindowsystem-5.35.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.3nnxIT/_old 2017-07-05 23:53:40.292521544 +0200 +++ /var/tmp/diff_new_pack.3nnxIT/_new 2017-07-05 23:53:40.292521544 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5WindowSystem5 -%define _tar_path 5.34 +%define _tar_path 5.35 Name: kwindowsystem -Version: 5.34.0 +Version: 5.35.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kwindowsystem-5.34.0.tar.xz -> kwindowsystem-5.35.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/.arcconfig new/kwindowsystem-5.35.0/.arcconfig --- old/kwindowsystem-5.34.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/kwindowsystem-5.35.0/.arcconfig 2017-06-03 12:22:49.000000000 +0200 @@ -0,0 +1,3 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/"; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/CMakeLists.txt new/kwindowsystem-5.35.0/CMakeLists.txt --- old/kwindowsystem-5.34.0/CMakeLists.txt 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/CMakeLists.txt 2017-06-03 12:22:49.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.34.0") # handled by release scripts +set(KF5_VERSION "5.35.0") # handled by release scripts project(KWindowSystem VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.34.0 NO_MODULE) +find_package(ECM 5.35.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.34.0/autotests/kstartupinfo_unittest.cpp new/kwindowsystem-5.35.0/autotests/kstartupinfo_unittest.cpp --- old/kwindowsystem-5.34.0/autotests/kstartupinfo_unittest.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/autotests/kstartupinfo_unittest.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -272,7 +272,7 @@ wmClass.length() * 2 + 1, "kstartupinfotest\0kstartupinfotest"); xcb_change_property(c, XCB_PROP_MODE_REPLACE, window, XCB_ATOM_WM_CLIENT_MACHINE, XCB_ATOM_STRING, 8, 9, "localhost"); - NETWinInfo winInfo(QX11Info::connection(), window, QX11Info::appRootWindow(), nullptr, nullptr); + NETWinInfo winInfo(QX11Info::connection(), window, QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); winInfo.setPid(pid); KStartupInfo info(KStartupInfo::DisableKWinModule | KStartupInfo::AnnounceSilenceChanges, this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/autotests/kwindowinfox11test.cpp new/kwindowsystem-5.35.0/autotests/kwindowinfox11test.cpp --- old/kwindowsystem-5.34.0/autotests/kwindowinfox11test.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/autotests/kwindowinfox11test.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -502,7 +502,7 @@ QSignalSpy spyReal(KWindowSystem::self(), static_cast<void (KWindowSystem::*)(WId,NET::Properties,NET::Properties2)>(&KWindowSystem::windowChanged)); QVERIFY(spyReal.isValid()); - KWindowInfo info(window->winId(), nullptr, NET::WM2Activities); + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2Activities); QVERIFY(info.valid()); QStringList startingActivities = info.activities(); @@ -517,7 +517,7 @@ QVERIFY(waitForWindow(spyReal, window->winId(), NET::Properties(), NET::WM2Activities)); - KWindowInfo info2(window->winId(), nullptr, NET::WM2Activities); + KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2Activities); QVERIFY(info2.activities().size() == 0); @@ -526,7 +526,7 @@ QVERIFY(waitForWindow(spyReal, window->winId(), NET::Properties(), NET::WM2Activities)); - KWindowInfo info3(window->winId(), nullptr, NET::WM2Activities); + KWindowInfo info3(window->winId(), NET::Properties(), NET::WM2Activities); QVERIFY(info3.activities().size() == 1); QVERIFY(info3.activities()[0] == "test-activity"); @@ -536,7 +536,7 @@ QVERIFY(waitForWindow(spyReal, window->winId(), NET::Properties(), NET::WM2Activities)); - KWindowInfo info4(window->winId(), nullptr, NET::WM2Activities); + KWindowInfo info4(window->winId(), NET::Properties(), NET::WM2Activities); QVERIFY(info4.activities().size() == 2); QVERIFY(info4.activities()[0] == "test-activity"); @@ -547,14 +547,14 @@ QVERIFY(waitForWindow(spyReal, window->winId(), NET::Properties(), NET::WM2Activities)); - KWindowInfo info5(window->winId(), nullptr, NET::WM2Activities); + KWindowInfo info5(window->winId(), NET::Properties(), NET::WM2Activities); QVERIFY(info5.activities() == startingActivities); } void KWindowInfoX11Test::testWindowClass() { - KWindowInfo info(window->winId(), nullptr, NET::WM2WindowClass); + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2WindowClass); QCOMPARE(info.windowClassName(), QByteArrayLiteral("kwindowinfox11test")); QCOMPARE(info.windowClassClass(), QByteArrayLiteral("kwindowinfox11test")); @@ -566,14 +566,14 @@ // it's just a property change so we can easily refresh QX11Info::getTimestamp(); - KWindowInfo info2(window->winId(), nullptr, NET::WM2WindowClass); + KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2WindowClass); QCOMPARE(info2.windowClassName(), QByteArrayLiteral("foo")); QCOMPARE(info2.windowClassClass(), QByteArrayLiteral("bar")); } void KWindowInfoX11Test::testWindowRole() { - KWindowInfo info(window->winId(), nullptr, NET::WM2WindowRole); + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2WindowRole); QVERIFY(info.windowRole().isNull()); // window role needs to be changed using xcb @@ -585,13 +585,13 @@ // it's just a property change so we can easily refresh QX11Info::getTimestamp(); - KWindowInfo info2(window->winId(), nullptr, NET::WM2WindowRole); + KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2WindowRole); QCOMPARE(info2.windowRole(), QByteArrayLiteral("bar")); } void KWindowInfoX11Test::testClientMachine() { - KWindowInfo info(window->winId(), nullptr, NET::WM2ClientMachine); + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2ClientMachine); QVERIFY(info.clientMachine().isNull()); // client machine needs to be set through xcb @@ -602,7 +602,7 @@ // it's just a property change so we can easily refresh QX11Info::getTimestamp(); - KWindowInfo info2(window->winId(), nullptr, NET::WM2ClientMachine); + KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2ClientMachine); QCOMPARE(info2.clientMachine(), QByteArrayLiteral("localhost")); } @@ -637,7 +637,7 @@ } // create a low level NETWinInfo to manipulate the name - NETWinInfo winInfo(QX11Info::connection(), window->winId(), QX11Info::appRootWindow(), NET::WMName, nullptr); + NETWinInfo winInfo(QX11Info::connection(), window->winId(), QX11Info::appRootWindow(), NET::WMName, NET::Properties2()); winInfo.setName("foobar"); QX11Info::getTimestamp(); @@ -653,7 +653,7 @@ void KWindowInfoX11Test::testTransientFor() { - KWindowInfo info(window->winId(), nullptr, NET::WM2TransientFor); + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2TransientFor); QCOMPARE(info.transientFor(), WId(0)); // let's create a second window @@ -667,13 +667,13 @@ XCB_ATOM_WM_TRANSIENT_FOR, XCB_ATOM_WINDOW, 32, 1, &id); xcb_flush(QX11Info::connection()); - KWindowInfo info2(window->winId(), nullptr, NET::WM2TransientFor); + KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2TransientFor); QCOMPARE(info2.transientFor(), window2->winId()); } void KWindowInfoX11Test::testGroupLeader() { - KWindowInfo info(window->winId(), nullptr, NET::WM2GroupLeader); + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2GroupLeader); QCOMPARE(info.groupLeader(), WId(0)); // TODO: here we should try to set a group leader and re-read it @@ -682,7 +682,7 @@ void KWindowInfoX11Test::testExtendedStrut() { - KWindowInfo info(window->winId(), nullptr, NET::WM2ExtendedStrut); + KWindowInfo info(window->winId(), NET::Properties(), NET::WM2ExtendedStrut); NETExtendedStrut strut = info.extendedStrut(); QCOMPARE(strut.bottom_end, 0); QCOMPARE(strut.bottom_start, 0); @@ -702,7 +702,7 @@ // it's just an xprop, so one roundtrip is good enough QX11Info::getTimestamp(); - KWindowInfo info2(window->winId(), nullptr, NET::WM2ExtendedStrut); + KWindowInfo info2(window->winId(), NET::Properties(), NET::WM2ExtendedStrut); strut = info2.extendedStrut(); QCOMPARE(strut.bottom_end, 32); QCOMPARE(strut.bottom_start, 22); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/autotests/kwindowsystemx11test.cpp new/kwindowsystem-5.35.0/autotests/kwindowsystemx11test.cpp --- old/kwindowsystem-5.34.0/autotests/kwindowsystemx11test.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/autotests/kwindowsystemx11test.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -146,7 +146,7 @@ // KWin has arbitrary max number of 20 desktops, so don't fail the test if we use +1 const int newNumber = oldNumber < 20 ? oldNumber + 1 : oldNumber - 1; - NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops, nullptr); + NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops, NET::Properties2()); info.setNumberOfDesktops(newNumber); QVERIFY(spy.wait()); @@ -196,7 +196,7 @@ QSignalSpy spy(KWindowSystem::self(), SIGNAL(showingDesktopChanged(bool))); - NETRootInfo info(QX11Info::connection(), nullptr, NET::WM2ShowingDesktop); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::WM2ShowingDesktop); info.setShowingDesktop(!showingDesktop); QVERIFY(spy.wait()); @@ -344,7 +344,7 @@ // now let's verify the info in KWindowInfo // we wait a little bit more as openbox is updating the visible name QTest::qWait(500); - KWindowInfo info(widget.winId(), NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMIconName, nullptr); + KWindowInfo info(widget.winId(), NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMIconName, NET::Properties2()); QVERIFY(info.valid()); const QString expectedName = QStringLiteral("bar"); QCOMPARE(info.name(), expectedName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/autotests/netrootinfotestwm.cpp new/kwindowsystem-5.35.0/autotests/netrootinfotestwm.cpp --- old/kwindowsystem-5.34.0/autotests/netrootinfotestwm.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/autotests/netrootinfotestwm.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -861,7 +861,7 @@ void NetRootInfoTestWM::testDontCrashMapViewports() { QProcess p; - p.start(QStringLiteral("%1/dontcrashmapviewport").arg(AUTOTEST_BUILD_DIR)); + p.start(QLatin1String(AUTOTEST_BUILD_DIR) + QLatin1String("/dontcrashmapviewport"), QStringList()); QVERIFY(p.waitForFinished()); QCOMPARE(p.exitStatus(), QProcess::NormalExit); QCOMPARE(p.exitCode(), 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/autotests/nettesthelper.h new/kwindowsystem-5.35.0/autotests/nettesthelper.h --- old/kwindowsystem-5.34.0/autotests/nettesthelper.h 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/autotests/nettesthelper.h 2017-06-03 12:22:49.000000000 +0200 @@ -48,7 +48,7 @@ * can be used to check whether the returned value is valid. * * This class has two modes of operations: a direct one which performs the request directly - * during construction, and an indirect one which needs an explicit call to @link fetch. + * during construction, and an indirect one which needs an explicit call to {@link fetch}. * * @code * Atom direct(QX11Info::connection(), QByteArrayLiteral("myAtomName")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/autotests/netwininfotestwm.cpp new/kwindowsystem-5.35.0/autotests/netwininfotestwm.cpp --- old/kwindowsystem-5.34.0/autotests/netwininfotestwm.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/autotests/netwininfotestwm.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -264,7 +264,7 @@ ATOM(_NET_WM_ALLOWED_ACTIONS) INFO - QCOMPARE(info.allowedActions(), NET::Actions(nullptr)); + QCOMPARE(info.allowedActions(), NET::Actions()); QFETCH(NET::Actions, actions); info.setAllowedActions(actions); QCOMPARE(info.allowedActions(), actions); @@ -472,9 +472,9 @@ ATOM(_NET_WM_STATE) INFO - QCOMPARE(info.state(), NET::States(nullptr)); + QCOMPARE(info.state(), NET::States()); QFETCH(NET::States, states); - info.setState(states, nullptr); + info.setState(states, NET::States()); QCOMPARE(info.state(), states); // compare with the X property diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/po/he/kwindowsystem5_qt.po new/kwindowsystem-5.35.0/po/he/kwindowsystem5_qt.po --- old/kwindowsystem-5.34.0/po/he/kwindowsystem5_qt.po 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/po/he/kwindowsystem5_qt.po 2017-06-03 12:22:49.000000000 +0200 @@ -17,19 +17,17 @@ # Meni Livne <[email protected]>, 2007. # tahmar1900 <[email protected]>, 2008, 2009. # Elkana Bardugo <[email protected]>, 2016. +# Elkana Bardugo <[email protected]>, 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2016-06-29 19:55+0200\n" -"Last-Translator: Elkana Bardugo <[email protected]>\n" +"PO-Revision-Date: 2017-05-16 06:50-0400\n" +"Last-Translator: Copied by Zanata <[email protected]>\n" "Language-Team: Hebrew <[email protected]>\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Zanata 3.9.6\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/kstartupinfo.cpp new/kwindowsystem-5.35.0/src/kstartupinfo.cpp --- old/kwindowsystem-5.34.0/src/kstartupinfo.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/kstartupinfo.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -964,11 +964,11 @@ if (!QX11Info::isPlatformX11()) { return QByteArray(); } - NETWinInfo info(QX11Info::connection(), w_P, QX11Info::appRootWindow(), nullptr, NET::WM2StartupId | NET::WM2GroupLeader); + NETWinInfo info(QX11Info::connection(), w_P, QX11Info::appRootWindow(), NET::Properties(), NET::WM2StartupId | NET::WM2GroupLeader); QByteArray ret = info.startupId(); if (ret.isEmpty() && info.groupLeader() != XCB_WINDOW_NONE) { // retry with window group leader, as the spec says - NETWinInfo groupLeaderInfo(QX11Info::connection(), info.groupLeader(), QX11Info::appRootWindow(), nullptr, NET::WM2StartupId); + NETWinInfo groupLeaderInfo(QX11Info::connection(), info.groupLeader(), QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); ret = groupLeaderInfo.startupId(); } return ret; @@ -987,7 +987,7 @@ if (id_P.isNull()) { return; } - NETWinInfo info(QX11Info::connection(), w_P, QX11Info::appRootWindow(), nullptr, nullptr); + NETWinInfo info(QX11Info::connection(), w_P, QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); info.setStartupId(id_P.constData()); #else Q_UNUSED(w_P) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/kwindowinfo.cpp new/kwindowsystem-5.35.0/src/kwindowinfo.cpp --- old/kwindowsystem-5.34.0/src/kwindowinfo.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/kwindowinfo.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -112,7 +112,7 @@ NET::States KWindowInfoPrivateDummy::state() const { - return nullptr; + return NET::States(); } bool KWindowInfoPrivateDummy::isMinimized() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/kwindowinfo.h new/kwindowsystem-5.35.0/src/kwindowinfo.h --- old/kwindowsystem-5.34.0/src/kwindowinfo.h 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/kwindowinfo.h 2017-06-03 12:22:49.000000000 +0200 @@ -83,7 +83,7 @@ * @param properties Bitmask of NET::Property * @param properties2 Bitmask of NET::Property2 */ - KWindowInfo(WId window, NET::Properties properties, NET::Properties2 properties2 = nullptr); + KWindowInfo(WId window, NET::Properties properties, NET::Properties2 properties2 = NET::Properties2()); ~KWindowInfo(); /** * Returns false if this window info is not valid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/kwindowsystem.h new/kwindowsystem-5.35.0/src/kwindowsystem.h --- old/kwindowsystem-5.34.0/src/kwindowsystem.h 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/kwindowsystem.h 2017-06-03 12:22:49.000000000 +0200 @@ -99,7 +99,7 @@ * @return the window information * @deprecated use KWindowInfo directly */ - KWINDOWSYSTEM_DEPRECATED static KWindowInfo windowInfo(WId win, NET::Properties properties, NET::Properties2 properties2 = nullptr); + KWINDOWSYSTEM_DEPRECATED static KWindowInfo windowInfo(WId win, NET::Properties properties, NET::Properties2 properties2 = NET::Properties2()); #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/platforms/xcb/kwindowinfo.cpp new/kwindowsystem-5.35.0/src/platforms/xcb/kwindowinfo.cpp --- old/kwindowsystem-5.34.0/src/platforms/xcb/kwindowinfo.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/platforms/xcb/kwindowinfo.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -272,7 +272,7 @@ if (m_info->passedProperties() & NET::WMState) { return m_info->state() & NET::Sticky; } - NETWinInfo info(QX11Info::connection(), win(), QX11Info::appRootWindow(), NET::WMState, nullptr); + NETWinInfo info(QX11Info::connection(), win(), QX11Info::appRootWindow(), NET::WMState, NET::Properties2()); return info.state() & NET::Sticky; } return m_info->desktop() == NET::OnAllDesktops; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/platforms/xcb/kwindowsystem.cpp new/kwindowsystem-5.35.0/src/platforms/xcb/kwindowsystem.cpp --- old/kwindowsystem-5.34.0/src/platforms/xcb/kwindowsystem.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/platforms/xcb/kwindowsystem.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -265,7 +265,7 @@ emit s_q->showingDesktopChanged(showingDesktop()); } } else if (windows.contains(eventWindow)) { - NETWinInfo ni(QX11Info::connection(), eventWindow, m_appRootWindow, nullptr, nullptr); + NETWinInfo ni(QX11Info::connection(), eventWindow, m_appRootWindow, NET::Properties(), NET::Properties2()); NET::Properties dirtyProperties; NET::Properties2 dirtyProperties2; ni.event(ev, &dirtyProperties, &dirtyProperties2); @@ -347,7 +347,7 @@ bool emit_strutChanged = false; if (strutSignalConnected) { - NETWinInfo info(QX11Info::connection(), w, QX11Info::appRootWindow(), NET::WMStrut | NET::WMDesktop, nullptr); + NETWinInfo info(QX11Info::connection(), w, QX11Info::appRootWindow(), NET::WMStrut | NET::WMDesktop, NET::Properties2()); NETStrut strut = info.strut(); if (strut.left || strut.top || strut.right || strut.bottom) { strutWindows.append(StrutData(w, strut, info.desktop())); @@ -370,7 +370,7 @@ bool emit_strutChanged = removeStrutWindow(w); if (strutSignalConnected && possibleStrutWindows.contains(w)) { - NETWinInfo info(QX11Info::connection(), w, QX11Info::appRootWindow(), NET::WMStrut, nullptr); + NETWinInfo info(QX11Info::connection(), w, QX11Info::appRootWindow(), NET::WMStrut, NET::Properties2()); NETStrut strut = info.strut(); if (strut.left || strut.top || strut.right || strut.bottom) { emit_strutChanged = true; @@ -562,7 +562,7 @@ if (mapViewport()) { init(INFO_BASIC); NETEventFilter *const s_d = s_d_func(); - NETRootInfo info(QX11Info::connection(), nullptr); + NETRootInfo info(QX11Info::connection(), NET::Properties()); QPoint pos = desktopToViewport(desktop, true); NETPoint p; p.x = pos.x(); @@ -570,7 +570,7 @@ info.setDesktopViewport(s_d->currentDesktop(true), p); return; } - NETRootInfo info(QX11Info::connection(), nullptr); + NETRootInfo info(QX11Info::connection(), NET::Properties()); info.setCurrentDesktop(desktop, true); } @@ -584,7 +584,7 @@ } return; } - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMDesktop, nullptr); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMDesktop, NET::Properties2()); if (b) { info.setDesktop(NETWinInfo::OnAllDesktops, true); } else if (info.desktop(true) == NETWinInfo::OnAllDesktops) { @@ -630,13 +630,13 @@ s_d->moveResizeWindowRequest(win, flags, p.x(), p.y(), w, h); return; } - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMDesktop, nullptr); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMDesktop, NET::Properties2()); info.setDesktop(desktop, true); } void KWindowSystemPrivateX11::setOnActivities(WId win, const QStringList &activities) { - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), nullptr, NET::WM2Activities); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::Properties(), NET::WM2Activities); info.setActivities(activities.join(QLatin1Char(',')).toLatin1().constData()); } @@ -652,7 +652,7 @@ void KWindowSystemPrivateX11::activateWindow(WId win, long time) { - NETRootInfo info(QX11Info::connection(), nullptr); + NETRootInfo info(QX11Info::connection(), NET::Properties()); if (time == 0) { time = QX11Info::appUserTime(); } @@ -662,7 +662,7 @@ void KWindowSystemPrivateX11::forceActiveWindow(WId win, long time) { - NETRootInfo info(QX11Info::connection(), nullptr); + NETRootInfo info(QX11Info::connection(), NET::Properties()); if (time == 0) { time = QX11Info::appTime(); } @@ -671,14 +671,14 @@ void KWindowSystemPrivateX11::demandAttention(WId win, bool set) { - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMState, nullptr); - info.setState(set ? NET::DemandsAttention : NET::States(nullptr), NET::DemandsAttention); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMState, NET::Properties2()); + info.setState(set ? NET::DemandsAttention : NET::States(), NET::DemandsAttention); } #ifndef KWINDOWSYSTEM_NO_DEPRECATED WId KWindowSystemPrivateX11::transientFor(WId win) { - KWindowInfo info(win, nullptr, NET::WM2TransientFor); + KWindowInfo info(win, NET::Properties(), NET::WM2TransientFor); return info.transientFor(); } #endif @@ -686,7 +686,7 @@ #ifndef KWINDOWSYSTEM_NO_DEPRECATED WId KWindowSystemPrivateX11::groupLeader(WId win) { - KWindowInfo info(win, nullptr, NET::WM2GroupLeader); + KWindowInfo info(win, NET::Properties(), NET::WM2GroupLeader); return info.groupLeader(); } #endif @@ -785,7 +785,7 @@ if (icon.isNull()) { return; } - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), nullptr, nullptr); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); QImage img = icon.toImage().convertToFormat(QImage::Format_ARGB32); NETIcon ni; ni.size.width = img.size().width(); @@ -807,20 +807,20 @@ void KWindowSystemPrivateX11::setType(WId win, NET::WindowType windowType) { - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), nullptr, nullptr); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); info.setWindowType(windowType); } void KWindowSystemPrivateX11::setState(WId win, NET::States state) { - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMState, nullptr); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMState, NET::Properties2()); info.setState(state, state); } void KWindowSystemPrivateX11::clearState(WId win, NET::States state) { - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMState, nullptr); - info.setState(nullptr, state); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::WMState, NET::Properties2()); + info.setState(NET::States(), state); } // enum values for ICCCM 4.1.2.4 and 4.1.4, defined to not depend on xcb-icccm @@ -941,7 +941,7 @@ strut = (*it2).strut; } else if (s_d->possibleStrutWindows.contains(*it1)) { - NETWinInfo info(QX11Info::connection(), (*it1), QX11Info::appRootWindow(), NET::WMStrut | NET::WMDesktop, nullptr); + NETWinInfo info(QX11Info::connection(), (*it1), QX11Info::appRootWindow(), NET::WMStrut | NET::WMDesktop, NET::Properties2()); strut = info.strut(); s_d->possibleStrutWindows.removeAll(*it1); s_d->strutWindows.append(NETEventFilter::StrutData(*it1, info.strut(), info.desktop())); @@ -1000,7 +1000,7 @@ return; } - NETRootInfo info(QX11Info::connection(), nullptr); + NETRootInfo info(QX11Info::connection(), NET::Properties()); info.setDesktopName(desktop, name.toUtf8().constData()); } @@ -1012,13 +1012,13 @@ void KWindowSystemPrivateX11::setShowingDesktop(bool showing) { - NETRootInfo info(QX11Info::connection(), nullptr, NET::WM2ShowingDesktop); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::WM2ShowingDesktop); info.setShowingDesktop(showing); } void KWindowSystemPrivateX11::setUserTime(WId win, long time) { - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), nullptr, nullptr); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); info.setUserTime(time); } @@ -1026,7 +1026,7 @@ 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) { - NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), nullptr, nullptr); + NETWinInfo info(QX11Info::connection(), win, QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); NETExtendedStrut strut; strut.left_width = left_width; strut.right_width = right_width; @@ -1110,7 +1110,7 @@ void KWindowSystemPrivateX11::setBlockingCompositing(WId window, bool active) { - NETWinInfo info(QX11Info::connection(), window, QX11Info::appRootWindow(), nullptr, nullptr); + NETWinInfo info(QX11Info::connection(), window, QX11Info::appRootWindow(), NET::Properties(), NET::Properties2()); info.setBlockingCompositing(active); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/platforms/xcb/kxutils.cpp new/kwindowsystem-5.35.0/src/platforms/xcb/kxutils.cpp --- old/kwindowsystem-5.34.0/src/platforms/xcb/kxutils.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/platforms/xcb/kxutils.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -66,6 +66,9 @@ pixels[i] = qRgba(r, g, b, 0xff); } // fall through, Qt format is still Format_ARGB32_Premultiplied +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + Q_FALLTHROUGH(); +#endif } case 32: format = QImage::Format_ARGB32_Premultiplied; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/platforms/xcb/netwm.cpp new/kwindowsystem-5.35.0/src/platforms/xcb/netwm.cpp --- old/kwindowsystem-5.34.0/src/platforms/xcb/netwm.cpp 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/platforms/xcb/netwm.cpp 2017-06-03 12:22:49.000000000 +0200 @@ -283,7 +283,7 @@ { const xcb_get_atom_name_cookie_t cookie = xcb_get_atom_name(c, atom); - xcb_get_atom_name_reply_t *reply = xcb_get_atom_name_reply(p->conn, cookie, 0); + xcb_get_atom_name_reply_t *reply = xcb_get_atom_name_reply(c, cookie, 0); if (!reply) { return QByteArray(); } @@ -549,11 +549,11 @@ setDefaultProperties(); p->clientProperties = properties; p->clientProperties2 = properties2; - p->properties = nullptr; - p->properties2 = nullptr; - p->windowTypes = nullptr; - p->states = nullptr; - p->actions = nullptr; + p->properties = NET::Properties(); + p->properties2 = NET::Properties2(); + p->windowTypes = NET::WindowTypes(); + p->states = NET::States(); + p->actions = NET::Actions(); p->role = Client; @@ -596,10 +596,10 @@ | ToolbarMask | MenuMask | DialogMask; p->states = Modal | Sticky | MaxVert | MaxHoriz | Shaded | SkipTaskbar | StaysOnTop; - p->properties2 = nullptr; - p->actions = nullptr; - p->clientProperties = nullptr; - p->clientProperties2 = nullptr; + p->properties2 = NET::Properties2(); + p->actions = NET::Actions(); + p->clientProperties = NET::Properties(); + p->clientProperties2 = NET::Properties2(); } void NETRootInfo::activate() @@ -1973,11 +1973,11 @@ if (dirty & Supported) { // Only in Client mode - p->properties = nullptr; - p->properties2 = nullptr; - p->windowTypes = nullptr; - p->states = nullptr; - p->actions = nullptr; + p->properties = NET::Properties(); + p->properties2 = NET::Properties2(); + p->windowTypes = NET::WindowTypes(); + p->states = NET::States(); + p->actions = NET::Actions(); const QVector<xcb_atom_t> atoms = get_array_reply<xcb_atom_t>(p->conn, cookies[c++], XCB_ATOM_ATOM); Q_FOREACH (const xcb_atom_t atom, atoms) { @@ -2325,21 +2325,21 @@ { return p->role == WindowManager ? p->states - : NET::States(nullptr); + : NET::States(); } NET::WindowTypes NETRootInfo::passedWindowTypes() const { return p->role == WindowManager ? p->windowTypes - : NET::WindowTypes(nullptr); + : NET::WindowTypes(); } NET::Actions NETRootInfo::passedActions() const { return p->role == WindowManager ? p->actions - : NET::Actions(nullptr); + : NET::Actions(); } void NETRootInfo::setSupported(NET::Property property, bool on) @@ -2565,7 +2565,7 @@ p->root = rootWindow; p->mapping_state = Withdrawn; p->mapping_state_dirty = true; - p->state = nullptr; + p->state = NET::States(); p->types[ 0 ] = Unknown; p->name = (char *) nullptr; p->visible_name = (char *) nullptr; @@ -2580,7 +2580,7 @@ p->window_group = XCB_NONE; p->icon_pixmap = XCB_PIXMAP_NONE; p->icon_mask = XCB_PIXMAP_NONE; - p->allowed_actions = nullptr; + p->allowed_actions = NET::Actions(); p->has_net_support = false; p->class_class = (char *) nullptr; p->class_name = (char *) nullptr; @@ -2628,7 +2628,7 @@ p->root = rootWindow; p->mapping_state = Withdrawn; p->mapping_state_dirty = true; - p->state = nullptr; + p->state = NET::States(); p->types[ 0 ] = Unknown; p->name = (char *) nullptr; p->visible_name = (char *) nullptr; @@ -2643,7 +2643,7 @@ p->window_group = XCB_NONE; p->icon_pixmap = XCB_PIXMAP_NONE; p->icon_mask = XCB_PIXMAP_NONE; - p->allowed_actions = nullptr; + p->allowed_actions = NET::Actions(); p->has_net_support = false; p->class_class = (char *) nullptr; p->class_name = (char *) nullptr; @@ -2663,7 +2663,7 @@ // p->frame_strut.bottom = 0; p->properties = properties; - p->properties2 = nullptr; + p->properties2 = NET::Properties2(); p->icon_count = 0; @@ -3607,16 +3607,13 @@ #endif int i; - NET::States state = nullptr, mask = nullptr; + NET::States state = NET::States(), mask = NET::States(); for (i = 1; i < 3; i++) { #ifdef NETWMDEBUG - char *debug_txt = XGetAtomName(p->display, (xcb_atom_t) message->data.data32[i]); + const QByteArray ba = get_atom_name(p->conn, (xcb_atom_t) message->data.data32[i]); fprintf(stderr, "NETWinInfo::event: message %ld '%s'\n", - message->data.data32[i], debug_txt); - if (debug_txt) { - XFree(debug_txt); - } + message->data.data32[i], ba.constData()); #endif if ((xcb_atom_t) message->data.data32[i] == p->atom(_NET_WM_STATE_MODAL)) { @@ -3999,7 +3996,7 @@ } if (dirty & WMState) { - p->state = nullptr; + p->state = NET::States(); const QVector<xcb_atom_t> states = get_array_reply<xcb_atom_t>(p->conn, cookies[c++], XCB_ATOM_ATOM); #ifdef NETWMDEBUG @@ -4354,7 +4351,7 @@ } if (dirty2 & WM2AllowedActions) { - p->allowed_actions = nullptr; + p->allowed_actions = NET::Actions(); const QVector<xcb_atom_t> actions = get_array_reply<xcb_atom_t>(p->conn, cookies[c++], XCB_ATOM_ATOM); if (actions.count() > 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.34.0/src/platforms/xcb/netwm.h new/kwindowsystem-5.35.0/src/platforms/xcb/netwm.h --- old/kwindowsystem-5.34.0/src/platforms/xcb/netwm.h 2017-05-06 14:02:19.000000000 +0200 +++ new/kwindowsystem-5.35.0/src/platforms/xcb/netwm.h 2017-06-03 12:22:49.000000000 +0200 @@ -120,7 +120,7 @@ @param doActivate true to call activate() to do an initial data read/update of the query information. **/ - NETRootInfo(xcb_connection_t *connection, NET::Properties properties, NET::Properties2 properties2 = nullptr, + NETRootInfo(xcb_connection_t *connection, NET::Properties properties, NET::Properties2 properties2 = NET::Properties2(), int screen = -1, bool doActivate = true); @@ -1415,7 +1415,7 @@ * The default value is @c XCB_PIXMAP_NONE. * * Using the ICCCM variant for the icon is deprecated and only - * offers a limited functionality compared to @link {icon}. + * offers a limited functionality compared to {@link icon}. * Only use this variant as a fallback. * * @see icccmIconPixmapMask @@ -1654,7 +1654,7 @@ } private: - void update(NET::Properties dirtyProperties, NET::Properties2 dirtyProperties2 = nullptr); + void update(NET::Properties dirtyProperties, NET::Properties2 dirtyProperties2 = NET::Properties2()); void updateWMState(); void setIconInternal(NETRArray<NETIcon> &icons, int &icon_count, xcb_atom_t property, NETIcon icon, bool replace); NETIcon iconInternal(NETRArray<NETIcon> &icons, int icon_count, int width, int height) const;
