Index: /trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv4/lwip/ip4_addr.h
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv4/lwip/ip4_addr.h	(revision 49585)
+++ /trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv4/lwip/ip4_addr.h	(revision 49586)
@@ -211,5 +211,5 @@
 
 #define ip_addr_debug_print(debug, ipaddr) \
-  LWIP_DEBUGF(debug, ("%"U16_F".%"U16_F".%"U16_F".%"U16_F,             \
+  LWIP_DEBUGF(debug, ("%" U16_F ".%" U16_F ".%" U16_F ".%" U16_F,      \
                       ipaddr != NULL ? ip4_addr1_16(ipaddr) : 0,       \
                       ipaddr != NULL ? ip4_addr2_16(ipaddr) : 0,       \
Index: /trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv6/lwip/ip6_addr.h
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv6/lwip/ip6_addr.h	(revision 49585)
+++ /trunk/src/VBox/Devices/Network/lwip-new/src/include/ipv6/lwip/ip6_addr.h	(revision 49586)
@@ -261,5 +261,5 @@
 
 #define ip6_addr_debug_print(debug, ipaddr) \
-  LWIP_DEBUGF(debug, ("%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F, \
+  LWIP_DEBUGF(debug, ("%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F, \
                       ipaddr != NULL ? IP6_ADDR_BLOCK1(ipaddr) : 0,    \
                       ipaddr != NULL ? IP6_ADDR_BLOCK2(ipaddr) : 0,    \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 49585)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 49586)
@@ -952,5 +952,5 @@
              +  QString(" r")
              +  QString(RTBldCfgRevisionStr())
-             +  QString(" - "VBOX_BLEEDING_EDGE);
+             +  QString(" - " VBOX_BLEEDING_EDGE);
 #endif /* VBOX_BLEEDING_EDGE */
     setWindowTitle(strTitle);
Index: /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp	(revision 49585)
+++ /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp	(revision 49586)
@@ -2417,5 +2417,5 @@
         }
         /* Next we have to upload the OVF & all disk images */
-        vrc = RTS3Create(&hS3, pTask->locInfo.strUsername.c_str(), pTask->locInfo.strPassword.c_str(), pTask->locInfo.strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
+        vrc = RTS3Create(&hS3, pTask->locInfo.strUsername.c_str(), pTask->locInfo.strPassword.c_str(), pTask->locInfo.strHostname.c_str(), "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,
Index: /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp	(revision 49585)
+++ /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp	(revision 49586)
@@ -1295,5 +1295,5 @@
                          pTask->locInfo.strPassword.c_str(),
                          pTask->locInfo.strHostname.c_str(),
-                         "virtualbox-agent/"VBOX_VERSION_STRING);
+                         "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,
@@ -1888,5 +1888,5 @@
                          pTask->locInfo.strPassword.c_str(),
                          pTask->locInfo.strHostname.c_str(),
-                         "virtualbox-agent/"VBOX_VERSION_STRING);
+                         "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,
Index: /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp	(revision 49585)
+++ /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp	(revision 49586)
@@ -426,5 +426,6 @@
     try
     {
-        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(), m->strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
+        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(),
+                             m->strHostname.c_str(), "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(E_FAIL, tr ("Can't open S3 storage service (%Rrc)"), vrc);
@@ -504,5 +505,6 @@
     try
     {
-        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(), m->strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
+        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(),
+                             m->strHostname.c_str(), "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(E_FAIL, tr ("Can't open S3 storage service (%Rrc)"), vrc);
Index: /trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp	(revision 49585)
+++ /trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp	(revision 49586)
@@ -276,5 +276,5 @@
                                                  COM_IIDOF(IHostNetworkInterface),
                                                  HostNetworkInterface::getStaticComponentName(),
-                                                 "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
+                                                 "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
                         rc = VERR_INTERNAL_ERROR;
                     }
@@ -287,5 +287,5 @@
                                              COM_IIDOF(IHostNetworkInterface),
                                              HostNetworkInterface::getStaticComponentName(),
-                                             "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d). Check permissions!", rc);
+                                             "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d). Check permissions!", rc);
                     pclose(fp);
                 }
@@ -340,5 +340,5 @@
                                          COM_IIDOF(IHostNetworkInterface),
                                          HostNetworkInterface::getStaticComponentName(),
-                                         "Failed to execute '"VBOXNETADPCTL_NAME "' (exit status: %d)", rc);
+                                         "Failed to execute '" VBOXNETADPCTL_NAME "' (exit status: %d)", rc);
             else
                 progress->notifyComplete(S_OK);