VirtualBox

Changeset 98309 in vbox


Ignore:
Timestamp:
Jan 26, 2023 10:09:27 AM (20 months ago)
Author:
vboxsync
Message:

Revert GUI part of r151118 as this boilerplate isn't required for now.

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

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

    r98103 r98309  
    7979#include "CStorageControllerChangedEvent.h"
    8080#include "CStorageDeviceChangedEvent.h"
    81 #include "CUpdateAgent.h"
    82 #include "CUpdateAgentAvailableEvent.h"
    83 #include "CUpdateAgentErrorEvent.h"
    84 #include "CUpdateAgentStateChangedEvent.h"
    85 #include "CUpdateAgentSettingsChangedEvent.h"
    8681#include "CUSBDevice.h"
    8782#include "CUSBDeviceStateChangedEvent.h"
     
    231226    qRegisterMetaType<KGuestMonitorChangedEventType>("KGuestMonitorChangedEventType");
    232227    qRegisterMetaType<CGuestSession>("CGuestSession");
    233     qRegisterMetaType<CUpdateAgent>("CUpdateAgent");
    234     qRegisterMetaType<KUpdateChannel>("KUpdateChannel");
    235     qRegisterMetaType<KUpdateSeverity>("KUpdateSeverity");
    236     qRegisterMetaType<KUpdateState>("KUpdateState");
    237228}
    238229
     
    628619            break;
    629620        }
    630         case KVBoxEventType_OnUpdateAgentAvailable:
    631         {
    632             CUpdateAgentAvailableEvent comEventSpecific(pEvent);
    633             emit sigUpdateAgentAvailable(comEventSpecific.GetAgent(),
    634                                          comEventSpecific.GetVersion(), comEventSpecific.GetChannel(),
    635                                          comEventSpecific.GetSeverity(), comEventSpecific.GetDownloadURL(),
    636                                          comEventSpecific.GetWebURL(), comEventSpecific.GetReleaseNotes());
    637             break;
    638         }
    639         case KVBoxEventType_OnUpdateAgentError:
    640         {
    641             CUpdateAgentErrorEvent comEventSpecific(pEvent);
    642             emit sigUpdateAgentError(comEventSpecific.GetAgent(), comEventSpecific.GetMsg(), comEventSpecific.GetRcError());
    643             break;
    644         }
    645         case KVBoxEventType_OnUpdateAgentStateChanged:
    646         {
    647             CUpdateAgentStateChangedEvent comEventSpecific(pEvent);
    648             emit sigUpdateAgentStateChanged(comEventSpecific.GetAgent(), comEventSpecific.GetState());
    649             break;
    650         }
    651         case KVBoxEventType_OnUpdateAgentSettingsChanged:
    652         {
    653             CUpdateAgentSettingsChangedEvent comEventSpecific(pEvent);
    654             emit sigUpdateAgentSettingsChanged(comEventSpecific.GetAgent(), comEventSpecific.GetAttributeHint());
    655             break;
    656         }
    657621        default: break;
    658622    }
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

    r98103 r98309  
    4949#include "CNetworkAdapter.h"
    5050#include "CUSBDevice.h"
    51 #include "CUpdateAgent.h"
    5251#include "CVirtualBoxErrorInfo.h"
    5352
     
    205204    /** @} */
    206205
    207     /** @name Update agent signals
    208      * @{ */
    209        /** Notifies about an available update of an update agent. */
    210        void sigUpdateAgentAvailable(CUpdateAgent, QString, KUpdateChannel, KUpdateSeverity, QString, QString, QString);
    211        /** Notifies about an error of an update agent. */
    212        void sigUpdateAgentError(CUpdateAgent, QString, long);
    213        /** Notifies about a state change of an update agent. */
    214        void sigUpdateAgentStateChanged(CUpdateAgent, KUpdateState);
    215        /** Notifies about update agent @a comAgent settings change. */
    216        void sigUpdateAgentSettingsChanged(CUpdateAgent comAgent, const QString &strAttributeHint);
    217     /** @} */
    218 
    219206    /** @name Progress related signals
    220207      * @{ */
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp

    r98103 r98309  
    9090      * @param  fRegistered    Brings whether medium is registered or unregistered. */
    9191    void sigMediumRegistered(const QUuid &uMediumId, KDeviceType enmMediumType, bool fRegistered);
    92     /** Notifies about an available update of an update agent. */
    93     void sigUpdateAgentAvailable(CUpdateAgent, QString, KUpdateChannel, KUpdateSeverity, QString, QString, QString);
    94     /** Notifies about an error of an update agent. */
    95     void sigUpdateAgentError(CUpdateAgent, QString, long);
    96     /** Notifies about a state change of an update agent. */
    97     void sigUpdateAgentStateChanged(CUpdateAgent, KUpdateState);
    98     /** Notifies about update agent @a comAgent settings change. */
    99     void sigUpdateAgentSettingsChanged(CUpdateAgent comAgent, const QString &strAttributeHint);
    10092
    10193public:
     
    195187        << KVBoxEventType_OnMediumChanged
    196188        << KVBoxEventType_OnMediumConfigChanged
    197         << KVBoxEventType_OnMediumRegistered
    198         << KVBoxEventType_OnUpdateAgentAvailable
    199         << KVBoxEventType_OnUpdateAgentStateChanged
    200         << KVBoxEventType_OnUpdateAgentError
    201         << KVBoxEventType_OnUpdateAgentSettingsChanged;
     189        << KVBoxEventType_OnMediumRegistered;
    202190
    203191    /* Register event listener for event source aggregator: */
     
    266254    connect(m_pQtListener->getWrapped(), SIGNAL(sigMediumRegistered(QUuid, KDeviceType, bool)),
    267255            this, SIGNAL(sigMediumRegistered(QUuid, KDeviceType, bool)),
    268             Qt::DirectConnection);
    269     connect(m_pQtListener->getWrapped(), SIGNAL(sigUpdateAgentAvailable(CUpdateAgent, QString, KUpdateChannel, KUpdateSeverity,
    270                                                                         QString, QString, QString)),
    271             this, SIGNAL(sigUpdateAgentAvailable(CUpdateAgent, QString, KUpdateChannel, KUpdateSeverity,
    272                                                  QString, QString, QString)),
    273             Qt::DirectConnection);
    274     connect(m_pQtListener->getWrapped(), SIGNAL(sigUpdateAgentError(CUpdateAgent, QString, long)),
    275             this, SIGNAL(sigUpdateAgentError(CUpdateAgent, QString, long)),
    276             Qt::DirectConnection);
    277     connect(m_pQtListener->getWrapped(), SIGNAL(sigUpdateAgentStateChanged(CUpdateAgent, KUpdateState)),
    278             this, SIGNAL(sigUpdateAgentStateChanged(CUpdateAgent, KUpdateState)),
    279             Qt::DirectConnection);
    280     connect(m_pQtListener->getWrapped(), SIGNAL(sigUpdateAgentSettingsChanged(CUpdateAgent, QString)),
    281             this, SIGNAL(sigUpdateAgentSettingsChanged(CUpdateAgent, QString)),
    282256            Qt::DirectConnection);
    283257}
     
    402376            this, SIGNAL(sigMediumRegistered(QUuid, KDeviceType, bool)),
    403377            Qt::QueuedConnection);
    404     connect(m_pProxy, SIGNAL(sigUpdateAgentAvailable(CUpdateAgent, QString, KUpdateChannel, KUpdateSeverity,
    405                                                      QString, QString, QString)),
    406             this, SIGNAL(sigUpdateAgentAvailable(CUpdateAgent, QString, KUpdateChannel, KUpdateSeverity,
    407                                                  QString, QString, QString)),
    408             Qt::DirectConnection);
    409     connect(m_pProxy, SIGNAL(sigUpdateAgentError(CUpdateAgent, QString, long)),
    410             this, SIGNAL(sigUpdateAgentError(CUpdateAgent, QString, long)),
    411             Qt::DirectConnection);
    412     connect(m_pProxy, SIGNAL(sigUpdateAgentStateChanged(CUpdateAgent, KUpdateState)),
    413             this, SIGNAL(sigUpdateAgentStateChanged(CUpdateAgent, KUpdateState)),
    414             Qt::DirectConnection);
    415     connect(m_pProxy, SIGNAL(sigUpdateAgentSettingsChanged(CUpdateAgent, QString)),
    416             this, SIGNAL(sigUpdateAgentSettingsChanged(CUpdateAgent, QString)),
    417             Qt::QueuedConnection);
    418378}
    419379
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.h

    r98103 r98309  
    4242#include "CMedium.h"
    4343#include "CMediumAttachment.h"
    44 #include "CUpdateAgent.h"
    4544
    4645/* Forward declarations: */
     
    9998      * @param  fRegistered    Brings whether medium is registered or unregistered. */
    10099    void sigMediumRegistered(const QUuid &uMediumId, KDeviceType enmMediumType, bool fRegistered);
    101     /** Notifies about an available update of an update agent. */
    102     void sigUpdateAgentAvailable(CUpdateAgent, QString, KUpdateChannel, KUpdateSeverity, QString, QString, QString);
    103     /** Notifies about an error of an update agent. */
    104     void sigUpdateAgentError(CUpdateAgent, QString, long);
    105     /** Notifies about a state change of an update agent. */
    106     void sigUpdateAgentStateChanged(CUpdateAgent, KUpdateState);
    107     /** Notifies about update agent @a comAgent settings change. */
    108     void sigUpdateAgentSettingsChanged(CUpdateAgent comAgent, const QString &strAttributeHint);
    109100
    110101public:
  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

    r98103 r98309  
    4848#include "UINotificationObjectItem.h"
    4949#include "UINotificationModel.h"
    50 #include "UIVirtualBoxEventHandler.h" /** @todo EXAMPLE -- REMOVE THIS */
    51 #include "CUpdateAgent.h"             /** @todo EXAMPLE -- REMOVE THIS */
    5250
    5351/* Other VBox includes: */
     
    415413}
    416414
    417 /** @todo EXAMPLE -- REMOVE THIS */
    418 void UINotificationCenter::sltUpdateAgentAvailable(CUpdateAgent comAgent, QString strVer, KUpdateChannel, KUpdateSeverity, QString, QString, QString)
    419 {
    420     RT_NOREF(comAgent, strVer);
    421 }
    422 
    423415void UINotificationCenter::sltHandleOpenButtonToggled(bool fToggled)
    424416{
     
    559551        connect(m_pModel, &UINotificationModel::sigItemRemoved,
    560552                this, &UINotificationCenter::sltHandleModelItemRemoved);
    561         /** @todo EXAMPLE -- REMOVE THIS */
    562         connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigUpdateAgentAvailable,
    563                 this, &UINotificationCenter::sltUpdateAgentAvailable);
    564553    }
    565554}
  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

    r98103 r98309  
    118118    /** Handles order changes. */
    119119    void sltHandleOrderChange();
    120 
    121     /** @todo EXAMPLE -- REMOVE THIS */
    122     void sltUpdateAgentAvailable(CUpdateAgent comAgent, QString, KUpdateChannel, KUpdateSeverity, QString, QString, QString);
    123120
    124121    /** Issues request to make open button @a fToggled. */
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