Changeset 98854 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 7, 2023 11:08:32 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156178

Message:

FE/Qt: bugref:10322: A bit of Log-viewer improvements to use CMachine a bit less.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerWidget.cpp (modified) (6 diffs)
• UIVMLogViewerWidget.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -49 +49 @@
 #include "QIFileDialog.h"
 #include "QITabWidget.h"
+#include "QIToolBar.h"
+#include "QIToolButton.h"
 #include "UIActionPool.h"
+#include "UICommon.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
@@ -60 +63 @@
 #include "UIVMLogViewerSearchPanel.h"
 #include "UIVMLogViewerOptionsPanel.h"
-#include "QIToolBar.h"
-#include "QIToolButton.h"
-#include "UICommon.h"
 
 /* COM includes: */
+#include "COMEnums.h"
+#include "CMachine.h"
 #include "CSystemProperties.h"
 
@@ -350 +352 @@
 }
 
-QString UIVMLogViewerWidget::readLogFile(CMachine &comMachine, int iLogFileId)
-{
+QString UIVMLogViewerWidget::readLogFile(const CMachine &comConstMachine, int iLogFileId)
+{
+    CMachine comMachine(comConstMachine); // ReadLog is non const
     QString strLogFileContent;
     ULONG uOffset = 0;
@@ -358 +361 @@
     {
         QVector<BYTE> data = comMachine.ReadLog(iLogFileId, uOffset, _1M);
+        /// @todo it's probably worth testing !comMachine.isOk() and show error message, or not :)
         if (data.size() == 0)
             break;
@@ -452 +456 @@
         return;
 
-    CMachine comMachine = uiCommon().virtualBox().FindMachine(pLogPage->machineId().toString());
-    if (comMachine.isNull())
+    if (pLogPage->machineId().isNull())
         return;
 
@@ -464 +467 @@
     const QDateTime dtInfo = fileInfo.lastModified();
     const QString strDtString = dtInfo.toString("yyyy-MM-dd-hh-mm-ss");
-    const QString strDefaultFileName = QString("%1-%2.log").arg(comMachine.GetName()).arg(strDtString);
+    const QString strDefaultFileName = QString("%1-%2.log").arg(pLogPage->machineName()).arg(strDtString);
     const QString strDefaultFullName = QDir::toNativeSeparators(QDir::home().absolutePath() + "/" + strDefaultFileName);
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -42 +42 @@
 #include "QIWithRetranslateUI.h"
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CMachine.h"
-
 /* Forward declarations: */
-class UITabWidget;
 class QVBoxLayout;
+class QIToolBar;
+class QIToolButton;
 class UIActionPool;
 class UIDialogPanel;
-class QIToolBar;
-class QIToolButton;
 class UIMachineListMenu;
+class UITabWidget;
 class UIVirtualMachineItem;
 class UIVMLogPage;
@@ -59 +55 @@
 class UIVMLogViewerBookmarksPanel;
 class UIVMLogViewerFilterPanel;
+class UIVMLogViewerOptionsPanel;
 class UIVMLogViewerPanel;
 class UIVMLogViewerSearchPanel;
-class UIVMLogViewerOptionsPanel;
+class CMachine;
 
 /** QWidget extension providing GUI for VirtualBox LogViewer. It
@@ -213 +210 @@
     void setMachines(const QVector<QUuid> &machineIDs);
     /** Returns the content of the ith log file of @comMachine or possibly an empty string */
-    QString readLogFile(CMachine &comMachine, int iLogFileId);
+    QString readLogFile(const CMachine &comConstMachine, int iLogFileId);
     /** If the current tab is a label tab then switch to the next tab and return true. Returns false otherwise. */
     bool labelTabHandler();