VirtualBox

Changeset 90590 in vbox


Ignore:
Timestamp:
Aug 10, 2021 10:12:47 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
146201
Message:

FE/Qt: bugref:10067: Fixing burns related to downlaoder stuff; No notification-downloader stuff unless VBOX_GUI_WITH_NETWORK_MANAGER is defined.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r90564 r90590  
    34123412    else if (QFile::exists(strUserManualFileName2))
    34133413        sltShowUserManual(strUserManualFileName2);
     3414# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    34143415    /* If downloader is running already: */
    3415     else if (UIDownloaderUserManual::current())
     3416    else if (UINotificationDownloaderUserManual::exists())
    34163417    {
    34173418        /// @todo show notification-center
    … …  
    34283429        gpNotificationCenter->append(pNotification);
    34293430    }
     3431# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    34303432#endif /* #ifdef VBOX_OSE */
    34313433#endif

  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObject.cpp

    r90556 r90590  
    1717
    1818/* GUI includes: */
    19 #include "UIDownloader.h"
    2019#include "UINotificationObject.h"
    2120#include "UINotificationProgressTask.h"
     21#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     22# include "UIDownloader.h"
     23#endif
    2224
    2325
    … …  
    107109
    108110
     111#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    109112/*********************************************************************************************************************************
    110113*   Class UINotificationDownloader implementation.                                                                               *
    … …  
    178181    emit sigProgressFailed();
    179182}
     183#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */

  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObject.h

    r90556 r90590  
    3333
    3434/* Forward declarations: */
     35class UINotificationProgressTask;
     36#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    3537class UIDownloader;
    36 class UINotificationProgressTask;
     38#endif
    3739
    3840/** QObject-based notification-object. */
    … …  
    121123};
    122124
     125#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    123126/** UINotificationObject extension for notification-downloader. */
    124127class SHARED_LIBRARY_STUFF UINotificationDownloader : public UINotificationObject
    … …  
    185188    QString  m_strError;
    186189};
     190#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    187191
    188192#endif /* !FEQT_INCLUDED_SRC_notificationcenter_UINotificationObject_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjectItem.cpp

    r90556 r90590  
    272272
    273273
     274#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    274275/*********************************************************************************************************************************
    275276*   Class UINotificationDownloaderItem implementation.                                                                           *
    … …  
    368369    }
    369370}
     371#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    370372
    371373
    … …  
    379381    if (pObject->inherits("UINotificationProgress"))
    380382        return new UINotificationProgressItem(pParent, static_cast<UINotificationProgress*>(pObject));
     383#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    381384    if (pObject->inherits("UINotificationDownloader"))
    382385        return new UINotificationDownloaderItem(pParent, static_cast<UINotificationDownloader*>(pObject));
     386#endif
    383387    /* Handle defaults: */
    384388    return new UINotificationObjectItem(pParent, pObject);

  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjectItem.h

    r90556 r90590  
    3232class QIRichTextLabel;
    3333class QIToolButton;
    34 class UINotificationDownloader;
    3534class UINotificationObject;
    3635class UINotificationProgress;
     36#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     37class UINotificationDownloader;
     38#endif
    3739
    3840/** QWidget-based notification-object item. */
    … …  
    110112};
    111113
     114#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    112115/** UINotificationObjectItem extension for notification-downloader. */
    113116class UINotificationDownloaderItem : public UINotificationObjectItem
    … …  
    144147    void updateDetails();
    145148};
     149#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    146150
    147151/** Notification-object factory. */

  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

    r90569 r90590  
    14901490
    14911491
     1492#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    14921493/*********************************************************************************************************************************
    14931494*   Class UINotificationDownloaderExtensionPack implementation.                                                                  *
    … …  
    16561657    return 0;
    16571658}
     1659#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */

  • trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

    r90568 r90590  
    11181118};
    11191119
     1120#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    11201121/** UINotificationDownloader extension for extension pack downloading functionality. */
    11211122class SHARED_LIBRARY_STUFF UINotificationDownloaderExtensionPack : public UINotificationDownloader
    … …  
    12561257    QString  m_strFileName;
    12571258};
     1259#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    12581260
    12591261#endif /* !FEQT_INCLUDED_SRC_notificationcenter_UINotificationObjects_h */
Note: See TracChangeset for help on using the changeset viewer.

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