VirtualBox

Changeset 97849 in vbox


Ignore:
Timestamp:
Dec 20, 2022 4:04:33 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
154935
Message:

FE/Qt: bugref:9898: Just todos and comments.

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

Legend:

Unmodified
Added
Removed

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

    r97679 r97849  
    408408            connect(m_pComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
    409409                    this, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated));
    410 #ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: textActivated was added in 5.14 actually */
     410#ifdef VBOX_IS_QT6_OR_LATER /* textActivated was added in 5.14 actually */
    411411            connect(m_pComboBox, &QComboBox::textActivated,
    412412                    this, &QIComboBox::textActivated);
    … …  
    419419            connect(m_pComboBox, &QComboBox::currentTextChanged, this, &QIComboBox::currentTextChanged);
    420420            connect(m_pComboBox, &QComboBox::editTextChanged, this, &QIComboBox::editTextChanged);
    421 #ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: textHighlighted was added in 5.14 actually */
     421#ifdef VBOX_IS_QT6_OR_LATER /* textHighlighted was added in 5.14 actually */
    422422            connect(m_pComboBox, &QComboBox::textHighlighted,
    423423                    this, &QIComboBox::textHighlighted);

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp

    r96407 r97849  
    5757            AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
    5858            /* For touch-screen event we have something special: */
    59 #ifdef VBOX_IS_QT6_OR_LATER
     59#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
    6060            if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
    6161#else
    … …  
    7878            AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
    7979            /* For touch-screen event we have something special: */
    80 #ifdef VBOX_IS_QT6_OR_LATER
     80#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
    8181            if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
    8282#else
    … …  
    105105            AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
    106106            /* For touch-screen event we have something special: */
    107 #ifdef VBOX_IS_QT6_OR_LATER
     107#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
    108108            if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
    109109#else

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

    r97682 r97849  
    234234{
    235235    /* Make sure QApplication cleanup us on exit: */
    236 #ifndef VBOX_IS_QT6_OR_LATER
     236#ifndef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
    237237    qApp->setFallbackSessionManagementEnabled(false);
    238238#endif
    … …  
    27652765            if (!isSeparateProcess())
    27662766            {
    2767 # if defined(VBOX_WS_MAC) && defined(VBOX_IS_QT6_OR_LATER)
     2767# if defined(VBOX_WS_MAC) && defined(VBOX_IS_QT6_OR_LATER) /** @todo qt6: ... */
    27682768                /* This code prevents QWindowSystemInterface::handleApplicationTermination
    27692769                   for running, so among other things QApplication::closeAllWindows isn't

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

    r96407 r97849  
    464464}
    465465
    466 #ifdef VBOX_IS_QT6_OR_LATER
     466#ifdef VBOX_IS_QT6_OR_LATER /* it was setSource before 6.0 */
    467467void UIHelpViewer::doSetSource(const QUrl &url, QTextDocument::ResourceType type)
    468468#else
    … …  
    473473    if (url.scheme() != "qthelp")
    474474        return;
    475 #ifdef VBOX_IS_QT6_OR_LATER
     475#ifdef VBOX_IS_QT6_OR_LATER /* it was setSource before 6.0 */
    476476    QTextBrowser::doSetSource(url, type);
    477477#else

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

    r96407 r97849  
    8383    virtual QVariant loadResource(int type, const QUrl &name) RT_OVERRIDE;
    8484    void emitHistoryChangedSignal();
    85 #ifndef VBOX_IS_QT6_OR_LATER /* must override doSetSource in 6.0 */
     85#ifndef VBOX_IS_QT6_OR_LATER /* must override doSetSource since 6.0 */
    8686    virtual void setSource(const QUrl &url) RT_OVERRIDE;
    8787#endif
    … …  
    112112    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
    113113    virtual void keyPressEvent(QKeyEvent *pEvent) RT_OVERRIDE;
    114 #ifdef VBOX_IS_QT6_OR_LATER
     114#ifdef VBOX_IS_QT6_OR_LATER /* it was setSource before 6.0 */
    115115    virtual void doSetSource(const QUrl &url, QTextDocument::ResourceType type = QTextDocument::UnknownResource) RT_OVERRIDE;
    116116#endif

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UICloudEntityKey.h

    r96407 r97849  
    6868};
    6969
    70 #ifdef VBOX_IS_QT6_OR_LATER
     70#ifdef VBOX_IS_QT6_OR_LATER /* uint replaced with size_t since 6.0 */
    7171inline size_t qHash(const UICloudEntityKey &key, size_t uSeed)
    7272#else

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r97278 r97849  
    5353#endif
    5454#ifdef VBOX_WS_MAC
    55 # ifdef VBOX_IS_QT6_OR_LATER
     55# ifdef VBOX_IS_QT6_OR_LATER /* we are branding as Dev Preview since 6.0 */
    5656#  include "UIIconPool.h"
    5757# endif
    … …  
    643643#ifdef VBOX_WS_MAC
    644644                        m_pToolBar->emulateMacToolbar();
    645 # ifdef VBOX_IS_QT6_OR_LATER
     645# ifdef VBOX_IS_QT6_OR_LATER /* we are branding as Dev Preview since 6.0 */
    646646                        /* Branding stuff for Qt6 beta: */
    647647                        if (uiCommon().showBetaLabel())
    … …  
    650650                                                       QColor(246, 179, 0),
    651651                                                       74 /* width of BETA label */);
    652 # endif /* VBOX_IS_QT6_OR_LATER */
     652# endif
    653653#endif /* VBOX_WS_MAC */
    654654

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

    r97606 r97849  
    752752
    753753    /* Re-register VM if required: */
    754 #ifdef VBOX_IS_QT6_OR_LATER
     754#ifdef VBOX_IS_QT6_OR_LATER /* we have to use range constructors since 6.0 */
    755755    QSet<QString> newGroupSet(newGroupList.begin(), newGroupList.end());
    756756    QSet<QString> oldGroupSet(oldGroupList.begin(), oldGroupList.end());

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

    r97278 r97849  
    439439
    440440    /* If we have at least one of those items currently selected: */
    441 #ifdef VBOX_IS_QT6_OR_LATER
     441#ifdef VBOX_IS_QT6_OR_LATER /* we have to use range constructors since 6.0 */
    442442    {
    443443        QList<UIChooserItem *> selectedItemsList = selectedItems();

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.cpp

    r96407 r97849  
    2828/* Qt includes: */
    2929#include <qglobal.h>
    30 #ifdef VBOX_IS_QT6_OR_LATER
     30#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
    3131# include <QRegularExpression>
    3232#else
    … …  
    241241        else
    242242        {
    243 #ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is 6.0+ */
     243#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
    244244            QRegularExpression searchRegEx = QRegularExpression::fromWildcard(strSearchTerm, Qt::CaseInsensitive);
    245245#else

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.h

    r96407 r97849  
    3535/* Qt includes: */
    3636#include <QWidget>
    37 #ifndef VBOX_IS_QT6_OR_LATER
     37#ifndef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
    3838# include <QMacCocoaViewContainer>
    3939#endif
    … …  
    4949  * used as cocoa button container. */
    5050class SHARED_LIBRARY_STUFF UICocoaButton
    51 #ifdef VBOX_IS_QT6_OR_LATER
     51#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
    5252    : public QWidget
    5353#else

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp

    r96407 r97849  
    4545        const QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/" + VBOX_GUI_VMRUNNER_IMAGE);
    4646        QTextStream out(&link);
    47 #ifndef VBOX_IS_QT6_OR_LATER /* defaults to UTF-8 in qt6 */
     47#ifndef VBOX_IS_QT6_OR_LATER /* QTextStream defaults to UTF-8 only since qt6 */
    4848        out.setCodec("UTF-8");
    4949#endif

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp

    r96407 r97849  
    3434#include <QtXml/QDomElement>
    3535#include <QWidget>
    36 #ifdef VBOX_IS_QT6_OR_LATER
     36#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
    3737# include <QGuiApplication>
    3838#else
    … …  
    668668Display *NativeWindowSubsystem::X11GetDisplay(void)
    669669{
    670 #ifdef VBOX_IS_QT6_OR_LATER
     670#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
    671671    Display *pDisplay = nullptr;
    672672    if (qApp)
    … …  
    685685xcb_connection_t *NativeWindowSubsystem::X11GetConnection(void)
    686686{
    687 #ifdef VBOX_IS_QT6_OR_LATER
     687#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
    688688    if (qApp)
    689689    {
    … …  
    700700uint32_t NativeWindowSubsystem::X11GetAppRootWindow(void)
    701701{
    702 #ifdef VBOX_IS_QT6_OR_LATER
     702#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
    703703    Window idWindow = 0;
    704704    Display *pDisplay = NativeWindowSubsystem::X11GetDisplay();

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

    r97794 r97849  
    116116
    117117    /** Redirects all the native events to parent. */
    118 #ifdef VBOX_IS_QT6_OR_LATER
    119     bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr * /* pResult */)
     118#ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
     119    bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr*)
    120120#else
    121     bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long * /* pResult */)
     121    bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long*)
    122122#endif
    123123    {

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

    r96407 r97849  
    337337    if (!uisession()->isRunning() && !uisession()->isPaused() && !uisession()->isStuck())
    338338    {
    339 #if defined(VBOX_IS_QT6_OR_LATER) && defined(VBOX_WS_MAC)
     339#if defined(VBOX_IS_QT6_OR_LATER) && defined(VBOX_WS_MAC) /** @todo qt6 ... */
    340340        /* If we want to close the application, we need to accept the close event.
    341341           If we don't the QEvent::Quit processing in QApplication::event fails and

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

    r97771 r97849  
    786786                    }
    787787                    if (mouseEvent(pWheelEvent->type(), uScreenId,
    788 #ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
     788#ifdef VBOX_IS_QT6_OR_LATER
    789789                                   pWheelEvent->position().toPoint(), pWheelEvent->globalPosition().toPoint(),
    790790#else
    … …  
    12131213    LONG xShift = 0, yShift = 0;
    12141214
    1215 #ifdef VBOX_IS_QT6_OR_LATER
     1215#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
    12161216    bool fTouchScreen = (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen);
    12171217#else

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

    r97682 r97849  
    286286    else
    287287    {
    288 #ifdef VBOX_IS_QT6_OR_LATER
     288#ifdef VBOX_IS_QT6_OR_LATER /** @todo why is this any problem on qt6? */
    289289        msgCenter().showModalProgressDialog(progress, machineName(), ":/progress_start_90px.png", 0, 0);
    290290#else

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.cpp

    r96407 r97849  
    9393
    9494    /** Handles all native events. */
    95 # ifdef VBOX_IS_QT6_OR_LATER
     95# ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
    9696    virtual bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr *pResult) RT_OVERRIDE
    9797# else
    … …  
    634634}
    635635
    636 #ifdef VBOX_IS_QT6_OR_LATER
     636#ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
    637637bool UIHostComboEditorPrivate::nativeEvent(const QByteArray &eventType, void *pMessage, qintptr *pResult)
    638638#else

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.h

    r96407 r97849  
    201201
    202202    /** Handles native events. */
    203 #ifdef VBOX_IS_QT6_OR_LATER
     203#ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
    204204    virtual bool nativeEvent(const QByteArray &eventType, void *pMessage, qintptr *pResult) RT_OVERRIDE;
    205205#else

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

    r97847 r97849  
    710710}
    711711
    712 #ifdef VBOX_IS_QT6_OR_LATER
     712#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
    713713void UIMiniToolBar::enterEvent(QEnterEvent*)
    714714#else

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.h

    r97847 r97849  
    127127
    128128    /** Mouse enter @a pEvent handler. */
    129 #ifdef VBOX_IS_QT6_OR_LATER
     129#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
    130130    virtual void enterEvent(QEnterEvent *pEvent) RT_OVERRIDE;
    131131#else

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

    r97649 r97849  
    265265            //m_pScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
    266266            QPalette pal = m_pScrollArea->palette();
    267 #ifndef VBOX_IS_QT6_OR_LATER
     267#ifndef VBOX_IS_QT6_OR_LATER /** @todo Qt::transparent glitches in qt6? */
    268268            pal.setColor(QPalette::Window, QColor(Qt::transparent));
    269269#endif

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

    r96407 r97849  
    124124    virtual void mouseMoveEvent(QMouseEvent *pEvent) RT_OVERRIDE;
    125125    /** Handles mouse-enter @a pEvent. */
    126 #ifdef VBOX_IS_QT6_OR_LATER
     126#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
    127127    virtual void enterEvent(QEnterEvent *pEvent) RT_OVERRIDE;
    128128#else
    … …  
    589589}
    590590
    591 #ifdef VBOX_IS_QT6_OR_LATER
     591#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
    592592void UITabBarItem::enterEvent(QEnterEvent *pEvent)
    593593#else
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