VirtualBox

儲存庫 vbox 的更動 63305


忽略:
時間撮記:
2016-8-10 下午11:24:00 (8 年 以前)
作者:
vboxsync
訊息:

QtGui: Warnings

位置:
trunk
檔案:
修改 5 筆資料

圖例:

未更動
新增
刪除

  • trunk/Config.kmk

    r63304 r63305  
    57045704     QT_DLL _CRT_SECURE_NO_DEPRECATE \
    57055705     $(QMAKE_PRL_DEFINES)
    5706   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = -nologo -Zm200 -MD -Zi -EHsc -Zc:wchar_t- -W3
     5706  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = -nologo -Zm200 -MD -Zi -EHsc -Zc:wchar_t-
     5707  ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
     5708   #    -wd4481: nonstandard extension used: override specifier 'override'
     5709   #    -wd4625: 'QRubberBand' : copy constructor could not be generated because a base class copy constructor is inaccessible
     5710   #    -wd4626: 'QRubberBand' : assignment operator could not be generated because a base class assignment operator is inaccessible
     5711   #    -wd4640: qmetatype.h(2210): warning C4640: 'f' : construction of local static object is not thread-safe [too bad]
     5712   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += $(VBOX_VCC_WARN_ALL) -wd4481 -wd4625 -wd4626 -wd4640 $(VBOX_VCC_WERR)
     5713  else
     5714   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS += -W3
     5715  endif
    57075716  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.debug = -RTCsu
    57085717  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.dbgopt = $(NO_SUCH_VARIABLE)

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

    r62493 r63305  
    2424
    2525/* Qt includes: */
     26# ifdef RT_OS_WINDOWS
     27#  include <iprt/win/windows.h> /* QGLWidget drags in Windows.h; -Wall forces us to use wrapper. */
     28#  include <iprt/stdint.h>      /* QGLWidget drags in stdint.h; -Wall forces us to use wrapper. */
     29# endif
    2630# include <QGLWidget>
    2731# include <QFile>
    … …  
    630634    VBoxVHWAGlProgram(VBoxVHWAGlShader ** apShaders, int acShaders);
    631635
    632     ~VBoxVHWAGlProgram();
     636    virtual ~VBoxVHWAGlProgram();
    633637
    634638    virtual int init();
    … …  
    37803784
    37813785    VBOXQGLLOG(("resizing: fmt=%d, vram=%p, bpp=%d, bpl=%d, width=%d, height=%d\n",
    3782                       size.pixelFormat(), size.VRAM(),
    3783                       size.bitsPerPixel(), size.bytesPerLine(),
    3784                       size.width(), size.height()));
     3786                size.pixelFormat(), size.VRAM(),
     3787                size.bitsPerPixel(), size.bytesPerLine(),
     3788                size.width(), size.height()));
    37853789
    37863790    /* clean the old values first */
    37873791
    3788     ulong bytesPerLine;
    3789     uint32_t bitsPerPixel;
    3790     uint32_t b = 0xff, g = 0xff00, r = 0xff0000;
    3791     bool bUsesGuestVram;
     3792    ulong    bytesPerLine = 0; /* Shut up MSC. */
     3793    uint32_t bitsPerPixel = 0; /* Shut up MSC. */
     3794    uint32_t b =     0xff;
     3795    uint32_t g =   0xff00;
     3796    uint32_t r = 0xff0000;
     3797    bool fUsesGuestVram = false; /* Shut up MSC. */
    37923798
    37933799    /* check if we support the pixel format and can use the guest VRAM directly */
    … …  
    38493855        {
    38503856            // ulong virtWdt = bitsPerLine / size.bitsPerPixel();
    3851             bUsesGuestVram = true;
     3857            fUsesGuestVram = true;
    38523858        }
    38533859    }
    … …  
    38683874        g = 0xff00;
    38693875        r = 0xff0000;
    3870         bytesPerLine = size.width()*bitsPerPixel/8;
    3871         bUsesGuestVram = false;
     3876        bytesPerLine = size.width() * bitsPerPixel / 8;
     3877        fUsesGuestVram = false;
    38723878    }
    38733879
    … …  
    39093915#endif
    39103916            0 /* VBOXVHWAIMG_TYPE fFlags */);
    3911     pDisplay->init(NULL, bUsesGuestVram ? size.VRAM() : NULL);
     3917    pDisplay->init(NULL, fUsesGuestVram ? size.VRAM() : NULL);
    39123918    mDisplay.setVGA(pDisplay);
    39133919//    VBOXQGLLOG(("\n\n*******\n\n     viewport size is: (%d):(%d)\n\n*******\n\n", size().width(), size().height()));

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

    • 屬性 svn:keywords 設為 Author Date Id Revision
    r62493 r63305  
    1 /* $Id: $ */
     1/* $Id$ */
    22/** @file
    33 * VBox Qt GUI - VBoxFrameBuffer Overly classes declarations.
    … …  
    1717#ifndef __VBoxFBOverlay_h__
    1818#define __VBoxFBOverlay_h__
    19 #if defined (VBOX_GUI_USE_QGL) || defined(VBOX_WITH_VIDEOHWACCEL)
     19
     20#if defined(VBOX_GUI_USE_QGL) || defined(VBOX_WITH_VIDEOHWACCEL)
    2021
    2122/* Defines: */
    … …  
    2627
    2728/* Qt includes: */
     29#ifdef RT_OS_WINDOWS
     30# include <iprt/win/windows.h> /* QGLWidget drags in Windows.h; -Wall forces us to use wrapper. */
     31# include <iprt/stdint.h>      /* QGLWidget drags in stdint.h; -Wall forces us to use wrapper. */
     32#endif
    2833#include <QGLWidget>
    2934
    … …  
    18401845};
    18411846
    1842 #endif
     1847#endif /* defined(VBOX_GUI_USE_QGL) || defined(VBOX_WITH_VIDEOHWACCEL) */
    18431848
    18441849#endif /* #ifndef __VBoxFBOverlay_h__ */

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp

    r62493 r63305  
    2020#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    2121
     22# ifdef RT_OS_WINDOWS
     23#  include <iprt/win/windows.h> /* QGLWidget drags in Windows.h; -Wall forces us to use wrapper. */
     24#  include <iprt/stdint.h>      /* QGLWidget drags in stdint.h; -Wall forces us to use wrapper. */
     25# endif
    2226# include <QGLWidget>
    2327

  • trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

    r62493 r63305  
    239239# ifndef VBOX_WS_X11
    240240    NOREF(strMessage);
    241 # endif /* !VBOX_WS_X11 */
     241# endif
    242242    switch (type)
    243243    {
    … …  
    250250            /* Needed for instance for the message ``cannot connect to X server'': */
    251251            RTStrmPrintf(g_pStdErr, "Qt WARNING: %s\n", strMessage.toUtf8().constData());
    252 # endif /* VBOX_WS_X11 */
     252# endif
    253253            break;
    254254        case QtCriticalMsg:
    … …  
    257257            /* Needed for instance for the message ``cannot connect to X server'': */
    258258            RTStrmPrintf(g_pStdErr, "Qt CRITICAL: %s\n", strMessage.toUtf8().constData());
    259 # endif /* VBOX_WS_X11 */
     259# endif
    260260            break;
    261261        case QtFatalMsg:
    … …  
    264264            /* Needed for instance for the message ``cannot connect to X server'': */
    265265            RTStrmPrintf(g_pStdErr, "Qt FATAL: %s\n", strMessage.toUtf8().constData());
    266 # endif /* VBOX_WS_X11 */
     266# endif
     267        case QtInfoMsg:
     268            /* ignore? */
     269            break;
    267270    }
    268271}
    … …  
    738741# endif /* !RT_OS_LINUX */
    739742            break;
    740 # ifdef RT_OS_LINUX
    741743        case kSupInitOp_IPRT:
    742744        case kSupInitOp_Misc:
    743             if (rc == VERR_NO_MEMORY)
     745            if (rc == VERR_VM_DRIVER_VERSION_MISMATCH)
     746# ifndef RT_OS_LINUX
     747                strText += g_QStrHintOtherWrongDriverVersion;
     748# else
     749                strText += g_QStrHintLinuxWrongDriverVersion;
     750            else if (rc == VERR_NO_MEMORY)
    744751                strText += g_QStrHintLinuxNoMemory;
    745             else
    746 # endif /* RT_OS_LINUX */
    747             if (rc == VERR_VM_DRIVER_VERSION_MISMATCH)
    748 # ifdef RT_OS_LINUX
    749                 strText += g_QStrHintLinuxWrongDriverVersion;
    750 # else /* RT_OS_LINUX */
    751                 strText += g_QStrHintOtherWrongDriverVersion;
    752 # endif /* !RT_OS_LINUX */
     752# endif
    753753            else
    754754                strText += g_QStrHintReinstall;
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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