Fix C++11 compatibility issues.


(joerg)

$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;
     }

$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);
 }

$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;

$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
    }

$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
     }
 }

$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");
     }