diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index b92e3f3e..9ae28740 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 834051c5..b06e3afe 100644
--- a/tderesources/groupwise/soap/stdsoap2.cpp
+++ b/tderesources/groupwise/soap/stdsoap2.cpp
@@ -1284,7 +1284,7 @@ soap_get(struct soap *soap)
       case '\'':
         return SOAP_AP;
       case '&':
-        return soap_char(soap) | 0x80000000;
+        return soap_char(soap) | (1<<31);
     }
     break;
   }
@@ -7094,7 +7094,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
         { soap_unget(soap, c);
 	  c = soap_getutf8(soap);
 	  if (soap->mode & SOAP_C_UTFSTRING)
-          { if ((c & 0x80000000) && c >= -0x7FFFFF80 && c < SOAP_AP)
+          { if ((c & (1<<31)) && c >= -0x7FFFFF80 && c < SOAP_AP)
             { c &= 0x7FFFFFFF;
               t = buf;
               if (c < 0x0800)
@@ -7297,7 +7297,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
         continue;
       }
       if (soap->mode & SOAP_C_UTFSTRING)
-      { if (((c = soap_get(soap)) & 0x80000000) && c >= -0x7FFFFF80 && c < SOAP_AP)
+      { if (((c = soap_get(soap)) & (1<<31)) && c >= -0x7FFFFF80 && c < SOAP_AP)
         { c &= 0x7FFFFFFF;
           t = buf;
           if (c < 0x0800)
@@ -7362,7 +7362,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
         }
         *s++ = '/';
         break;
-      case '<' | 0x80000000:
+      case '<' | (1<<31):
         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 '>' | (1<<31):
         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 '&' | (1<<31):
         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 '"' | (1<<31):
         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 '\'' | (1<<31):
         if (flag)
           *s++ = '\'';
         else