Changeset 72713 in vbox for trunk/src/VBox

Timestamp:

Jun 28, 2018 9:34:12 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt Undo the changes introduced by r123230

Location:

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

Files:

• UIVMLogViewerDialog.cpp (modified) (3 diffs)
• UIVMLogViewerDialog.h (modified) (4 diffs)
• UIVMLogViewerWidget.cpp (modified) (3 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -58 +58 @@
     : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
     , m_comMachine(machine)
-    , pWidget(0)
 {
-}
-
-UIVMLogViewerDialog::~UIVMLogViewerDialog()
-{
-    if (pWidget)
-        pWidget->setBeingClosed(true);
 }
 
@@ -81 +74 @@
 {
     /* Create widget: */
-    pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, this, m_comMachine);
+    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, this, m_comMachine);
     if (pWidget)
     {
@@ -165 +158 @@
         button(ButtonType_Close)->setShortcut(shortCut);
 }
-

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

@@ -36 +36 @@
 class QVBoxLayout;
 class UIVMLogViewerDialog;
-class UIVMLogViewerWidget;
 class CMachine;
 
@@ -50 +49 @@
       * @param  pCenterWidget  Brings the widget to center wrt. pCenterWidget. */
     virtual void create(QIManagerDialog *&pDialog, QWidget *pCenterWidget) /* override */;
-
     CMachine m_comMachine;
 };
@@ -63 +61 @@
 
     UIVMLogViewerDialog(QWidget *pCenterWidget, const CMachine &machine);
-    ~UIVMLogViewerDialog();
 
 protected:
@@ -86 +83 @@
     void retranslateUi();
     CMachine m_comMachine;
-    UIVMLogViewerWidget *pWidget;
 };
 

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

@@ -79 +79 @@
     , m_bWrapLines(false)
     , m_font(QFontDatabase::systemFont(QFontDatabase::FixedFont))
-    , m_fBeingClosed(false)
 {
     /* Prepare VM Log-Viewer: */
@@ -854 +853 @@
 void UIVMLogViewerWidget::manageEscapeShortCut()
 {
-    if (m_fBeingClosed)
-        return;
     /* if there is no visible panels give the escape shortcut to parent dialog: */
     if (m_visiblePanelsList.isEmpty())
@@ -1002 +999 @@
     return logPage->currentFont();
 }
-
-void UIVMLogViewerWidget::setBeingClosed(bool flag)
-{
-    m_fBeingClosed = flag;
-}

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

@@ -76 +76 @@
     void setMachine(const CMachine &machine);
     QFont currentFont() const;
-    void setBeingClosed(bool flag);
 
 protected:
@@ -229 +228 @@
         QFont m_font;
     /** @} */
-    bool m_fBeingClosed;
     friend class UIVMLogViewerBookmarksPanel;
     friend class UIVMLogViewerFilterPanel;