Index: /trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp (revision 58815) @@ -477,6 +477,6 @@ setGeometry(m_geometry); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIVMInfoDialog: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UIVMInfoDialog: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); /* Maximize (if necessary): */ @@ -496,6 +496,6 @@ gEDataManager->setInformationWindowGeometry(m_geometry, isMaximized(), vboxGlobal().managedVMUuid()); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIVMInfoDialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UIVMInfoDialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp (revision 58815) @@ -1056,6 +1056,6 @@ setGeometry(m_geometry); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIVMLogViewer: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UIVMLogViewer: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); /* Maximize (if necessary): */ @@ -1076,6 +1076,6 @@ gEDataManager->setLogWindowGeometry(saveGeometry, isMaximized()); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIVMLogViewer: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", - saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height())); + LogRel2(("GUI: UIVMLogViewer: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", + saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height())); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 58815) @@ -1562,6 +1562,6 @@ setGeometry(m_geometry); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIExtraDataManagerWindow: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UIExtraDataManagerWindow: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); /* Maximize (if necessary): */ @@ -1591,6 +1591,6 @@ gEDataManager->setExtraDataManagerGeometry(m_geometry, isMaximized()); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIExtraDataManagerWindow: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UIExtraDataManagerWindow: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp (revision 58815) @@ -167,12 +167,12 @@ void UIMediumEnumerator::sltHandleMachineUpdate(QString strMachineID) { - LogRel(("GUI: UIMediumEnumerator: Machine (or snapshot) event received, ID = %s\n", - strMachineID.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Machine (or snapshot) event received, ID = %s\n", + strMachineID.toAscii().constData())); /* Gather previously used UIMedium IDs: */ QStringList previousUIMediumIDs; calculateCachedUsage(strMachineID, previousUIMediumIDs, true /* take into account current state only */); - LogRel(("GUI: UIMediumEnumerator: Old usage: %s\n", - previousUIMediumIDs.isEmpty() ? "" : previousUIMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Old usage: %s\n", + previousUIMediumIDs.isEmpty() ? "" : previousUIMediumIDs.join(", ").toAscii().constData())); /* Gather currently used CMediums and their IDs: */ @@ -180,6 +180,6 @@ QStringList currentCMediumIDs; calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */); - LogRel(("GUI: UIMediumEnumerator: New usage: %s\n", - currentCMediumIDs.isEmpty() ? "" : currentCMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: New usage: %s\n", + currentCMediumIDs.isEmpty() ? "" : currentCMediumIDs.join(", ").toAscii().constData())); /* Determine excluded mediums: */ @@ -189,7 +189,7 @@ const QStringList excludedUIMediumIDs = excludedSet.toList(); if (!excludedUIMediumIDs.isEmpty()) - LogRel(("GUI: UIMediumEnumerator: Items excluded from usage: %s\n", excludedUIMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Items excluded from usage: %s\n", excludedUIMediumIDs.join(", ").toAscii().constData())); if (!currentCMediumIDs.isEmpty()) - LogRel(("GUI: UIMediumEnumerator: Items currently in usage: %s\n", currentCMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Items currently in usage: %s\n", currentCMediumIDs.join(", ").toAscii().constData())); /* Update cache for excluded UIMediums: */ @@ -199,13 +199,13 @@ recacheFromActualUsage(currentCMediums, currentCMediumIDs); - LogRel(("GUI: UIMediumEnumerator: Machine (or snapshot) event processed, ID = %s\n", - strMachineID.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Machine (or snapshot) event processed, ID = %s\n", + strMachineID.toAscii().constData())); } void UIMediumEnumerator::sltHandleMachineRegistration(QString strMachineID, bool fRegistered) { - LogRel(("GUI: UIMediumEnumerator: Machine %s event received, ID = %s\n", - fRegistered ? "registration" : "unregistration", - strMachineID.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Machine %s event received, ID = %s\n", + fRegistered ? "registration" : "unregistration", + strMachineID.toAscii().constData())); /* Machine was registered: */ @@ -216,6 +216,6 @@ QStringList currentCMediumIDs; calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs, false /* take into account current state only */); - LogRel(("GUI: UIMediumEnumerator: New usage: %s\n", - currentCMediumIDs.isEmpty() ? "" : currentCMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: New usage: %s\n", + currentCMediumIDs.isEmpty() ? "" : currentCMediumIDs.join(", ").toAscii().constData())); /* Update cache with currently used CMediums: */ recacheFromActualUsage(currentCMediums, currentCMediumIDs); @@ -227,25 +227,25 @@ QStringList previousUIMediumIDs; calculateCachedUsage(strMachineID, previousUIMediumIDs, false /* take into account current state only */); - LogRel(("GUI: UIMediumEnumerator: Old usage: %s\n", - previousUIMediumIDs.isEmpty() ? "" : previousUIMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Old usage: %s\n", + previousUIMediumIDs.isEmpty() ? "" : previousUIMediumIDs.join(", ").toAscii().constData())); /* Update cache for previously used UIMediums: */ recacheFromCachedUsage(previousUIMediumIDs); } - LogRel(("GUI: UIMediumEnumerator: Machine %s event processed, ID = %s\n", - fRegistered ? "registration" : "unregistration", - strMachineID.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Machine %s event processed, ID = %s\n", + fRegistered ? "registration" : "unregistration", + strMachineID.toAscii().constData())); } void UIMediumEnumerator::sltHandleSnapshotDeleted(QString strMachineID, QString strSnapshotID) { - LogRel(("GUI: UIMediumEnumerator: Snapshot-deleted event received, Machine ID = {%s}, Snapshot ID = {%s}\n", - strMachineID.toAscii().constData(), strSnapshotID.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Snapshot-deleted event received, Machine ID = {%s}, Snapshot ID = {%s}\n", + strMachineID.toAscii().constData(), strSnapshotID.toAscii().constData())); /* Gather previously used UIMedium IDs: */ QStringList previousUIMediumIDs; calculateCachedUsage(strMachineID, previousUIMediumIDs, false /* take into account current state only */); - LogRel(("GUI: UIMediumEnumerator: Old usage: %s\n", - previousUIMediumIDs.isEmpty() ? "" : previousUIMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Old usage: %s\n", + previousUIMediumIDs.isEmpty() ? "" : previousUIMediumIDs.join(", ").toAscii().constData())); /* Gather currently used CMediums and their IDs: */ @@ -253,6 +253,6 @@ QStringList currentCMediumIDs; calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */); - LogRel(("GUI: UIMediumEnumerator: New usage: %s\n", - currentCMediumIDs.isEmpty() ? "" : currentCMediumIDs.join(", ").toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: New usage: %s\n", + currentCMediumIDs.isEmpty() ? "" : currentCMediumIDs.join(", ").toAscii().constData())); /* Update everything: */ @@ -260,6 +260,6 @@ recacheFromActualUsage(currentCMediums, currentCMediumIDs); - LogRel(("GUI: UIMediumEnumerator: Snapshot-deleted event processed, Machine ID = {%s}, Snapshot ID = {%s}\n", - strMachineID.toAscii().constData(), strSnapshotID.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Snapshot-deleted event processed, Machine ID = {%s}, Snapshot ID = {%s}\n", + strMachineID.toAscii().constData(), strSnapshotID.toAscii().constData())); } @@ -289,5 +289,5 @@ /* Delete this medium: */ m_mediums.remove(strUIMediumKey); - LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} closed and deleted (after enumeration)\n", strUIMediumKey.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} closed and deleted (after enumeration)\n", strUIMediumKey.toAscii().constData())); /* And notify listener about delete: */ @@ -301,5 +301,5 @@ m_mediums[strUIMediumID] = uimedium; m_mediums[strUIMediumID].setKey(strUIMediumID); - LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} has it changed to {%s}\n", strUIMediumKey.toAscii().constData(), + LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} has it changed to {%s}\n", strUIMediumKey.toAscii().constData(), strUIMediumID.toAscii().constData())); @@ -517,5 +517,5 @@ /* Uncache corresponding UIMedium: */ m_mediums.remove(strMediumID); - LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} uncached\n", strMediumID.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} uncached\n", strMediumID.toAscii().constData())); /* And notify listeners: */ @@ -546,5 +546,5 @@ /* Cache created UIMedium: */ m_mediums.insert(strUIMediumKey, uimedium); - LogRel(("GUI: UIMediumEnumerator: Medium with key={%s} cached\n", strUIMediumKey.toAscii().constData())); + LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} cached\n", strUIMediumKey.toAscii().constData())); /* And notify listeners: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (revision 58815) @@ -622,6 +622,6 @@ { /* Redirect arrived notification: */ - LogRel(("UIMachineWindow::handleNativeNotification: Redirecting '%s' notification to corresponding machine-window...\n", - strNativeNotificationName.toAscii().constData())); + LogRel2(("UIMachineWindow::handleNativeNotification: Redirecting '%s' notification to corresponding machine-window...\n", + strNativeNotificationName.toAscii().constData())); pMachineWindow->handleNativeNotification(strNativeNotificationName); } @@ -638,6 +638,6 @@ { /* Redirect arrived callback: */ - LogRel(("UIMachineWindow::handleStandardWindowButtonCallback: Redirecting callback for standard window button '%d' with option key '%d' to corresponding machine-window...\n", - (int)enmButtonType, (int)fWithOptionKey)); + LogRel2(("UIMachineWindow::handleStandardWindowButtonCallback: Redirecting callback for standard window button '%d' with option key '%d' to corresponding machine-window...\n", + (int)enmButtonType, (int)fWithOptionKey)); pMachineWindow->handleStandardWindowButtonCallback(enmButtonType, fWithOptionKey); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 58815) @@ -453,5 +453,5 @@ void UIMachineLogicFullscreen::sltHostScreenAvailableAreaChange() { - LogRel(("GUI: UIMachineLogicFullscreen: Host-screen available-area change ignored\n")); + LogRel2(("GUI: UIMachineLogicFullscreen: Host-screen available-area change ignored\n")); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp (revision 58815) @@ -470,6 +470,6 @@ setGeometry(m_geometry); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIVMInformationDialog: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UIVMInformationDialog: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); /* Maximize (if necessary): */ @@ -489,6 +489,6 @@ gEDataManager->setInformationWindowGeometry(m_geometry, isMaximized(), vboxGlobal().managedVMUuid()); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UIVMInformationDialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UIVMInformationDialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 58814) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 58815) @@ -1636,6 +1636,6 @@ setGeometry(m_geometry); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UISelectorWindow: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UISelectorWindow: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); /* Maximize (if necessary): */ @@ -1694,6 +1694,6 @@ gEDataManager->setSelectorWindowGeometry(m_geometry, isMaximized()); #endif /* !Q_WS_MAC */ - LogRel(("GUI: UISelectorWindow: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", - m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); + LogRel2(("GUI: UISelectorWindow: Geometry saved as: Origin=%dx%d, Size=%dx%d\n", + m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height())); } }