VirtualBox

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


Ignore:
Timestamp:
Oct 23, 2015 2:29:12 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
103632
Message:

FE/Qt: Networking cleanup/rework (part 18): Do not pass static description from network customer to network request since it should be re-acquirable on demand.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/net
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp

    r58252 r58394  
    4848
    4949    /* Create network request set: */
    50     createNetworkRequest(requests, UINetworkRequestType_HEAD, tr("Looking for %1...").arg(m_strDescription));
     50    createNetworkRequest(requests, UINetworkRequestType_HEAD);
    5151}
    5252
    … …  
    6161
    6262    /* Create network request: */
    63     createNetworkRequest(request, UINetworkRequestType_GET, tr("Downloading %1...").arg(m_strDescription));
     63    createNetworkRequest(request, UINetworkRequestType_GET);
    6464}
    6565
    … …  
    7171    connect(this, SIGNAL(sigToStartAcknowledging()), this, SLOT(sltStartAcknowledging()), Qt::QueuedConnection);
    7272    connect(this, SIGNAL(sigToStartDownloading()), this, SLOT(sltStartDownloading()), Qt::QueuedConnection);
     73}
     74
     75/* virtual override */
     76const QString UIDownloader::description() const
     77{
     78    /* Look for known state: */
     79    switch (m_state)
     80    {
     81        case UIDownloaderState_Acknowledging: return tr("Looking for %1...");
     82        case UIDownloaderState_Downloading:   return tr("Downloading %1...");
     83        default:                              break;
     84    }
     85    /* Return null-string by default: */
     86    return QString();
    7387}
    7488

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.h

    r55401 r58394  
    8080    const QString& target() const { return m_strTarget; }
    8181
    82     /* Description stuff,
    83      * allows to set/get Network Customer description for Network Access Manager: */
    84     void setDescription(const QString &strDescription) { m_strDescription = strDescription; }
     82    /** Returns description of the current network operation. */
     83    virtual const QString description() const;
    8584
    8685    /* Start delayed acknowledging: */
    … …  
    113112    QUrl m_source;
    114113    QString m_strTarget;
    115     QString m_strDescription;
    116114};
    117115

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp

    r53449 r58394  
    5858        m_spInstance = this;
    5959
    60     /* Set description: */
    61     setDescription(tr("VirtualBox Guest Additions"));
    62 
    6360    /* Prepare source/target: */
    6461    const QString &strName = QString("VBoxGuestAdditions_%1.iso").arg(vboxGlobal().vboxVersionStringNormalized());
    … …  
    7673    if (m_spInstance == this)
    7774        m_spInstance = 0;
     75}
     76
     77/* virtual override */
     78const QString UIDownloaderAdditions::description() const
     79{
     80    return UIDownloader::description().arg(tr("VirtualBox Guest Additions"));
    7881}
    7982

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.h

    r55401 r58394  
    4444    ~UIDownloaderAdditions();
    4545
     46    /** Returns description of the current network operation. */
     47    virtual const QString description() const;
     48
    4649    /* Virtual stuff reimplementations: */
    4750    bool askForDownloadingConfirmation(UINetworkReply *pReply);

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp

    r53449 r58394  
    6060        m_spInstance = this;
    6161
    62     /* Set description: */
    63     setDescription(tr("VirtualBox Extension Pack"));
    64 
    6562    /* Prepare source/target: */
    6663    QString strExtPackUnderscoredName(QString(GUI_ExtPackName).replace(' ', '_'));
    … …  
    8481    if (m_spInstance == this)
    8582        m_spInstance = 0;
     83}
     84
     85/* virtual override */
     86const QString UIDownloaderExtensionPack::description() const
     87{
     88    return UIDownloader::description().arg(tr("VirtualBox Extension Pack"));
    8689}
    8790

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.h

    r55401 r58394  
    4444    ~UIDownloaderExtensionPack();
    4545
     46    /** Returns description of the current network operation. */
     47    virtual const QString description() const;
     48
    4649    /* Virtual stuff reimplementations: */
    4750    bool askForDownloadingConfirmation(UINetworkReply *pReply);

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp

    r53449 r58394  
    5858        m_spInstance = this;
    5959
    60     /* Set description: */
    61     setDescription(tr("VirtualBox User Manual"));
    62 
    6360    /* Compose User Manual filename: */
    6461    QString strUserManualFullFileName = vboxGlobal().helpFile();
    … …  
    7976    if (m_spInstance == this)
    8077        m_spInstance = 0;
     78}
     79
     80/* virtual override */
     81const QString UIDownloaderUserManual::description() const
     82{
     83    return UIDownloader::description().arg(tr("VirtualBox User Manual"));
    8184}
    8285

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.h

    r55401 r58394  
    4444    ~UIDownloaderUserManual();
    4545
     46    /** Returns description of the current network operation. */
     47    virtual const QString description() const;
     48
    4649    /* Virtual stuff reimplementations: */
    4750    bool askForDownloadingConfirmation(UINetworkReply *pReply);

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.cpp

    r52730 r58394  
    4242}
    4343
    44 void UINetworkCustomer::createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription)
     44void UINetworkCustomer::createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type)
    4545{
    46     gNetworkManager->createNetworkRequest(request, type, strDescription, this);
     46    gNetworkManager->createNetworkRequest(request, type, this);
    4747}
    4848
    49 void UINetworkCustomer::createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription)
     49void UINetworkCustomer::createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type)
    5050{
    51     gNetworkManager->createNetworkRequest(requests, type, strDescription, this);
     51    gNetworkManager->createNetworkRequest(requests, type, this);
    5252}
    5353

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.h

    r55401 r58394  
    5050    virtual void processNetworkReplyFinished(UINetworkReply *pReply) = 0;
    5151
     52    /** Returns description of the current network operation. */
     53    virtual const QString description() const { return QString(); }
     54
    5255protected:
    5356
    5457    /* Network-request wrapper: */
    55     void createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription);
     58    void createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type);
    5659    /* Network-request wrapper (set): */
    57     void createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription);
     60    void createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type);
    5861
    5962private:

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp

    r57877 r58394  
    107107}
    108108
    109 void UINetworkManager::createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription,
     109void UINetworkManager::createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type,
    110110                                            UINetworkCustomer *pCustomer)
    111111{
    112112    /* Create network-request: */
    113     UINetworkRequest *pNetworkRequest = new UINetworkRequest(request, type, strDescription, pCustomer, this);
     113    UINetworkRequest *pNetworkRequest = new UINetworkRequest(request, type, pCustomer, this);
    114114    /* Prepare created network-request: */
    115115    prepareNetworkRequest(pNetworkRequest);
    116116}
    117117
    118 void UINetworkManager::createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription,
     118void UINetworkManager::createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type,
    119119                                            UINetworkCustomer *pCustomer)
    120120{
    121121    /* Create network-request: */
    122     UINetworkRequest *pNetworkRequest = new UINetworkRequest(requests, type, strDescription, pCustomer, this);
     122    UINetworkRequest *pNetworkRequest = new UINetworkRequest(requests, type, pCustomer, this);
    123123    /* Prepare created network-request: */
    124124    prepareNetworkRequest(pNetworkRequest);

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.h

    r57877 r58394  
    8282    friend class UINetworkCustomer;
    8383    /* Network-request creation wrappers for UINetworkCustomer: */
    84     void createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription,
     84    void createNetworkRequest(const QNetworkRequest &request, UINetworkRequestType type,
    8585                              UINetworkCustomer *pCustomer);
    86     void createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription,
     86    void createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type,
    8787                              UINetworkCustomer *pCustomer);
    8888

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp

    r57877 r58394  
    3636
    3737/* Constructor: */
    38 UINetworkRequest::UINetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription,
     38UINetworkRequest::UINetworkRequest(const QNetworkRequest &request, UINetworkRequestType type,
    3939                                   UINetworkCustomer *pCustomer,
    4040                                   UINetworkManager *pNetworkManager)
    … …  
    4444    , m_iCurrentRequestIndex(0)
    4545    , m_type(type)
    46     , m_strDescription(strDescription)
    4746    , m_pCustomer(pCustomer)
    4847    , m_fRunning(false)
    … …  
    5251}
    5352
    54 UINetworkRequest::UINetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription,
     53UINetworkRequest::UINetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type,
    5554                                   UINetworkCustomer *pCustomer,
    5655                                   UINetworkManager *pNetworkManager)
    … …  
    6059    , m_iCurrentRequestIndex(0)
    6160    , m_type(type)
    62     , m_strDescription(strDescription)
    6361    , m_pCustomer(pCustomer)
    6462    , m_fRunning(false)
    … …  
    8280    AssertPtrReturn(parent(), 0);
    8381    return qobject_cast<UINetworkManager*>(parent());
     82}
     83
     84const QString UINetworkRequest::description() const
     85{
     86    return m_pCustomer->description();
    8487}
    8588

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.h

    r57877 r58394  
    5858
    5959    /* Constructor/destructor: */
    60     UINetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription,
     60    UINetworkRequest(const QNetworkRequest &request, UINetworkRequestType type,
    6161                     UINetworkCustomer *pCustomer,
    6262                     UINetworkManager *pNetworkManager);
    63     UINetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription,
     63    UINetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type,
    6464                     UINetworkCustomer *pCustomer,
    6565                     UINetworkManager *pNetworkManager);
    … …  
    7070    /* Getters: */
    7171    const QUuid& uuid() const { return m_uuid; }
    72     const QString& description() const { return m_strDescription; }
     72    const QString description() const;
    7373    UINetworkCustomer* customer() { return m_pCustomer; }
    7474    UINetworkReply* reply() { return m_pReply; }

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

    r58252 r58394  
    164164private:
    165165
     166    /** Returns description of the current network operation. */
     167    virtual const QString description() const
     168    {
     169        return tr("Checking for a new VirtualBox version...");
     170    }
     171
    166172    /* Prepare network request: */
    167173    void prepareNetworkRequest()
    … …  
    193199        request.setUrl(url);
    194200        request.setRawHeader("User-Agent", strUserAgent.toAscii());
    195         createNetworkRequest(request, UINetworkRequestType_GET, tr("Checking for a new VirtualBox version..."));
     201        createNetworkRequest(request, UINetworkRequestType_GET);
    196202    }
    197203
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