Hello community, here is the log from the commit of package khtml for openSUSE:Factory checked in at 2019-04-19 21:22:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khtml (Old) and /work/SRC/openSUSE:Factory/.khtml.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "khtml" Fri Apr 19 21:22:34 2019 rev:64 rq:695224 version:5.57.0 Changes: -------- --- /work/SRC/openSUSE:Factory/khtml/khtml.changes 2019-03-21 09:45:53.118903277 +0100 +++ /work/SRC/openSUSE:Factory/.khtml.new.5536/khtml.changes 2019-04-19 21:22:51.491757621 +0200 @@ -1,0 +2,12 @@ +Sun Apr 14 20:21:43 UTC 2019 - [email protected] + +- Update to 5.57.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.57.0.php +- Changes since 5.56.0: + * Remove deprecated methods + * Fix port to std::sort + * Port setMargin to setContentsMargins + +------------------------------------------------------------------- Old: ---- khtml-5.56.0.tar.xz New: ---- khtml-5.57.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khtml.spec ++++++ --- /var/tmp/diff_new_pack.C0Kr5J/_old 2019-04-19 21:22:51.967758226 +0200 +++ /var/tmp/diff_new_pack.C0Kr5J/_new 2019-04-19 21:22:51.967758226 +0200 @@ -17,14 +17,14 @@ %define lname libKF5KHtml5 -%define _tar_path 5.56 +%define _tar_path 5.57 # 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 lang Name: khtml -Version: 5.56.0 +Version: 5.57.0 Release: 0 Summary: HTML rendering engine License: LGPL-2.1-or-later ++++++ khtml-5.56.0.tar.xz -> khtml-5.57.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/.gitignore new/khtml-5.57.0/.gitignore --- old/khtml-5.56.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/khtml-5.57.0/.gitignore 2019-04-07 09:28:12.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/CMakeLists.txt new/khtml-5.57.0/CMakeLists.txt --- old/khtml-5.56.0/CMakeLists.txt 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/CMakeLists.txt 2019-04-07 09:28:12.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.56.0") # handled by release scripts -set(KF5_DEP_VERSION "5.56.0") # handled by release scripts +set(KF5_VERSION "5.57.0") # handled by release scripts +set(KF5_DEP_VERSION "5.57.0") # handled by release scripts project(KHtml VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.56.0 NO_MODULE) +find_package(ECM 5.57.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/khtml-5.56.0/po/en_GB/khtml5.po new/khtml-5.57.0/po/en_GB/khtml5.po --- old/khtml-5.56.0/po/en_GB/khtml5.po 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/po/en_GB/khtml5.po 2019-04-07 09:28:12.000000000 +0200 @@ -2,21 +2,21 @@ # Malcolm Hunter <[email protected]>, 2002,2003,2004, 2005, 2006, 2007, 2008, 2009. # Jonathan Riddell <[email protected]>, 2003. # Andrew Coles <[email protected]>, 2004, 2005, 2009, 2010. -# Steve Allewell <[email protected]>, 2014, 2015. +# Steve Allewell <[email protected]>, 2014, 2015, 2019. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-10 03:03+0100\n" -"PO-Revision-Date: 2015-12-08 14:53+0000\n" +"PO-Revision-Date: 2019-03-24 19:13+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: British English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\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 1.5\n" +"X-Generator: Lokalize 19.07.70\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -1221,25 +1221,19 @@ msgstr " <a href=\"%1\">[Properties]</a>" #: khtml_part.cpp:4019 -#, fuzzy, kde-format -#| msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)" -#| msgid "Quirks" +#, kde-format msgctxt "HTML rendering mode (see https://en.wikipedia.org/wiki/Quirks_mode)" msgid "Quirks" msgstr "Quirks" #: khtml_part.cpp:4022 -#, fuzzy, kde-format -#| msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)" -#| msgid "Almost standards" +#, kde-format msgctxt "HTML rendering mode (see https://en.wikipedia.org/wiki/Quirks_mode)" msgid "Almost standards" msgstr "Almost standards" #: khtml_part.cpp:4026 -#, fuzzy, kde-format -#| msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)" -#| msgid "Strict" +#, kde-format msgctxt "HTML rendering mode (see https://en.wikipedia.org/wiki/Quirks_mode)" msgid "Strict" msgstr "Strict" @@ -1542,15 +1536,7 @@ #. i18n: ectx: property (whatsThis), widget (QDialog, KJSErrorDlgBase) #: kjserrordlgbase.ui:18 -#, fuzzy, kde-format -#| msgid "" -#| "This dialog provides you with notification and details of scripting " -#| "errors that occur on web pages. In many cases it is due to an error in " -#| "the web site as designed by its author. In other cases it is the result " -#| "of a programming error in Konqueror. If you suspect the former, please " -#| "contact the webmaster of the site in question. Conversely if you suspect " -#| "an error in Konqueror, please file a bug report at http://bugs.kde.org/. " -#| "A test case which illustrates the problem will be appreciated." +#, kde-format msgid "" "This dialog provides you with notification and details of scripting errors " "that occur on web pages. In many cases it is due to an error in the web " @@ -1565,8 +1551,8 @@ "site as designed by its author. In other cases it is the result of a " "programming error in Konqueror. If you suspect the former, please contact " "the webmaster of the site in question. Conversely if you suspect an error " -"in Konqueror, please file a bug report at http://bugs.kde.org/. A test case " -"which illustrates the problem will be appreciated." +"in Konqueror, please file a bug report at https://bugs.kde.org/. A test " +"case which illustrates the problem will be appreciated." #: kmultipart/httpfiltergzip.cpp:89 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/po/gl/khtml5.po new/khtml-5.57.0/po/gl/khtml5.po --- old/khtml-5.56.0/po/gl/khtml5.po 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/po/gl/khtml5.po 2019-04-07 09:28:12.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-10 03:03+0100\n" -"PO-Revision-Date: 2019-02-15 21:50+0100\n" +"PO-Revision-Date: 2019-03-23 11:59+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" @@ -24,7 +24,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 18.12.1\n" +"X-Generator: Lokalize 18.12.2\n" "X-Environment: kde, development\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -396,7 +396,7 @@ #: html/html_objectimpl.cpp:633 #, kde-format msgid "Missing Plugin" -msgstr "Non se atopou o complemento" +msgstr "Falta un complemento" #: html/html_objectimpl.cpp:633 #, kde-format @@ -1049,7 +1049,7 @@ #: khtml_part.cpp:769 #, kde-format msgid "The fake user-agent '%1' is in use." -msgstr "Está a usarse a identificación falsa «%1» do programa cliente." +msgstr "Está a usarse o «user-agent» falso «%1»." #: khtml_part.cpp:1273 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/po/id/khtml5.po new/khtml-5.57.0/po/id/khtml5.po --- old/khtml-5.56.0/po/id/khtml5.po 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/po/id/khtml5.po 2019-04-07 09:28:12.000000000 +0200 @@ -16,7 +16,7 @@ "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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 18.12.1\n" #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/po/te/khtml5.po new/khtml-5.57.0/po/te/khtml5.po --- old/khtml-5.56.0/po/te/khtml5.po 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/po/te/khtml5.po 2019-04-07 09:28:12.000000000 +0200 @@ -22,8 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " -"4;\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -342,7 +341,7 @@ msgstr "అనుమతి పంపించు" #: html/html_formimpl.cpp:438 -#, kde-format +#, fuzzy, kde-format msgid "&Send File" msgid_plural "&Send Files" msgstr[0] "(&S)దస్త్రం పంపు" @@ -1105,7 +1104,7 @@ msgstr "పుట ఎక్కించబడినది." #: khtml_part.cpp:2405 -#, kde-format +#, fuzzy, kde-format msgid "%1 Image of %2 loaded." msgid_plural "%1 Images of %2 loaded." msgstr[0] "%1 చిత్రంలో %2 ఎక్కించబడింది." @@ -1135,7 +1134,7 @@ msgstr "%1 (లింకు)" #: khtml_part.cpp:3759 -#, kde-format +#, fuzzy, kde-format msgid "%2 (%1 byte)" msgid_plural "%2 (%1 bytes)" msgstr[0] "%2 (%1 బైట్) " @@ -1371,7 +1370,7 @@ msgstr "" #: khtml_part.cpp:7653 -#, kde-format +#, fuzzy, kde-format msgid "&Show Blocked Popup Window" msgid_plural "&Show %1 Blocked Popup Windows" msgstr[0] "(&S) ఆపివేయబడిన పాప్ అప్ విండొను చూపు" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/po/zh_CN/khtml5.po new/khtml-5.57.0/po/zh_CN/khtml5.po --- old/khtml-5.56.0/po/zh_CN/khtml5.po 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/po/zh_CN/khtml5.po 2019-04-07 09:28:12.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-10 03:03+0100\n" -"PO-Revision-Date: 2019-02-20 23:16\n" +"PO-Revision-Date: 2019-03-07 09:22\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/css/cssstyleselector.cpp new/khtml-5.57.0/src/css/cssstyleselector.cpp --- old/khtml-5.56.0/src/css/cssstyleselector.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/css/cssstyleselector.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -744,7 +744,7 @@ } // sort only matched selectors and then collect properties - qSort(selectorsForCheck.data(), selectorsForCheck.data() + amountOfMatchedSelectors); + std::sort(selectorsForCheck.data(), selectorsForCheck.data() + amountOfMatchedSelectors); for (unsigned k = 0; k < amountOfMatchedSelectors; ++k) { unsigned i = selectorsForCheck[k]; if (selectorCache[i].state == Applies) { @@ -2254,7 +2254,7 @@ } // presort properties. Should make the sort() calls in styleForElement faster. - qSort(propertyList.begin(), propertyList.end()); + std::sort(propertyList.begin(), propertyList.end()); properties_size = propertyList.count(); propertiesBuffer = new CSSOrderedProperty[properties_size]; for (int i = 0; i < propertyList.size(); ++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/ecma/debugger/consoledock.cpp new/khtml-5.57.0/src/ecma/debugger/consoledock.cpp --- old/khtml-5.56.0/src/ecma/debugger/consoledock.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/ecma/debugger/consoledock.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -246,13 +246,13 @@ QHBoxLayout *bottomLayout = new QHBoxLayout; bottomLayout->setSpacing(0); - bottomLayout->setMargin(0); + bottomLayout->setContentsMargins(0, 0, 0, 0); bottomLayout->addWidget(consoleInput); bottomLayout->addWidget(consoleInputButton); QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->setSpacing(0); - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->addWidget(consoleView); mainLayout->addLayout(bottomLayout); mainFrame->setLayout(mainLayout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/ecma/debugger/errordlg.cpp new/khtml-5.57.0/src/ecma/debugger/errordlg.cpp --- old/khtml-5.56.0/src/ecma/debugger/errordlg.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/ecma/debugger/errordlg.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -49,12 +49,12 @@ m_dontShowAgainCb = new QCheckBox(i18n("&Do not show this message again"), contents); QVBoxLayout *vl = new QVBoxLayout(contents); - vl->setMargin(0); + vl->setContentsMargins(0, 0, 0, 0); vl->addWidget(label); vl->addWidget(m_dontShowAgainCb); QHBoxLayout *topLayout = new QHBoxLayout(page); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); topLayout->addWidget(iconLabel); topLayout->addWidget(contents); topLayout->addStretch(10); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/ecma/kjs_window.cpp new/khtml-5.57.0/src/ecma/kjs_window.cpp --- old/khtml-5.56.0/src/ecma/kjs_window.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/ecma/kjs_window.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -170,7 +170,7 @@ return jsNumber(thisWidget->depth()); case AvailLeft: { #if HAVE_X11 && ! defined K_WS_QTONLY - QRect clipped = KWindowSystem::workArea().intersect(sg); + QRect clipped = KWindowSystem::workArea().intersected(sg); return jsNumber(clipped.x() - sg.x()); #else return jsNumber(10); @@ -178,7 +178,7 @@ } case AvailTop: { #if HAVE_X11 && ! defined K_WS_QTONLY - QRect clipped = KWindowSystem::workArea().intersect(sg); + QRect clipped = KWindowSystem::workArea().intersected(sg); return jsNumber(clipped.y() - sg.y()); #else return jsNumber(10); @@ -186,7 +186,7 @@ } case AvailHeight: { #if HAVE_X11 && ! defined K_WS_QTONLY - QRect clipped = KWindowSystem::workArea().intersect(sg); + QRect clipped = KWindowSystem::workArea().intersected(sg); return jsNumber(clipped.height()); #else return jsNumber(100); @@ -194,7 +194,7 @@ } case AvailWidth: { #if HAVE_X11 && ! defined K_WS_QTONLY - QRect clipped = KWindowSystem::workArea().intersect(sg); + QRect clipped = KWindowSystem::workArea().intersected(sg); return jsNumber(clipped.width()); #else return jsNumber(100); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/java/kjavaappletserver.cpp new/khtml-5.57.0/src/java/kjavaappletserver.cpp --- old/khtml-5.56.0/src/java/kjavaappletserver.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/java/kjavaappletserver.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -822,7 +822,7 @@ dialogLayout->addItem(spacer2); QHBoxLayout *const buttonLayout = new QHBoxLayout(); - buttonLayout->setMargin(0); + buttonLayout->setContentsMargins(0, 0, 0, 0); buttonLayout->setObjectName("buttonLayout"); QPushButton *const no = new QPushButton(i18n("&No"), dialog); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/khtmlview.cpp new/khtml-5.57.0/src/khtmlview.cpp --- old/khtml-5.56.0/src/khtmlview.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/khtmlview.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -897,7 +897,7 @@ QRect v(contentsX(), contentsY(), visibleWidth(), visibleHeight()); QPoint off(contentsX(), contentsY()); r.translate(off); - r = r.intersect(v); + r = r.intersected(v); if (!r.isValid() || r.isEmpty()) { return; } @@ -2597,7 +2597,7 @@ lab->setPalette(QToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(QFrame::Box | QFrame::Plain); - lab->setMargin(3); + lab->setContentsMargins(3, 3, 3, 3); lab->adjustSize(); lab->setParent(widget()); lab->setAutoFillBackground(true); @@ -4220,7 +4220,7 @@ } for (int i = 1; i < rects.size(); ++i) { - QRect newRegion = updateRegion.unite(rects[i]); + QRect newRegion = updateRegion.united(rects[i]); if (2 * newRegion.height() > 3 * updateRegion.height()) { repaintContents(updateRegion); updateRegion = rects[i]; @@ -4337,7 +4337,7 @@ p.end(); #endif - d->updateRegion = d->updateRegion.unite(QRect(x, y, w, h)); + d->updateRegion = d->updateRegion.united(QRect(x, y, w, h)); if (asap && !parsing) { unscheduleRepaint(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/khtmlviewbarwidget.cpp new/khtml-5.57.0/src/khtmlviewbarwidget.cpp --- old/khtml-5.56.0/src/khtmlviewbarwidget.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/khtmlviewbarwidget.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -29,7 +29,7 @@ QHBoxLayout *layout = new QHBoxLayout; // NOTE: Here be cosmetics. - layout->setMargin(2); + layout->setContentsMargins(2, 2, 2, 2); // hide button if (addCloseButton) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/rendering/render_box.cpp new/khtml-5.57.0/src/rendering/render_box.cpp --- old/khtml-5.56.0/src/rendering/render_box.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/rendering/render_box.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -746,7 +746,7 @@ //fixed QRect fix = getFixedBackgroundImageRect(bgLayer, sx, sy, scaledImageWidth, scaledImageHeight); QRect ele(_tx, _ty, w, h); - QRect b = fix.intersect(ele); + QRect b = fix.intersected(ele); //qCDebug(KHTML_LOG) <<" ele is " << ele << " b is " << b << " fix is " << fix; sx += b.x() - fix.x(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/rendering/render_canvas.cpp new/khtml-5.57.0/src/rendering/render_canvas.cpp --- old/khtml-5.56.0/src/rendering/render_canvas.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/rendering/render_canvas.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -560,7 +560,7 @@ } r = n; if (r) { - selectionRect = selectionRect.unite(enclosingPositionedRect(r)); + selectionRect = selectionRect.united(enclosingPositionedRect(r)); } } @@ -723,7 +723,7 @@ updateRect = enclosingPositionedRect(o); firstRect = false; } else { - updateRect = updateRect.unite(enclosingPositionedRect(o)); + updateRect = updateRect.united(enclosingPositionedRect(o)); } } } @@ -744,7 +744,7 @@ updateRect = enclosingPositionedRect(o); firstRect = false; } else { - updateRect = updateRect.unite(enclosingPositionedRect(o)); + updateRect = updateRect.united(enclosingPositionedRect(o)); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/rendering/render_image.cpp new/khtml-5.57.0/src/rendering/render_image.cpp --- old/khtml-5.56.0/src/rendering/render_image.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/rendering/render_image.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -273,7 +273,7 @@ QPixmap pix = *Cache::brokenPixmap; if (berrorPic && (cWidth >= pix.width() + 4) && (cHeight >= pix.height() + 4)) { QRect r(pix.rect()); - r = r.intersect(QRect(0, 0, cWidth - 4, cHeight - 4)); + r = r.intersected(QRect(0, 0, cWidth - 4, cHeight - 4)); paintInfo.p->drawPixmap(QPoint(_tx + leftBorder + leftPad + 2, _ty + topBorder + topPad + 2), pix, r); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/rendering/render_layer.cpp new/khtml-5.57.0/src/rendering/render_layer.cpp --- old/khtml-5.56.0/src/rendering/render_layer.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/rendering/render_layer.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -240,7 +240,7 @@ } QRect layerBounds, damageRect, fgrect; calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect); - m_visibleRect = damageRect.intersect(layerBounds); + m_visibleRect = damageRect.intersected(layerBounds); if (m_visibleRect.isValid()) { renderer()->canvas()->repaintViewRectangle(m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority)); } @@ -274,7 +274,7 @@ if (m_hasVisibleContent && checkForRepaint && m_markedForRepaint) { QRect layerBounds, damageRect, fgrect; calculateRects(rootLayer, renderer()->viewRect(), layerBounds, damageRect, fgrect); - QRect vr = damageRect.intersect(layerBounds); + QRect vr = damageRect.intersected(layerBounds); if (vr != m_visibleRect && vr.isValid()) { renderer()->canvas()->repaintViewRectangle(vr.x(), vr.y(), vr.width(), vr.height()); m_visibleRect = vr; @@ -1404,16 +1404,16 @@ if (m_object->hasOverflowClip()) { QRect newOverflowClip = m_object->overflowClipRect(x, y); - overflowClipRect = newOverflowClip.intersect(overflowClipRect); + overflowClipRect = newOverflowClip.intersected(overflowClipRect); if (m_object->isPositioned() || m_object->isRelPositioned()) { - posClipRect = newOverflowClip.intersect(posClipRect); + posClipRect = newOverflowClip.intersected(posClipRect); } } if (m_object->hasClip()) { QRect newPosClip = m_object->clipRect(x, y); - posClipRect = posClipRect.intersect(newPosClip); - overflowClipRect = overflowClipRect.intersect(newPosClip); - fixedClipRect = fixedClipRect.intersect(newPosClip); + posClipRect = posClipRect.intersected(newPosClip); + overflowClipRect = overflowClipRect.intersected(newPosClip); + fixedClipRect = fixedClipRect.intersected(newPosClip); } } } @@ -1441,19 +1441,19 @@ if (m_object->hasOverflowClip() || m_object->hasClip()) { // This layer establishes a clip of some kind. if (m_object->hasOverflowClip()) { - foregroundRect = foregroundRect.intersect(m_object->overflowClipRect(x, y)); + foregroundRect = foregroundRect.intersected(m_object->overflowClipRect(x, y)); } if (m_object->hasClip()) { // Clip applies to *us* as well, so go ahead and update the damageRect. QRect newPosClip = m_object->clipRect(x, y); - backgroundRect = backgroundRect.intersect(newPosClip); - foregroundRect = foregroundRect.intersect(newPosClip); + backgroundRect = backgroundRect.intersected(newPosClip); + foregroundRect = foregroundRect.intersected(newPosClip); } // If we establish a clip at all, then go ahead and make sure our background // rect is intersected with our layer's bounds. - backgroundRect = backgroundRect.intersect(layerBounds); + backgroundRect = backgroundRect.intersected(layerBounds); } } @@ -1737,10 +1737,10 @@ ts << " at (" << l.xPos() << "," << l.yPos() << ") size " << l.width() << "x" << l.height(); - if (layerBounds != layerBounds.intersect(backgroundClipRect)) { + if (layerBounds != layerBounds.intersected(backgroundClipRect)) { ts << " backgroundClip " << backgroundClipRect; } - if (layerBounds != layerBounds.intersect(clipRect)) { + if (layerBounds != layerBounds.intersected(clipRect)) { ts << " clip " << clipRect; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/rendering/render_replaced.cpp new/khtml-5.57.0/src/rendering/render_replaced.cpp --- old/khtml-5.56.0/src/rendering/render_replaced.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/rendering/render_replaced.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -426,10 +426,10 @@ for (int i = 0; i < QPalette::NColorGroups; ++i) { if (shouldChangeBgPal) { pal.setColor((QPalette::ColorGroup)i, QPalette::Window, backgroundColor); - pal.setColor((QPalette::ColorGroup)i, QPalette::Light, backgroundColor.light(highlightVal)); - pal.setColor((QPalette::ColorGroup)i, QPalette::Dark, backgroundColor.dark(lowlightVal)); - pal.setColor((QPalette::ColorGroup)i, QPalette::Mid, backgroundColor.dark(120)); - pal.setColor((QPalette::ColorGroup)i, QPalette::Midlight, backgroundColor.light(110)); + pal.setColor((QPalette::ColorGroup)i, QPalette::Light, backgroundColor.lighter(highlightVal)); + pal.setColor((QPalette::ColorGroup)i, QPalette::Dark, backgroundColor.darker(lowlightVal)); + pal.setColor((QPalette::ColorGroup)i, QPalette::Mid, backgroundColor.darker(120)); + pal.setColor((QPalette::ColorGroup)i, QPalette::Midlight, backgroundColor.lighter(110)); } pal.setColor((QPalette::ColorGroup)i, QPalette::Button, trans ? QColor(0, 0, 0, 0) : backgroundColor); pal.setColor((QPalette::ColorGroup)i, QPalette::Base, trans ? QColor(0, 0, 0, 0) : backgroundColor); @@ -463,11 +463,11 @@ if (v > 128) // dark bg, light fg - need a darker disabled fg { - disfg = disfg.dark(lowlightVal); + disfg = disfg.darker(lowlightVal); } else if (v > 64) // light bg, dark fg - need a lighter disabled fg - but only if !black { - disfg = disfg.light(highlightVal); + disfg = disfg.lighter(highlightVal); } else // for really dark fg - use darkgray disabled fg, // as ::light is pretty useless in this range @@ -786,7 +786,7 @@ #endif QRect rr = pI.r; rr.translate(-tx, -ty); - const QRect r = widget->rect().intersect(rr); + const QRect r = widget->rect().intersected(rr); if (KHTMLView *v = qobject_cast<KHTMLView *>(widget)) { QPoint thePoint(tx, ty); if (v->verticalScrollBar()->isVisible()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/rendering/render_table.cpp new/khtml-5.57.0/src/rendering/render_table.cpp --- old/khtml-5.56.0/src/rendering/render_table.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/rendering/render_table.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -3446,7 +3446,7 @@ QRegion creg(clipRect); QRegion old = pI.p->clipRegion(); if (!old.isEmpty()) { - creg = old.intersect(creg); + creg = old.intersected(creg); } pI.p->setClipRegion(creg); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/khtml-5.56.0/src/xml/dom_nodelistimpl.cpp new/khtml-5.57.0/src/xml/dom_nodelistimpl.cpp --- old/khtml-5.56.0/src/xml/dom_nodelistimpl.cpp 2019-03-02 14:40:44.000000000 +0100 +++ new/khtml-5.57.0/src/xml/dom_nodelistimpl.cpp 2019-04-07 09:28:12.000000000 +0200 @@ -387,7 +387,7 @@ } // First sort. - qSort(m_kids.begin(), m_kids.end(), nodeLess); + std::sort(m_kids.begin(), m_kids.end(), nodeLess); // Now get rid of dupes. DOM::NodeImpl *last = nullptr;
