Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2022-12-12 17:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Mon Dec 12 17:37:54 2022 rev:113 rq:1042107 version:5.101.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2022-11-15 13:19:01.516341705 +0100 +++ /work/SRC/openSUSE:Factory/.kconfig.new.1835/kconfig.changes 2022-12-12 17:39:30.377121528 +0100 @@ -1,0 +2,12 @@ +Tue Dec 6 20:10:27 UTC 2022 - Christophe Marin <[email protected]> + +- Update to 5.101.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.101.0 +- Changes since 5.100.0: + * Apply existing QScreen::name() workaround for Windows to new code (kde#429943) + * Fix parser treating empty IntList default as a list of single zero element: [0] + * Add test for empty default IntList config entry + +------------------------------------------------------------------- Old: ---- kconfig-5.100.0.tar.xz kconfig-5.100.0.tar.xz.sig New: ---- kconfig-5.101.0.tar.xz kconfig-5.101.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.6HbbEY/_old 2022-12-12 17:39:30.905124192 +0100 +++ /var/tmp/diff_new_pack.6HbbEY/_new 2022-12-12 17:39:30.913124232 +0100 @@ -17,18 +17,17 @@ %define sonum 5 -%define _tar_path 5.100 +%define _tar_path 5.101 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kconfig -Version: 5.100.0 +Version: 5.101.0 Release: 0 Summary: Advanced configuration system License: LGPL-2.1-or-later AND GPL-2.0-or-later -Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz %if %{with released} @@ -66,7 +65,6 @@ %package -n libKF5ConfigCore%{sonum} Summary: System for configuration files -Group: System/GUI/KDE %requires_ge libQt5Core5 Recommends: kconf_update5 = %{version} @@ -78,7 +76,6 @@ %package -n libKF5ConfigGui%{sonum} Summary: Widgets hooks for configuration entities -Group: System/GUI/KDE %requires_ge libKF5ConfigCore5 %requires_ge libQt5Core5 %requires_ge libQt5Gui5 @@ -91,7 +88,6 @@ %package -n libKF5ConfigQml%{sonum} Summary: QtQuick bindings for configuration entities -Group: System/GUI/KDE %requires_ge libKF5ConfigCore5 %requires_ge libKF5ConfigGui5 %requires_ge libQt5Core5 @@ -104,7 +100,6 @@ %package -n kconf_update5 Summary: Configuration file access -Group: System/GUI/KDE Requires: libKF5ConfigCore%{sonum} = %{version} %description -n kconf_update5 @@ -115,7 +110,6 @@ %package devel Summary: KConfig Development files -Group: Development/Libraries/KDE Requires: extra-cmake-modules Requires: kconf_update5 = %{version} Requires: libKF5ConfigCore%{sonum} = %{version} ++++++ kconfig-5.100.0.tar.xz -> kconfig-5.101.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/CMakeLists.txt new/kconfig-5.101.0/CMakeLists.txt --- old/kconfig-5.100.0/CMakeLists.txt 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/CMakeLists.txt 2022-12-03 10:43:37.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.100.0") # handled by release scripts +set(KF_VERSION "5.101.0") # handled by release scripts project(KConfig VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.100.0 NO_MODULE) +find_package(ECM 5.101.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/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/kconfig-5.100.0/autotests/kconfigloadertest.cpp new/kconfig-5.101.0/autotests/kconfigloadertest.cpp --- old/kconfig-5.100.0/autotests/kconfigloadertest.cpp 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/autotests/kconfigloadertest.cpp 2022-12-03 10:43:37.000000000 +0100 @@ -151,6 +151,13 @@ QVERIFY(typeItem->isEqual(QVariant::fromValue(expected))); } +void ConfigLoaderTest::intListEmptyDefaultValue() +{ + GET_CONFIG_ITEM_VALUE(KCoreConfigSkeleton::ItemIntList *, QStringLiteral("EmptyDefaultIntListItem")); + + QVERIFY(typeItem->value().isEmpty()); +} + void ConfigLoaderTest::longLongDefaultValue() { GET_CONFIG_ITEM_VALUE(KCoreConfigSkeleton::ItemLongLong *, QStringLiteral("DefaultLongLongItem")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/autotests/kconfigloadertest.h new/kconfig-5.101.0/autotests/kconfigloadertest.h --- old/kconfig-5.100.0/autotests/kconfigloadertest.h 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/autotests/kconfigloadertest.h 2022-12-03 10:43:37.000000000 +0100 @@ -35,6 +35,7 @@ void uintDefaultValue(); void urlDefaultValue(); void doubleDefaultValue(); + void intListEmptyDefaultValue(); void intListDefaultValue(); void longLongDefaultValue(); void pointDefaultValue(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/autotests/kconfigloadertest.xml new/kconfig-5.101.0/autotests/kconfigloadertest.xml --- old/kconfig-5.100.0/autotests/kconfigloadertest.xml 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/autotests/kconfigloadertest.xml 2022-12-03 10:43:37.000000000 +0100 @@ -49,6 +49,9 @@ <entry name="DefaultDoubleItem" type="Double"> <default>13.37</default> </entry> + <entry name="EmptyDefaultIntListItem" type="IntList"> + <default></default> + </entry> <entry name="DefaultIntListItem" type="IntList"> <default>1,1,2,3,5,8</default> </entry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/poqm/de/kconfig5_qt.po new/kconfig-5.101.0/poqm/de/kconfig5_qt.po --- old/kconfig-5.100.0/poqm/de/kconfig5_qt.po 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/poqm/de/kconfig5_qt.po 2022-12-03 10:43:37.000000000 +0100 @@ -2,20 +2,21 @@ # Thomas Reitelbach <[email protected]>, 2006, 2007, 2008. # Frederik Schwarzer <[email protected]>, 2012, 2014, 2015, 2016, 2020, 2022. # Burkhard Lück <[email protected]>, 2014, 2015, 2016, 2017, 2018, 2019, 2021. +# Frank Steinmetzger <[email protected]>, 2022. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2022-06-10 00:05+0200\n" -"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"PO-Revision-Date: 2022-11-10 21:00+0100\n" +"Last-Translator: Frank Steinmetzger <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 21.12.2\n" +"X-Generator: Lokalize 22.08.3\n" "X-Qt-Contexts: true\n" #: core/kconfig.cpp:965 @@ -507,16 +508,13 @@ msgstr "<file> statt globaler Konfigurationsdatei verwenden" #: kreadconfig/kreadconfig.cpp:49 kreadconfig/kwriteconfig.cpp:28 -#, fuzzy -#| msgctxt "main|" -#| msgid "Group to look in. Use repeatedly for nested groups." msgctxt "main|" msgid "" "Group to look in. Use \"<default>\" for the root group, or use repeatedly " "for nested groups." msgstr "" "Zu durchsuchende Gruppe. Mehrfach verwenden zur Suche in verschachtelten " -"Gruppen." +"Gruppen, oder â<default>â für die Wurzelgruppe." #: kreadconfig/kreadconfig.cpp:52 kreadconfig/kwriteconfig.cpp:31 msgctxt "main|" @@ -537,6 +535,8 @@ msgctxt "main|" msgid "Group name cannot be empty, use \"<default>\" for the root group" msgstr "" +"Der Gruppenname darf nicht leer sein, benutzen Sie â<default>â für die " +"Wurzelgruppe" #: kreadconfig/kwriteconfig.cpp:34 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/poqm/et/kconfig5_qt.po new/kconfig-5.101.0/poqm/et/kconfig5_qt.po --- old/kconfig-5.100.0/poqm/et/kconfig5_qt.po 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/poqm/et/kconfig5_qt.po 2022-12-03 10:43:37.000000000 +0100 @@ -2,20 +2,20 @@ # Copyright (C) 2003 Free Software Foundation, Inc. # # Marek Laane <[email protected]>, 2003,2007-2008, 2016, 2019, 2020. -# Mihkel Tõnnov <[email protected]>, 2020. +# Mihkel Tõnnov <[email protected]>, 2020, 2022. msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2020-09-28 01:37+0200\n" +"PO-Revision-Date: 2022-10-21 20:09+0200\n" "Last-Translator: Mihkel Tõnnov <[email protected]>\n" "Language-Team: Estonian <>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.08.1\n" +"X-Generator: Lokalize 22.08.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" @@ -312,9 +312,6 @@ msgstr "Puhasta" #: gui/kstandardshortcut.cpp:297 -#, fuzzy -#| msgctxt "KStandardShortcut|@action" -#| msgid "Actual Size" msgctxt "KStandardShortcut|@action" msgid "Zoom to Actual Size" msgstr "Tegelik suurus" @@ -509,14 +506,13 @@ msgstr "Globaalse seadistuse asemel kasutatakse faili <file>" #: kreadconfig/kreadconfig.cpp:49 kreadconfig/kwriteconfig.cpp:28 -#, fuzzy -#| msgctxt "main|" -#| msgid "Group to look in. Use repeatedly for nested groups." msgctxt "main|" msgid "" "Group to look in. Use \"<default>\" for the root group, or use repeatedly " "for nested groups." -msgstr "Otsitav grupp. Pesastatud gruppide puhul anna mitu korda." +msgstr "" +"Otsitav grupp. Juurgrupi jaoks anna \"<default>\", pesastatud gruppide puhul " +"anna mitu korda." #: kreadconfig/kreadconfig.cpp:52 kreadconfig/kwriteconfig.cpp:31 msgctxt "main|" @@ -537,6 +533,7 @@ msgctxt "main|" msgid "Group name cannot be empty, use \"<default>\" for the root group" msgstr "" +"Grupi nimi ei tohi tühi olla - kui soovid juurgruppi, anna \"<default>\"" #: kreadconfig/kwriteconfig.cpp:34 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/poqm/ka/kconfig5_qt.po new/kconfig-5.101.0/poqm/ka/kconfig5_qt.po --- old/kconfig-5.100.0/poqm/ka/kconfig5_qt.po 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/poqm/ka/kconfig5_qt.po 2022-12-03 10:43:37.000000000 +0100 @@ -11,7 +11,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2\n" #: core/kconfig.cpp:965 msgctxt "KConfig|" @@ -453,12 +453,12 @@ #: kconf_update/kconf_update.cpp:957 msgctxt "main|" msgid "KDE Tool for updating user configuration files" -msgstr "" +msgstr "KDE-áá¡ áá ááá ááá áááá®ááá ááááá¡ áááá¤ááá£á ááªááá¡ á¤ááááááá¡ ááááá®ááááá¡áááá¡" #: kconf_update/kconf_update.cpp:959 msgctxt "main|" msgid "Keep output results from scripts" -msgstr "" +msgstr "ááááá¢ááááá á¨áááááááá¡ á¡áá ááá¢áááá¡ááá ááááááá" #: kconf_update/kconf_update.cpp:962 msgctxt "main|" @@ -466,21 +466,23 @@ "For unit tests only: use test directories to stay away from the user's real " "files" msgstr "" +"áá®áááá áá ááá£ááá¡ á¢áá¡á¢áá áááá¡áááá¡: áááááá§áááá á¡áá¢áá¡á¢á á¡áá¥áá¦ááááááá, á ááá " +"áááá®ááá ááááá¡ á áááá£á á¤áááááá¡ áá á¨ááá®áá" #: kconf_update/kconf_update.cpp:964 msgctxt "main|" msgid "Check whether config file itself requires updating" -msgstr "" +msgstr "á¨áááá¬áááá, áááá¤ááá£á ááªááá¡ á¤áááá áááááá á®áá áá ááá®ááá¡ ááááá®ááááá¡" #: kconf_update/kconf_update.cpp:967 msgctxt "main|" msgid "File(s) to read update instructions from" -msgstr "" +msgstr "ááááá®ááááá¡ ááá¡á¢á á£á¥áªááááá¡ á¤áááá" #: kconfig_compiler/kconfig_compiler.cpp:708 msgctxt "main|" msgid "Directory to generate files in [.]" -msgstr "" +msgstr "á¤ááááááá¡ ááá¡áááááá áá ááááá á¡áá¥áá¦áááá [.]" #: kconfig_compiler/kconfig_compiler.cpp:709 msgctxt "main|" @@ -495,7 +497,7 @@ #: kreadconfig/kreadconfig.cpp:46 kreadconfig/kwriteconfig.cpp:25 msgctxt "main|" msgid "Use <file> instead of global config" -msgstr "" +msgstr "ááááááá£á á áááá¤ááá£á ááªááá¡ áááááá <file> -áá¡ ááááá§ááááá" #: kreadconfig/kreadconfig.cpp:49 kreadconfig/kwriteconfig.cpp:28 msgctxt "main|" @@ -503,6 +505,8 @@ "Group to look in. Use \"<default>\" for the root group, or use repeatedly " "for nested groups." msgstr "" +"ááá¡áá«áááá á¯áá£á¤á. áááááá§áááá\"<default>\" á¡áá¬á§áá¡á á¯áá£á¤áá¡áááá¡ áá áááááá§áááá " +"áááááá áááá, á©ááááááá£áá á¯áá£á¤áááá¡áááá¡." #: kreadconfig/kreadconfig.cpp:52 kreadconfig/kwriteconfig.cpp:31 msgctxt "main|" @@ -523,6 +527,7 @@ msgctxt "main|" msgid "Group name cannot be empty, use \"<default>\" for the root group" msgstr "" +"á¯áá£á¤áá¡ á¡áá®ááá áªáá áááá ááá áá¥áááá. á¡áá¬á§áá¡á á¯áá£á¤áá¡áááá¡ áááááá§áááá \"<default>\"" #: kreadconfig/kwriteconfig.cpp:34 msgctxt "main|" @@ -530,13 +535,15 @@ "Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a " "string" msgstr "" +"áªáááááá¡ á¢ááá. áááááá§áááá \"bool\" áááááá£á á áááá¨áááááááá¡áááá¡. á¬ááááá¦áááá " +"á¨áááá®ááááá¨á áá¡ á¡á¢á áá¥áááá áá¦áá¥áááá" #: kreadconfig/kwriteconfig.cpp:36 msgctxt "main|" msgid "Delete the designated key if enabled" -msgstr "" +msgstr "ááááá§áá¤ááá ááá¡áá¦áááá¡ á¬áá¨áá, áᣠá©áá áá£ááá" #: kreadconfig/kwriteconfig.cpp:37 msgctxt "main|" msgid "The value to write. Mandatory, on a shell use '' for empty" -msgstr "" +msgstr "á©áá¡áá¬áá á áááá¨ááááááá. ááá á¡á¨á, áªáá ááááá¡áááá¡ áááááá§áááá ''" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/poqm/zh_CN/kconfig5_qt.po new/kconfig-5.101.0/poqm/zh_CN/kconfig5_qt.po --- old/kconfig-5.100.0/poqm/zh_CN/kconfig5_qt.po 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/poqm/zh_CN/kconfig5_qt.po 2022-12-03 10:43:37.000000000 +0100 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2022-10-30 07:47\n" +"PO-Revision-Date: 2022-12-01 06:52\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/src/core/kauthorized.cpp new/kconfig-5.101.0/src/core/kauthorized.cpp --- old/kconfig-5.100.0/src/core/kauthorized.cpp 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/src/core/kauthorized.cpp 2022-12-03 10:43:37.000000000 +0100 @@ -299,7 +299,7 @@ d->urlActionRestrictions.append(URLActionRule("redirect", Any, Any, Any, QStringLiteral(":internet"), Any, Any, true)); // We allow redirections to file: but not from internet protocols, redirecting to file: - // is very popular among io-slaves and we don't want to break them + // is very popular among KIO workers and we don't want to break them d->urlActionRestrictions.append(URLActionRule("redirect", Any, Any, Any, QStringLiteral("file"), Any, Any, true)); d->urlActionRestrictions.append(URLActionRule("redirect", QStringLiteral(":internet"), Any, Any, QStringLiteral("file"), Any, Any, false)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/src/gui/kconfigloader.cpp new/kconfig-5.101.0/src/gui/kconfigloader.cpp --- old/kconfig-5.100.0/src/gui/kconfigloader.cpp 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/src/gui/kconfigloader.cpp 2022-12-03 10:43:37.000000000 +0100 @@ -231,8 +231,8 @@ } item = doubleItem; } else if (m_type == QLatin1String("intlist")) { - const QStringList tmpList = m_default.split(QLatin1Char(',')); QList<int> defaultList; + const QStringList tmpList = m_default.split(QLatin1Char(','), Qt::SkipEmptyParts); for (const QString &tmp : tmpList) { defaultList.append(tmp.toInt()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.100.0/src/gui/kwindowconfig.cpp new/kconfig-5.101.0/src/gui/kwindowconfig.cpp --- old/kconfig-5.100.0/src/gui/kwindowconfig.cpp 2022-11-05 22:33:27.000000000 +0100 +++ new/kconfig-5.101.0/src/gui/kwindowconfig.cpp 2022-12-03 10:43:37.000000000 +0100 @@ -12,6 +12,15 @@ #include <QScreen> #include <QWindow> +// QScreen::name() returns garbage on Windows; see https://bugreports.qt.io/browse/QTBUG-74317 +// So we use the screens' serial numbers to identify them instead +// FIXME: remove this once we can depend on Qt 6.4, where this is fixed +#if defined(Q_OS_WINDOWS) && QT_VERSION < QT_VERSION_CHECK(6, 4, 0) +#define SCREENNAME serialNumber +#else +#define SCREENNAME name +#endif + static const char s_initialSizePropertyName[] = "_kconfig_initial_size"; static const char s_initialScreenSizePropertyName[] = "_kconfig_initial_screen_size"; @@ -22,13 +31,7 @@ const auto screens = QGuiApplication::screens(); names.reserve(screens.length()); for (auto screen : screens) { -#ifdef Q_OS_WIN - // QScreen::name() returns garbage on Windows; see https://bugreports.qt.io/browse/QTBUG-74317 - // So we use the screens' serial numbers to identify them instead - names << screen->serialNumber(); -#else - names << screen->name(); -#endif + names << screen->SCREENNAME(); } return names.join(QLatin1Char(' ')); } @@ -37,11 +40,11 @@ // returns current window screen if not found static QScreen *findScreenByName(const QWindow *window, const QString screenName) { - if (screenName == window->screen()->name()) { + if (screenName == window->screen()->SCREENNAME()) { return window->screen(); } for (QScreen *s : window->screen()->virtualSiblings()) { - if (s->name() == screenName) { + if (s->SCREENNAME() == screenName) { return s; } } @@ -55,7 +58,7 @@ // We include resolution data to also save data on a per-resolution basis const QString returnString = QStringLiteral("%1 %2 %3x%4 %5") - .arg(allConnectedScreens(), key, QString::number(screen->geometry().width()), QString::number(screen->geometry().height()), screen->name()); + .arg(allConnectedScreens(), key, QString::number(screen->geometry().width()), QString::number(screen->geometry().height()), screen->SCREENNAME()); return returnString; } @@ -126,7 +129,7 @@ return; } - const QString screenName = config.readEntry(windowScreenPositionString(), window->screen()->name()); + const QString screenName = config.readEntry(windowScreenPositionString(), window->screen()->SCREENNAME()); const QScreen *screen = findScreenByName(window, screenName); // Fall back to non-per-screen-arrangement info if it's available but @@ -172,7 +175,7 @@ const QScreen *screen = window->screen(); config.writeEntry(windowXPositionString(screen), window->x(), options); config.writeEntry(windowYPositionString(screen), window->y(), options); - config.writeEntry(windowScreenPositionString(), screen->name(), options); + config.writeEntry(windowScreenPositionString(), screen->SCREENNAME(), options); } void KWindowConfig::restoreWindowPosition(QWindow *window, const KConfigGroup &config) @@ -193,8 +196,8 @@ } // Move window to proper screen - const QString screenName = config.readEntry(windowScreenPositionString(), screen->name()); - if (screenName != screen->name()) { + const QString screenName = config.readEntry(windowScreenPositionString(), screen->SCREENNAME()); + if (screenName != screen->SCREENNAME()) { QScreen *screenConf = findScreenByName(window, screenName); window->setScreen(screenConf); restoreWindowScreenPosition(window, screenConf, config);
