summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-18 16:04:27 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-08-18 16:04:49 +0200
commit25d0f92c21b71d316059c0b70ddf71dec6d7fd7f (patch)
tree880fb563432a5cab04bf4fa1164b79c5345e2abd
parentf034b59a8c21b61ccbd9f8bfdb9728e884127d9e (diff)
downloadtdepim-25d0f92c21b71d316059c0b70ddf71dec6d7fd7f.tar.gz
tdepim-25d0f92c21b71d316059c0b70ddf71dec6d7fd7f.zip
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 6494172e98ea4244cefede4afeb1c950ef4ebc6e)
-rw-r--r--kalarm/functions.cpp2
-rw-r--r--tderesources/groupwise/soap/stdsoap2.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index b92e3f3e8..9ae287405 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -1053,7 +1053,7 @@ bool runKOrganizer()
}
if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
{
- kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl;
+ kdWarning(5950) << "Unable to access KOrganizer's " KORG_DCOP_OBJECT " DCOP object" << endl;
return false;
}
}
diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp
index 834051c5d..72c464d24 100644
--- a/tderesources/groupwise/soap/stdsoap2.cpp
+++ b/tderesources/groupwise/soap/stdsoap2.cpp
@@ -7362,7 +7362,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
}
*s++ = '/';
break;
- case '<' | 0x80000000:
+ case (soap_wchar)('<' | 0x80000000):
if (flag)
*s++ = '<';
else
@@ -7371,7 +7371,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
m = 3;
}
break;
- case '>' | 0x80000000:
+ case (soap_wchar)('>' | 0x80000000):
if (flag)
*s++ = '>';
else
@@ -7380,7 +7380,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
m = 3;
}
break;
- case '&' | 0x80000000:
+ case (soap_wchar)('&' | 0x80000000):
if (flag)
*s++ = '&';
else
@@ -7389,7 +7389,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
m = 4;
}
break;
- case '"' | 0x80000000:
+ case (soap_wchar)('"' | 0x80000000):
if (flag)
*s++ = '"';
else
@@ -7398,7 +7398,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
m = 5;
}
break;
- case '\'' | 0x80000000:
+ case (soap_wchar)('\'' | 0x80000000):
if (flag)
*s++ = '\'';
else