Fix C++11 compatibility issues.

10 files changed, 127 insertions, 13 deletions

diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 41b2f959ede..5c8b1cd08f5 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2019/11/02 19:45:26 maya Exp $
+$NetBSD: distinfo,v 1.55 2020/03/24 20:34:31 joerg Exp $
 
 SHA1 (kdelibs-4.14.38.tar.xz) = 2271f8b38cd5b6b55fa31c567271e3ca37ef641a
 RMD160 (kdelibs-4.14.38.tar.xz) = edf16e14842237950655bf44c073070c5bb7d74b
@@ -16,14 +16,20 @@ SHA1 (patch-al) = 20212d740191a699f7aa35db8c23a3b3cb55904e
 SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
 SHA1 (patch-cmake_modules_FindHUNSPELL.cmake) = 52bd28c88d696d52ce052ddd7702a0f46244f86e
 SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = becfce89d45fd9b70c2ca08a83ca0e650004996a
+SHA1 (patch-dnssd_servicemodel.cpp) = c106e5feca008ac62d3ad9a074c1bcf4a998d55a
 SHA1 (patch-kdecore_io_kdirwatch__p.h) = 3c14e26f3962743f7d450e2a5ea2df43bc7524b5
-SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
+SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b6109c79c2e4c6a7c3338ab04a48b29affc502ca
 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
 SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
+SHA1 (patch-kdeui_icons_kiconcache.cpp) = c360192afd21efedc6dad8a6ccdd61573ee0dbac
 SHA1 (patch-khtml_dom_dom2_traversal.h) = b001fc3825fcfea8f25b7219057e59d5b87723e4
+SHA1 (patch-khtml_misc_AtomicString.cpp) = eff036bcd09e031651eba1e3a2136e313d184f2b
 SHA1 (patch-kinit_CMakeLists.txt) = bcbf273d79702a4f1a617df0c86c2d5771447364
+SHA1 (patch-kinit_kinit.cpp) = 75dfe546c92169e692ddb45cd1a056a1b4042bb6
 SHA1 (patch-kio_CMakeLists.txt) = 3033fe7d31555e83f197f889cf1aa15949a3c14e
+SHA1 (patch-kio_kfile_kopenwithdialog.cpp) = b705ed794a082bca03890d69369b4e043e90f6c5
+SHA1 (patch-kio_kfile_kpropertiesdialog.cpp) = 27bced17b818051c6df5bc1ea176fd9f2692caa4
 SHA1 (patch-kio_kssl_kopenssl.cpp) = 4d9319966f4be0b8c09501105f7664481af2834e
 SHA1 (patch-kio_kssl_kopenssl.h) = c6f27f3a8911929684d62cc96849b6171e2ade8c
 SHA1 (patch-kio_kssl_kssl.cpp) = b5ff02a2a96e667096143fec9e681cb2980aa7e3
@@ -32,7 +38,7 @@ SHA1 (patch-kio_kssl_ksslcertchain.cpp) = f26c2d4ac8a3a107ad5a06b71df4fd9a244fdf
 SHA1 (patch-kio_kssl_ksslcertificate.cpp) = 177546af1bf2a770d7bb6650f7a4a1dca6f8f716
 SHA1 (patch-kio_kssl_ksslutils.cpp) = 359075855a8582693e5e4fab9aa5ad5afbe7b4a1
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
-SHA1 (patch-kjs_date_object.h) = 25b636930f9d5055a9ce3e760e179e0816abea6a
-SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
+SHA1 (patch-kjs_date_object.h) = 12a820cad0bb9a002e524e8ea4e32ac082bd3c6e
+SHA1 (patch-kjs_interpreter.cpp) = 747a9d63d96cbbe5edcc4668c7db46bd4cb0f590
 SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
 SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
diff --git a/x11/kdelibs4/patches/patch-dnssd_servicemodel.cpp b/x11/kdelibs4/patches/patch-dnssd_servicemodel.cpp
new file mode 100644
index 00000000000..a9c4fa79374
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-dnssd_servicemodel.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-dnssd_servicemodel.cpp,v 1.1 2020/03/24 20:34:31 joerg Exp $
+
+--- dnssd/servicemodel.cpp.orig	2020-03-23 22:23:18.729772347 +0000
++++ dnssd/servicemodel.cpp
+@@ -87,7 +87,7 @@ QVariant ServiceModel::data(const QModel
+ 		case Host: return srv[index.row()]->hostName();
+ 		case Port: return srv[index.row()]->port();
+ 	    }
+-	case ServicePtrRole: QVariant ret;
++	case (int)ServicePtrRole: QVariant ret;
+ 			     ret.setValue(srv[index.row()]);
+ 			    return ret;
+     }
diff --git a/x11/kdelibs4/patches/patch-kdecore_localization_klocale_kde.cpp b/x11/kdelibs4/patches/patch-kdecore_localization_klocale_kde.cpp
index 5c8fbe56e88..379523f95de 100644
--- a/x11/kdelibs4/patches/patch-kdecore_localization_klocale_kde.cpp
+++ b/x11/kdelibs4/patches/patch-kdecore_localization_klocale_kde.cpp
@@ -1,8 +1,19 @@
-$NetBSD: patch-kdecore_localization_klocale_kde.cpp,v 1.1 2012/03/19 11:28:49 markd Exp $
+$NetBSD: patch-kdecore_localization_klocale_kde.cpp,v 1.2 2020/03/24 20:34:31 joerg Exp $
 
---- kdecore/localization/klocale_kde.cpp.orig	2011-04-01 13:55:50.000000000 +0000
+--- kdecore/localization/klocale_kde.cpp.orig	2017-11-05 01:51:22.000000000 +0000
 +++ kdecore/localization/klocale_kde.cpp
-@@ -2516,7 +2516,7 @@ QByteArray KLocalePrivate::systemCodeset
+@@ -2438,8 +2438,8 @@ QString KLocalePrivate::formatLocaleTime
+ 
+ bool KLocalePrivate::use12Clock() const
+ {
+-    if ((timeFormat().contains(QString::fromLatin1("%I")) > 0) ||
+-        (timeFormat().contains(QString::fromLatin1("%l")) > 0)) {
++    if ((timeFormat().contains(QString::fromLatin1("%I")) != 0) ||
++        (timeFormat().contains(QString::fromLatin1("%l")) != 0)) {
+         return true;
+     } else {
+         return false;
+@@ -2657,7 +2657,7 @@ QByteArray KLocalePrivate::systemCodeset
  
      codeset = nl_langinfo(CODESET);
  
diff --git a/x11/kdelibs4/patches/patch-kdeui_icons_kiconcache.cpp b/x11/kdelibs4/patches/patch-kdeui_icons_kiconcache.cpp
new file mode 100644
index 00000000000..01d20673f16
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kdeui_icons_kiconcache.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-kdeui_icons_kiconcache.cpp,v 1.1 2020/03/24 20:34:31 joerg Exp $
+
+--- kdeui/icons/kiconcache.cpp.orig	2020-03-23 20:52:29.382360073 +0000
++++ kdeui/icons/kiconcache.cpp
+@@ -103,7 +103,7 @@ public:
+ KIconCache::KIconCache()
+     : KPixmapCache(KDE_ICONCACHE_NAME), d(new Private(this))
+ {
+-    d->mUpdatesFile  = KGlobal::dirs()->locateLocal("cache", "kpc/"KDE_ICONCACHE_NAME".updated");
++    d->mUpdatesFile  = KGlobal::dirs()->locateLocal("cache", "kpc/" KDE_ICONCACHE_NAME ".updated");
+     // Set limit to 10 MB
+     setCacheLimit(10 * 1024);
+ }
diff --git a/x11/kdelibs4/patches/patch-khtml_misc_AtomicString.cpp b/x11/kdelibs4/patches/patch-khtml_misc_AtomicString.cpp
new file mode 100644
index 00000000000..046db4e8b83
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-khtml_misc_AtomicString.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-khtml_misc_AtomicString.cpp,v 1.1 2020/03/24 20:34:31 joerg Exp $
+
+--- khtml/misc/AtomicString.cpp.orig	2020-03-23 22:02:19.272387221 +0000
++++ khtml/misc/AtomicString.cpp
+@@ -160,7 +160,7 @@ DOMStringImpl* AtomicString::add(const Q
+         return DOMStringImpl::empty();
+    
+     init();
+-    UCharBuffer buf = { s, length }; 
++    UCharBuffer buf = { s, unsigned(length) }; 
+     std::pair<HashSet<DOMStringImpl*>::iterator, bool> addResult = stringTable->add<UCharBuffer, UCharBufferTranslator>(buf);
+     if (!addResult.second)
+         return *addResult.first;
+@@ -180,7 +180,7 @@ DOMStringImpl* AtomicString::add(const Q
+         return DOMStringImpl::empty();
+ 
+     init();
+-    UCharBuffer buf = {s, length}; 
++    UCharBuffer buf = {s, unsigned(length)}; 
+     std::pair<HashSet<DOMStringImpl*>::iterator, bool> addResult = stringTable->add<UCharBuffer, UCharBufferTranslator>(buf);
+     if (!addResult.second)
+         return *addResult.first;
diff --git a/x11/kdelibs4/patches/patch-kinit_kinit.cpp b/x11/kdelibs4/patches/patch-kinit_kinit.cpp
new file mode 100644
index 00000000000..40a75a8f7f2
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kinit_kinit.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-kinit_kinit.cpp,v 1.1 2020/03/24 20:34:31 joerg Exp $
+
+--- kinit/kinit.cpp.orig	2020-03-23 21:41:19.609926369 +0000
++++ kinit/kinit.cpp
+@@ -1478,7 +1478,7 @@ static void kdeinit_library_path()
+    if (display.isEmpty())
+    {
+ #if defined(Q_WS_X11) || defined(Q_WS_QWS)
+-     fprintf(stderr, "kdeinit4: Aborting. $"DISPLAY" is not set.\n");
++     fprintf(stderr, "kdeinit4: Aborting. $" DISPLAY " is not set.\n");
+      exit(255);
+ #endif
+    }
diff --git a/x11/kdelibs4/patches/patch-kio_kfile_kopenwithdialog.cpp b/x11/kdelibs4/patches/patch-kio_kfile_kopenwithdialog.cpp
new file mode 100644
index 00000000000..43e2bab7e35
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kio_kfile_kopenwithdialog.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-kio_kfile_kopenwithdialog.cpp,v 1.1 2020/03/24 20:34:31 joerg Exp $
+
+--- kio/kfile/kopenwithdialog.cpp.orig	2020-03-23 21:21:08.509600415 +0000
++++ kio/kfile/kopenwithdialog.cpp
+@@ -713,7 +713,7 @@ void KOpenWithDialog::slotHighlighted(co
+         // ### indicate that default value was restored
+         d->terminal->setChecked(d->curService->terminal());
+         QString terminalOptions = d->curService->terminalOptions();
+-        d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) > 0));
++        d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) != 0));
+         d->m_terminaldirty = false; // slotTerminalToggled changed it
+     }
+ }
diff --git a/x11/kdelibs4/patches/patch-kio_kfile_kpropertiesdialog.cpp b/x11/kdelibs4/patches/patch-kio_kfile_kpropertiesdialog.cpp
new file mode 100644
index 00000000000..8f3287a54e1
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kio_kfile_kpropertiesdialog.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-kio_kfile_kpropertiesdialog.cpp,v 1.1 2020/03/24 20:34:31 joerg Exp $
+
+--- kio/kfile/kpropertiesdialog.cpp.orig	2020-03-23 21:17:50.440194279 +0000
++++ kio/kfile/kpropertiesdialog.cpp
+@@ -3306,7 +3306,7 @@ void KDesktopPropsPlugin::slotAdvanced()
+ 
+     if (preferredTerminal == "konsole")
+     {
+-        terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) > 0);
++        terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) != 0);
+         w.terminalCloseCheck->setChecked(terminalCloseBool);
+         d->m_terminalOptionStr.remove( "--noclose");
+     }
diff --git a/x11/kdelibs4/patches/patch-kjs_date_object.h b/x11/kdelibs4/patches/patch-kjs_date_object.h
index 199f5043997..469b3b318db 100644
--- a/x11/kdelibs4/patches/patch-kjs_date_object.h
+++ b/x11/kdelibs4/patches/patch-kjs_date_object.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-kjs_date_object.h,v 1.1 2018/02/08 10:50:44 mrg Exp $
+$NetBSD: patch-kjs_date_object.h,v 1.2 2020/03/24 20:34:31 joerg Exp $
 
 Replace bogus forward declaration with <ctime> include.
 
 --- kjs/date_object.h.orig	2017-11-05 01:51:22.000000000 +0000
 +++ kjs/date_object.h
-@@ -24,8 +24,8 @@
+@@ -24,7 +24,7 @@
  #include "function.h"
  #include "JSWrapperObject.h"
  
@@ -13,4 +13,3 @@ Replace bogus forward declaration with <ctime> include.
  
  namespace KJS {
  
-     class FunctionPrototype;
diff --git a/x11/kdelibs4/patches/patch-kjs_interpreter.cpp b/x11/kdelibs4/patches/patch-kjs_interpreter.cpp
index 1a3fea50856..bdac026d186 100644
--- a/x11/kdelibs4/patches/patch-kjs_interpreter.cpp
+++ b/x11/kdelibs4/patches/patch-kjs_interpreter.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-kjs_interpreter.cpp,v 1.1 2013/05/06 15:03:19 joerg Exp $
+$NetBSD: patch-kjs_interpreter.cpp,v 1.2 2020/03/24 20:34:31 joerg Exp $
 
---- kjs/interpreter.cpp.orig	2013-05-03 23:52:06.000000000 +0000
+--- kjs/interpreter.cpp.orig	2017-11-05 01:51:22.000000000 +0000
 +++ kjs/interpreter.cpp
-@@ -63,6 +63,7 @@
+@@ -64,6 +64,7 @@
  #include <math.h>
  #include <signal.h>
  #include <stdio.h>
@@ -10,3 +10,14 @@ $NetBSD: patch-kjs_interpreter.cpp,v 1.1 2013/05/06 15:03:19 joerg Exp $
  #if defined(HAVE_UNISTD_H)
  #include <unistd.h>
  #endif
+@@ -111,8 +112,8 @@ void TimeoutChecker::startTimeoutCheck(I
+     s_executingInterpreter = interpreter;
+ 
+     itimerval tv = {
+-      { interpreter->m_timeoutTime / 1000, (interpreter->m_timeoutTime % 1000) * 1000 },
+-      { interpreter->m_timeoutTime / 1000, (interpreter->m_timeoutTime % 1000) * 1000 }
++      { interpreter->m_timeoutTime / 1000, suseconds_t((interpreter->m_timeoutTime % 1000) * 1000) },
++      { interpreter->m_timeoutTime / 1000, suseconds_t((interpreter->m_timeoutTime % 1000) * 1000) }
+     };
+     setitimer(ITIMER_REAL, &tv, &m_oldtv);
+