VirtualBox

Ignore:
Timestamp:
Mar 8, 2023 9:40:48 AM (2 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10322: Cleanup for UIGuestProcessControlDialog related to UIMachine global pointer.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlTreeItem.cpp

    r98103 r98875  
    234234void UIGuestSessionTreeItem::sltGuestProcessUnregistered(CGuestProcess guestProcess)
    235235{
    236     if (!UIGuestProcessControlWidget::m_fDeleteAfterUnregister)
     236    if (!UIGuestProcessControlWidget::s_fDeleteAfterUnregister)
    237237        return;
    238238    for (int i = 0; i < childCount(); ++i)
    … …  
    342342        processStatus !=  KProcessStatus_Paused)
    343343    {
    344         if (UIGuestProcessControlWidget::m_fDeleteAfterUnregister)
     344        if (UIGuestProcessControlWidget::s_fDeleteAfterUnregister)
    345345            this->deleteLater();
    346346    }

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp

    r98647 r98875  
    3131
    3232/* GUI includes: */
    33 #include "UIDesktopWidgetWatchdog.h"
     33#include "UICommon.h"
    3434#include "UIExtraDataManager.h"
    3535#include "UIIconPool.h"
    3636#include "UIGuestControlConsole.h"
    3737#include "UIGuestProcessControlDialog.h"
    38 #include "UICommon.h"
    3938#include "UIMachine.h"
    4039#include "UISession.h"
    41 #ifdef VBOX_WS_MAC
    42 # include "VBoxUtils-darwin.h"
    43 #endif
    4440
    4541
    … …  
    4844*********************************************************************************************************************************/
    4945
    50 UIGuestProcessControlDialogFactory::UIGuestProcessControlDialogFactory(UIMachine *pMachine /* = 0 */)
    51     : m_pMachine(pMachine)
     46UIGuestProcessControlDialogFactory::UIGuestProcessControlDialogFactory()
    5247{
    5348}
    … …  
    5550void UIGuestProcessControlDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
    5651{
    57     AssertPtrReturnVoid(m_pMachine);
    58     pDialog = new UIGuestProcessControlDialog(pCenterWidget, m_pMachine);
     52    pDialog = new UIGuestProcessControlDialog(pCenterWidget);
    5953}
    6054
    … …  
    6458*********************************************************************************************************************************/
    6559
    66 UIGuestProcessControlDialog::UIGuestProcessControlDialog(QWidget *pCenterWidget, UIMachine *pMachine)
     60UIGuestProcessControlDialog::UIGuestProcessControlDialog(QWidget *pCenterWidget)
    6761    : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
    68     , m_pMachine(pMachine)
    69     , m_pActionPool(m_pMachine->actionPool())
    70     , m_comGuest(m_pMachine->uisession()->guest())
    71     , m_strMachineName(m_pMachine->machineName())
     62    , m_comGuest(gpMachine->uisession()->guest())
     63    , m_strMachineName(gpMachine->machineName())
    7264{
    7365}

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.h

    r98647 r98875  
    4343#include "CGuest.h"
    4444
    45 /* Forward declarations: */
    46 class UIActionPool;
    47 class UIMachine;
    48 class UIGuestProcessControlDialog;
    49 class CGuest;
    50 
    5145/** QIManagerDialogFactory extension used as a factory for the Guest Control dialog. */
    5246class UIGuestProcessControlDialogFactory : public QIManagerDialogFactory
    … …  
    5448public:
    5549
    56     /** Constructs dialog factory.
    57       * @param  pMachine  Brings the machine UI reference to be used by the created dialog. */
    58     UIGuestProcessControlDialogFactory(UIMachine *pMachine = 0);
     50    /** Constructs dialog factory. */
     51    UIGuestProcessControlDialogFactory();
    5952
    6053protected:
    … …  
    6356      * @param  pCenterWidget  Passes the widget to center wrt. pCenterWidget. */
    6457    virtual void create(QIManagerDialog *&pDialog, QWidget *pCenterWidget) RT_OVERRIDE;
    65 
    66     /** Holds the machine UI reference. */
    67     UIMachine *m_pMachine;
    6858};
    69 
    7059
    7160/** QIManagerDialog extension providing GUI with the dialog displaying guest control releated logs. */
    … …  
    7665public:
    7766
    78     /** Constructs Guest Control dialog.
    79       * @param  pMachine  Brings the machine UI reference to be used by the created dialog. */
    80     UIGuestProcessControlDialog(QWidget *pCenterWidget, UIMachine *pMachine);
     67    /** Constructs Guest Control dialog. */
     68    UIGuestProcessControlDialog(QWidget *pCenterWidget);
    8169
    8270protected:
    … …  
    115103private:
    116104
    117     UIMachine    *m_pMachine;
    118     UIActionPool *m_pActionPool;
    119     CGuest        m_comGuest;
    120     QString       m_strMachineName;
     105    CGuest   m_comGuest;
     106    QString  m_strMachineName;
    121107};
    122108
    123 
    124109#endif /* !FEQT_INCLUDED_SRC_guestctrl_UIGuestProcessControlDialog_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp

    r98103 r98875  
    3434#include "QIDialog.h"
    3535#include "QIDialogButtonBox.h"
    36 #include "UIExtraDataManager.h"
     36#include "QIToolBar.h"
     37#include "UICommon.h"
    3738#include "UIGuestControlConsole.h"
    38 #include "UIGuestControlInterface.h"
    3939#include "UIGuestControlTreeItem.h"
    4040#include "UIGuestProcessControlWidget.h"
    41 #include "QIToolBar.h"
    4241#include "UIIconPool.h"
    43 #include "UIVMInformationDialog.h"
    44 #include "UICommon.h"
    4542
    4643/* COM includes: */
    … …  
    4845#include "CEventSource.h"
    4946
    50 const bool UIGuestProcessControlWidget::m_fDeleteAfterUnregister = false;
    5147
    5248/** A QIDialog child to display properties of a guest session on process. */
    5349class UISessionProcessPropertiesDialog : public QIDialog
    5450{
    55 
    5651    Q_OBJECT;
    5752
    … …  
    6863};
    6964
    70 
    71 /*********************************************************************************************************************************
    72 *   UIGuestControlTreeWidget definition.                                                                                         *
    73 *********************************************************************************************************************************/
    7465
    7566class UIGuestControlTreeWidget : public QITreeWidget
    … …  
    298289*   UIGuestProcessControlWidget implementation.                                                                                  *
    299290*********************************************************************************************************************************/
     291
     292const bool UIGuestProcessControlWidget::s_fDeleteAfterUnregister = false;
    300293
    301294UIGuestProcessControlWidget::UIGuestProcessControlWidget(EmbedTo enmEmbedding, const CGuest &comGuest,
    … …  
    545538        }
    546539    }
    547     if (m_fDeleteAfterUnregister)
     540    if (s_fDeleteAfterUnregister)
    548541        delete selectedItem;
    549542}

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.h

    r98103 r98875  
    4141
    4242/* GUI includes: */
     43#include "QIWithRetranslateUI.h"
    4344#include "QIManagerDialog.h"
    44 #include "QIWithRetranslateUI.h"
    4545#include "UIMainEventListener.h"
    4646
    4747/* Forward declarations: */
    48 class QITreeWidget;
    4948class QVBoxLayout;
    50 class QSplitter;
    51 class UIGuestControlConsole;
    52 class UIGuestControlInterface;
    53 class UIGuestSessionsEventHandler;
     49class QIToolBar;
    5450class UIGuestControlTreeWidget;
    55 class QIToolBar;
    5651
    5752/** QWidget extension
    … …  
    6762    ~UIGuestProcessControlWidget();
    6863    /** When true we delete the corresponding tree item as soon as the guest session/process is unregistered. */
    69     static const bool           m_fDeleteAfterUnregister;
     64    static const bool  s_fDeleteAfterUnregister;
    7065
    7166protected:
    … …  
    10196    /** Holds the Qt event listener instance. */
    10297    ComObjPtr<UIMainEventListenerImpl> m_pQtListener;
     98
    10399    /** Holds the COM event listener instance. */
    104     CEventListener m_comEventListener;
    105     const bool     m_fShowToolbar;
    106     QString        m_strMachineName;
     100    CEventListener  m_comEventListener;
     101    const bool      m_fShowToolbar;
     102    QString         m_strMachineName;
    107103};
    108104

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r98874 r98875  
    23922392
    23932393    QIManagerDialog *pProcessControlDialog;
    2394     UIGuestProcessControlDialogFactory dialogFactory(uimachine());
     2394    UIGuestProcessControlDialogFactory dialogFactory;
    23952395    dialogFactory.prepare(pProcessControlDialog, activeMachineWindow());
    23962396    if (pProcessControlDialog)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette