Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/gui/painting/qpaintdevice_x11.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the QtGui module of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4949
    5050QT_BEGIN_NAMESPACE
    51 
    52 QPaintDevice::QPaintDevice()
    53 {
    54     painters = 0;
    55 }
    56 
    57 extern void qt_painter_removePaintDevice(QPaintDevice *); //qpainter.cpp
    58 
    59 QPaintDevice::~QPaintDevice()
    60 {
    61     if (paintingActive())
    62         qWarning("QPaintDevice: Cannot destroy paint device that is being "
    63                   "painted");
    64     qt_painter_removePaintDevice(this);
    65 }
    6651
    6752/*! \internal
    … …  
    9782}
    9883
    99 int QPaintDevice::metric(PaintDeviceMetric) const
    100 {
    101     qWarning("QPaintDevice::metrics: Device has no metric information");
    102     return 0;
    103 }
    104 
    10584
    10685
    10786#ifdef QT3_SUPPORT
    10887
    109 /*!
    110     Use QX11Info::display() instead.
    111 
    112     \oldcode
    113         Display *display = widget->x11Display();
    114     \newcode
    115         Display *display = QX11Info::display();
    116     \endcode
    117 
    118     \sa QWidget::x11Info(), QX11Info::display()
    119 */
    12088Display *QPaintDevice::x11Display() const
    12189{
    … …  
    12391}
    12492
    125 /*!
    126     Use QX11Info::screen() instead.
    127 
    128     \oldcode
    129         int screen = widget->x11Screen();
    130     \newcode
    131         int screen = widget->x11Info().screen();
    132     \endcode
    133 
    134     \sa QWidget::x11Info(), QPixmap::x11Info()
    135 */
    13693int QPaintDevice::x11Screen() const
    13794{
    … …  
    14299}
    143100
    144 /*!
    145     Use QX11Info::visual() instead.
    146 
    147     \oldcode
    148         void *visual = widget->x11Visual();
    149     \newcode
    150         void *visual = widget->x11Info().visual();
    151     \endcode
    152 
    153     \sa QWidget::x11Info(), QPixmap::x11Info()
    154 */
    155101void *QPaintDevice::x11Visual() const
    156102{
    … …  
    161107}
    162108
    163 /*!
    164     Use QX11Info::depth() instead.
    165 
    166     \oldcode
    167         int depth = widget->x11Depth();
    168     \newcode
    169         int depth = widget->x11Info().depth();
    170     \endcode
    171 
    172     \sa QWidget::x11Info(), QPixmap::x11Info()
    173 */
    174109int QPaintDevice::x11Depth() const
    175110{
    … …  
    180115}
    181116
    182 /*!
    183     Use QX11Info::cells() instead.
    184 
    185     \oldcode
    186         int cells = widget->x11Cells();
    187     \newcode
    188         int cells = widget->x11Info().cells();
    189     \endcode
    190 
    191     \sa QWidget::x11Info(), QPixmap::x11Info()
    192 */
    193117int QPaintDevice::x11Cells() const
    194118{
    … …  
    199123}
    200124
    201 /*!
    202     Use QX11Info::colormap() instead.
    203 
    204     \oldcode
    205         unsigned long screen = widget->x11Colormap();
    206     \newcode
    207         unsigned long screen = widget->x11Info().colormap();
    208     \endcode
    209 
    210     \sa QWidget::x11Info(), QPixmap::x11Info()
    211 */
    212125Qt::HANDLE QPaintDevice::x11Colormap() const
    213126{
    … …  
    218131}
    219132
    220 /*!
    221     Use QX11Info::defaultColormap() instead.
    222 
    223     \oldcode
    224         bool isDefault = widget->x11DefaultColormap();
    225     \newcode
    226         bool isDefault = widget->x11Info().defaultColormap();
    227     \endcode
    228 
    229     \sa QWidget::x11Info(), QPixmap::x11Info()
    230 */
    231133bool QPaintDevice::x11DefaultColormap() const
    232134{
    … …  
    237139}
    238140
    239 /*!
    240     Use QX11Info::defaultVisual() instead.
    241 
    242     \oldcode
    243         bool isDefault = widget->x11DefaultVisual();
    244     \newcode
    245         bool isDefault = widget->x11Info().defaultVisual();
    246     \endcode
    247 
    248     \sa QWidget::x11Info(), QPixmap::x11Info()
    249 */
    250141bool QPaintDevice::x11DefaultVisual() const
    251142{
    … …  
    256147}
    257148
    258 /*!
    259     Use QX11Info::visual() instead.
    260 
    261     \oldcode
    262         void *visual = QPaintDevice::x11AppVisual(screen);
    263     \newcode
    264         void *visual = qApp->x11Info(screen).visual();
    265     \endcode
    266 
    267     \sa QWidget::x11Info(), QPixmap::x11Info()
    268 */
    269149void *QPaintDevice::x11AppVisual(int screen)
    270150{ return QX11Info::appVisual(screen); }
    271151
    272 /*!
    273     Use QX11Info::colormap() instead.
    274 
    275     \oldcode
    276         unsigned long colormap = QPaintDevice::x11AppColormap(screen);
    277     \newcode
    278         unsigned long colormap = qApp->x11Info(screen).colormap();
    279     \endcode
    280 
    281     \sa QWidget::x11Info(), QPixmap::x11Info()
    282 */
    283152Qt::HANDLE QPaintDevice::x11AppColormap(int screen)
    284153{ return QX11Info::appColormap(screen); }
    285154
    286 /*!
    287     Use QX11Info::display() instead.
    288 
    289     \oldcode
    290         Display *display = QPaintDevice::x11AppDisplay();
    291     \newcode
    292         Display *display = qApp->x11Info().display();
    293     \endcode
    294 
    295     \sa QWidget::x11Info(), QPixmap::x11Info()
    296 */
    297155Display *QPaintDevice::x11AppDisplay()
    298156{ return QX11Info::display(); }
    299157
    300 /*!
    301     Use QX11Info::screen() instead.
    302 
    303     \oldcode
    304         int screen = QPaintDevice::x11AppScreen();
    305     \newcode
    306         int screen = qApp->x11Info().screen();
    307     \endcode
    308 
    309     \sa QWidget::x11Info(), QPixmap::x11Info()
    310 */
    311158int QPaintDevice::x11AppScreen()
    312159{ return QX11Info::appScreen(); }
    313160
    314 /*!
    315     Use QX11Info::depth() instead.
    316 
    317     \oldcode
    318         int depth = QPaintDevice::x11AppDepth(screen);
    319     \newcode
    320         int depth = qApp->x11Info(screen).depth();
    321     \endcode
    322 
    323     \sa QWidget::x11Info(), QPixmap::x11Info()
    324 */
    325161int QPaintDevice::x11AppDepth(int screen)
    326162{ return QX11Info::appDepth(screen); }
    327163
    328 /*!
    329     Use QX11Info::cells() instead.
    330 
    331     \oldcode
    332         int cells = QPaintDevice::x11AppCells(screen);
    333     \newcode
    334         int cells = qApp->x11Info(screen).cells();
    335     \endcode
    336 
    337     \sa QWidget::x11Info(), QPixmap::x11Info()
    338 */
    339164int QPaintDevice::x11AppCells(int screen)
    340165{ return QX11Info::appCells(screen); }
    341166
    342 /*!
    343     Use QX11Info::appRootWindow() instead.
    344 
    345     \oldcode
    346         unsigned long window = QPaintDevice::x11AppRootWindow(screen);
    347     \newcode
    348         unsigned long window = qApp->x11Info(screen).appRootWindow();
    349     \endcode
    350 
    351     \sa QWidget::x11Info(), QPixmap::x11Info()
    352 */
    353167Qt::HANDLE QPaintDevice::x11AppRootWindow(int screen)
    354168{ return QX11Info::appRootWindow(screen); }
    355169
    356 /*!
    357     Use QX11Info::defaultColormap() instead.
    358 
    359     \oldcode
    360         bool isDefault = QPaintDevice::x11AppDefaultColormap(screen);
    361     \newcode
    362         bool isDefault = qApp->x11Info(screen).defaultColormap();
    363     \endcode
    364 
    365     \sa QWidget::x11Info(), QPixmap::x11Info()
    366 */
    367170bool QPaintDevice::x11AppDefaultColormap(int screen)
    368171{ return QX11Info::appDefaultColormap(screen); }
    369172
    370 /*!
    371     Use QX11Info::defaultVisual() instead.
    372 
    373     \oldcode
    374         bool isDefault = QPaintDevice::x11AppDefaultVisual(screen);
    375     \newcode
    376         bool isDefault = qApp->x11Info(screen).defaultVisual();
    377     \endcode
    378 
    379     \sa QWidget::x11Info(), QPixmap::x11Info()
    380 */
    381173bool QPaintDevice::x11AppDefaultVisual(int screen)
    382174{ return QX11Info::appDefaultVisual(screen); }
    383175
    384 /*!
    385     Use QX11Info::setAppDpiX() instead.
    386 */
    387176void QPaintDevice::x11SetAppDpiX(int dpi, int screen)
    388177{
    … …  
    390179}
    391180
    392 /*!
    393     Use QX11Info::setAppDpiY() instead.
    394 */
    395181void QPaintDevice::x11SetAppDpiY(int dpi, int screen)
    396182{
    … …  
    398184}
    399185
    400 
    401 /*!
    402     Use QX11Info::appDpiX() instead.
    403 
    404     \oldcode
    405         bool isDefault = QPaintDevice::x11AppDpiX(screen);
    406     \newcode
    407         bool isDefault = qApp->x11Info(screen).appDpiX();
    408     \endcode
    409 
    410     \sa QWidget::x11Info(), QPixmap::x11Info()
    411 */
    412186int QPaintDevice::x11AppDpiX(int screen)
    413187{
    … …  
    415189}
    416190
    417 /*!
    418     Use QX11Info::appDpiY() instead.
    419 
    420     \oldcode
    421         bool isDefault = QPaintDevice::x11AppDpiY(screen);
    422     \newcode
    423         bool isDefault = qApp->x11Info(screen).appDpiY();
    424     \endcode
    425 
    426     \sa QWidget::x11Info(), QPixmap::x11Info()
    427 */
    428191int QPaintDevice::x11AppDpiY(int screen)
    429192{
Note: See TracChangeset for help on using the changeset viewer.