Changeset 50899 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Mar 26, 2014 6:08:27 PM (11 years ago)

Author:

vboxsync

Message:

remove changes that break up log and error strings, introduced in 92972

Location:

trunk/src/VBox/Main/src-all

Files:

• ExtPackManagerImpl.cpp (modified) (1 diff)
• ProgressImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -314 +314 @@
      *        dropped. */
     if (!strSavedName.equalsIgnoreCase(m->Desc.strName))
-    {
-        Utf8Str str;
-        str = "Extension pack name mismatch between the downloaded file";
-        str += "and the XML inside it (xml='%s' file='%s')";
-        return initFailed(tr(str.c_str()), m->Desc.strName.c_str(), strSavedName.c_str());
-    }
+        return initFailed(tr("Extension pack name mismatch between the downloaded file and the XML inside it (xml='%s' file='%s')"),
+                          m->Desc.strName.c_str(), strSavedName.c_str());
+
 
     m->fUsable = true;

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -159 +159 @@
             uint64_t ullTimeRemaining = ullTimeTotal - ullTimeElapsed;
 
-//          Log(("Progress::GetTimeRemaining: dPercentDone %RI32, ullTimeNow =
-//          %RI64, ullTimeElapsed = %RI64, ullTimeTotal = %RI64, ullTimeRemaining = %RI64\n",
+//          Log(("Progress::GetTimeRemaining: dPercentDone %RI32, ullTimeNow = %RI64, ullTimeElapsed = %RI64, ullTimeTotal = %RI64, ullTimeRemaining = %RI64\n",
 //          (uint32_t)dPercentDone, ullTimeNow, ullTimeElapsed, ullTimeTotal, ullTimeRemaining));
 
@@ -444 +443 @@
                        OUT_GUID aId /* = NULL */)
 {
-    Utf8Str str = "aDescription=\"%s\", cOperations=%d, ulTotalOperationsWeight=%d, ";
-    LogFlowThisFunc((str.c_str(),
+    LogFlowThisFunc(("aDescription=\"%ls\", cOperations=%d, ulTotalOperationsWeight=%d, bstrFirstOperationDescription=\"%ls\", ulFirstOperationWeight=%d\n",
                      aDescription.c_str(),
                      cOperations,
@@ -908 +906 @@
     m_ulOperationPercent = 0;
 
-    Utf8Str str;
-    str = "Progress::setNextOperation(%s): ulNextOperationsWeight = %d; m_ulCurrentOperation is now %d,";
-    str += "m_ulOperationsCompletedWeight is now %d\n";
-    Log((str.c_str(), m_operationDescription.c_str(), aNextOperationsWeight, m_ulCurrentOperation,
-         m_ulOperationsCompletedWeight));
+    Log(("Progress::setNextOperation(%s): aNextOperationsWeight = %d; m_ulCurrentOperation is now %d, m_ulOperationsCompletedWeight is now %d\n",
+         m_operationDescription.c_str(), aNextOperationsWeight, m_ulCurrentOperation, m_ulOperationsCompletedWeight));
 
     /* wake up all waiting threads */