VirtualBox

Ignore:
Timestamp:
May 13, 2024 12:12:44 PM (11 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
163127
Message:

FE/Qt: bugref:10450: Get rid of pre-5.14 code related to QString/QStringList splitting.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleManager.cpp

    r104393 r104586  
    10691069{
    10701070    /* Parse definition: */
    1071 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    10721071    const QStringList parts = strDefinition.split('/', Qt::SkipEmptyParts);
    1073 #else
    1074     const QStringList parts = strDefinition.split('/', QString::SkipEmptyParts);
    1075 #endif
    10761072    /* Depending on parts amount: */
    10771073    switch (parts.size())

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp

    r104358 r104586  
    8585
    8686    /* Split details into paragraphs: */
    87 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    8887    QStringList paragraphs(strText.split("<!--EOP-->", Qt::SkipEmptyParts));
    89 #else
    90     QStringList paragraphs(strText.split("<!--EOP-->", QString::SkipEmptyParts));
    91 #endif
    9288    /* Make sure details-text has at least one paragraph: */
    9389    AssertReturnVoid(!paragraphs.isEmpty());
    … …  
    9894    {
    9995        /* Split each paragraph into pairs: */
    100 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    10196        QStringList parts(strParagraph.split("<!--EOM-->", Qt::KeepEmptyParts));
    102 #else
    103         QStringList parts(strParagraph.split("<!--EOM-->", QString::KeepEmptyParts));
    104 #endif
    10597        /* Make sure each paragraph consist of 2 parts: */
    10698        AssertReturnVoid(parts.size() == 2);

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

    r104585 r104586  
    21952195    /* Few old extra-data string-lists were separated with 'semicolon' symbol.
    21962196     * All new separated by 'comma'. We have to take that into account. */
    2197 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    21982197    return strValue.split(QRegularExpression("[;,]"), Qt::SkipEmptyParts);
    2199 #else
    2200     return strValue.split(QRegularExpression("[;,]"), QString::SkipEmptyParts);
    2201 #endif
    22022198}
    22032199

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

    r102378 r104586  
    144144/* static */ QStringList UIPathOperations::pathTrail(const QString &path)
    145145{
    146 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    147146    return path.split(UIPathOperations::delimiter, Qt::SkipEmptyParts);
    148 #else
    149     return path.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
    150 #endif
    151147}
    152148

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

    r104393 r104586  
    643643        return;
    644644
    645     QString userHome = UIPathOperations::sanitize(m_comGuestSession.GetUserHome());
     645    const QString strUserHome = UIPathOperations::sanitize(m_comGuestSession.GetUserHome());
    646646    if (!m_comGuestSession.isOk())
    647647    {
    … …  
    649649        return;
    650650    }
    651 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    652     QStringList pathList = userHome.split(UIPathOperations::delimiter, Qt::SkipEmptyParts);
    653 #else
    654     QStringList pathList = userHome.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
    655 #endif
    656     goIntoDirectory(UIPathOperations::pathTrail(userHome));
     651    goIntoDirectory(UIPathOperations::pathTrail(strUserHome));
    657652}
    658653

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

    r104393 r104586  
    885885    QString strFileContent = stream.readAll();
    886886    strFileContent.replace(' ', '\n');
    887     QStringList list;
    888 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    889     list = strFileContent.split("\n", Qt::SkipEmptyParts);
    890 #else
    891     list = strFileContent.split("\n", QString::SkipEmptyParts);
    892 #endif
    893887    QMap<QString, QString> fileEntries;
    894888    QStringList removedEntries;
    895     foreach (const QString &strPart, list)
    896     {
    897         QStringList fileEntry;
    898 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    899         fileEntry = strPart.split("=", Qt::SkipEmptyParts);
    900 #else
    901         fileEntry = strPart.split("=", QString::SkipEmptyParts);
    902 #endif
     889    foreach (const QString &strPart, strFileContent.split("\n", Qt::SkipEmptyParts))
     890    {
     891        const QStringList fileEntry = strPart.split("=", Qt::SkipEmptyParts);
    903892        /* We currently do not support different on-ISO names for different namespaces. */
    904893        if (strPart.startsWith("/") && strPart.count('=') <= 1)

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

    r103793 r104586  
    9494
    9595        /* Parse buffer contents to dictionary: */
    96 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    9796        const QStringList dictionary(QString(receivedData).split("\n", Qt::SkipEmptyParts));
    98 #else
    99         const QStringList dictionary(QString(receivedData).split("\n", QString::SkipEmptyParts));
    100 #endif
    10197        /* Make sure it's not empty: */
    10298        if (dictionary.isEmpty())

  • trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderGuestAdditions.cpp

    r103793 r104586  
    9393
    9494        /* Parse buffer contents to dictionary: */
    95 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    9695        const QStringList dictionary(QString(receivedData).split("\n", Qt::SkipEmptyParts));
    97 #else
    98         const QStringList dictionary(QString(receivedData).split("\n", QString::SkipEmptyParts));
    99 #endif
    10096        /* Make sure it's not empty: */
    10197        if (dictionary.isEmpty())

  • trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.cpp

    r103988 r104586  
    491491            /* Parse header contents: */
    492492            const QString strHeaders = QString(m_reply);
    493 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    494             const QStringList headers = strHeaders.split("\n", Qt::SkipEmptyParts);
    495 #else
    496             const QStringList headers = strHeaders.split("\n", QString::SkipEmptyParts);
    497 #endif
    498             foreach (const QString &strHeader, headers)
     493            foreach (const QString &strHeader, strHeaders.split("\n", Qt::SkipEmptyParts))
    499494            {
    500 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    501495                const QStringList values = strHeader.split(": ", Qt::SkipEmptyParts);
    502 #else
    503                 const QStringList values = strHeader.split(": ", QString::SkipEmptyParts);
    504 #endif
    505496                if (values.size() > 1)
    506497                    m_headers[values.at(0)] = values.at(1);

  • trunk/src/VBox/Frontends/VirtualBox/src/networking/UINewVersionChecker.cpp

    r103793 r104586  
    117117    if (strResponseData.indexOf(QRegularExpression("^\\d+\\.\\d+\\.\\d+(_[0-9A-Z]+)? \\S+$")) == 0)
    118118    {
    119 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    120119        const QStringList response = strResponseData.split(" ", Qt::SkipEmptyParts);
    121 #else
    122         const QStringList response = strResponseData.split(" ", QString::SkipEmptyParts);
    123 #endif
    124120        UINotificationMessage::showUpdateSuccess(response[0], response[1]);
    125121    }

  • trunk/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.cpp

    r103793 r104586  
    9393    m_fCheckEnabled = true;
    9494
    95 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     95    /* Parse the data we have: */
    9696    const QStringList parser = m_strData.split(", ", Qt::SkipEmptyParts);
    97 #else
    98     const QStringList parser = m_strData.split(", ", QString::SkipEmptyParts);
    99 #endif
    10097
    10198    /* Parse 'period' value: */

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/XKeyboard-new.cpp

    r103538 r104586  
    208208    if (remapScancodes != QString())
    209209    {
    210 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    211         QStringList tuples = remapScancodes.split(",", Qt::SkipEmptyParts);
    212 #else
    213         QStringList tuples = remapScancodes.split(",", QString::SkipEmptyParts);
    214 #endif
     210        const QStringList tuples = remapScancodes.split(",", Qt::SkipEmptyParts);
    215211        scancodes = scancodesTail = new int [tuples.size()+1][2];
    216212        for (int i = 0; i < tuples.size(); ++i)

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

    r103496 r104586  
    249249        case QMetaType::QVariantList: /* Used on OS X for representing URI lists. */
    250250        {
    251             QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
    252 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    253             QStringList lstString = strData.split(DND_PATH_SEPARATOR_STR, Qt::SkipEmptyParts);
    254 #else
    255             QStringList lstString = strData.split(DND_PATH_SEPARATOR_STR, QString::SkipEmptyParts);
    256 #endif
     251            const QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
    257252
    258253            QVariantList lstVariant;
    259254
    260             Q_FOREACH(const QString& strCur, lstString)
     255            Q_FOREACH(const QString& strCur, strData.split(DND_PATH_SEPARATOR_STR, Qt::SkipEmptyParts))
    261256            {
    262257                QVariant vaURL = QVariant::fromValue(QUrl(strCur));
    … …  
    272267        case QMetaType::QStringList:
    273268        {
    274             QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
    275 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    276             QStringList lstString = strData.split(DND_PATH_SEPARATOR_STR, Qt::SkipEmptyParts);
    277 #else
    278             QStringList lstString = strData.split(DND_PATH_SEPARATOR_STR, QString::SkipEmptyParts);
    279 #endif
     269            const QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
     270            const QStringList lstString = strData.split(DND_PATH_SEPARATOR_STR, Qt::SkipEmptyParts);
    280271
    281272            LogFlowFunc(("\tStringList has %d entries\n", lstString.size()));

  • trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

    r104585 r104586  
    21132113             /* Some captions are multi line using \n as separator: */
    21142114             QStringList strList;
    2115 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    21162115             strList << strTopleftString.split("\n", Qt::SkipEmptyParts)
    21172116                     << strShiftAltGrCaption.split("\n", Qt::SkipEmptyParts);
    2118 #else
    2119              strList << strTopleftString.split("\n", QString::SkipEmptyParts)
    2120                      << strShiftAltGrCaption.split("\n", QString::SkipEmptyParts);
    2121 #endif
    21222117             foreach (const QString &strPart, strList)
    21232118                 iTopWidth = qMax(iTopWidth, fontMetrics.horizontalAdvance(strPart));
    21242119             strList.clear();
    2125 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    21262120             strList << strBottomleftString.split("\n", Qt::SkipEmptyParts)
    21272121                     << strAltGrCaption.split("\n", Qt::SkipEmptyParts);
    2128 #else
    2129              strList << strBottomleftString.split("\n", QString::SkipEmptyParts)
    2130                      << strAltGrCaption.split("\n", QString::SkipEmptyParts);
    2131 #endif
    21322122
    21332123             int iBottomWidth = 0;
    … …  
    34633453        else if (m_xmlReader.name() == QLatin1String("scancodeprefix"))
    34643454        {
    3465             QString strCode = m_xmlReader.readElementText();
    3466             QStringList strList;
    3467 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    3468             strList << strCode.split('-', Qt::SkipEmptyParts);
    3469 #else
    3470             strList << strCode.split('-', QString::SkipEmptyParts);
    3471 #endif
    3472             foreach (const QString &strPrefix, strList)
     3455            const QString strCode = m_xmlReader.readElementText();
     3456            foreach (const QString &strPrefix, strCode.split('-', Qt::SkipEmptyParts))
    34733457            {
    34743458                bool fOk = false;

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp

    r104358 r104586  
    540540
    541541    /* Split details into paragraphs: */
    542 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    543     QStringList aParagraphs(m_strDetails.split("<!--EOP-->", Qt::SkipEmptyParts));
    544 #else
    545     QStringList aParagraphs(m_strDetails.split("<!--EOP-->", QString::SkipEmptyParts));
    546 #endif
     542    const QStringList aParagraphs(m_strDetails.split("<!--EOP-->", Qt::SkipEmptyParts));
    547543    /* Make sure details-text has at least one paragraph: */
    548544    AssertReturnVoid(!aParagraphs.isEmpty());
    … …  
    552548    {
    553549        /* Split each paragraph into pairs: */
    554 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
    555         QStringList aParts(strParagraph.split("<!--EOM-->", Qt::KeepEmptyParts));
    556 #else
    557         QStringList aParts(strParagraph.split("<!--EOM-->", QString::KeepEmptyParts));
    558 #endif
     550        const QStringList aParts(strParagraph.split("<!--EOM-->", Qt::KeepEmptyParts));
    559551        /* Make sure each paragraph consist of 2 parts: */
    560552        AssertReturnVoid(aParts.size() == 2);
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