diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-04-22 18:57:46 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-04-22 19:25:14 (GMT) |
| commit | 8d7729cd116d40b0ab0bc65a709fe7b70ba84e64 (patch) | |
| tree | b02756602f45cc22e596b851d7057ad0745a7859 | |
| parent | 5c5d5cf6f70155d0920d8727696785d8348d65fb (diff) | |
| download | Qt-8d7729cd116d40b0ab0bc65a709fe7b70ba84e64.zip Qt-8d7729cd116d40b0ab0bc65a709fe7b70ba84e64.tar.gz Qt-8d7729cd116d40b0ab0bc65a709fe7b70ba84e64.tar.bz2 | |
Kill some warnings
Refactor two small things so that we don't get warnings when
QT_DIRECTFB_NO_(OPAQUEDETECTION|MOUSE|KEYBOARD) is defined
Reviewed-by: Shane McLaughlin <Shane.McLaughlin@trolltech.com>
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index a6017b8..f9172cc 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -160,6 +160,9 @@ static bool checkForAlphaPixels(const QImage &img) void QDirectFBPixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags flags) { +#ifdef QT_NO_DIRECTFB_OPAQUE_DETECTION + Q_UNUSED(flags); +#endif Q_ASSERT(img.depth() != 1); // these should be handled by QRasterPixmapData if (img.hasAlphaChannel() #ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 490eeb0..b2b8e9b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -956,16 +956,15 @@ void QDirectFBScreen::disconnect() bool QDirectFBScreen::initDevice() { - QWSServer *server = QWSServer::instance(); #ifndef QT_NO_DIRECTFB_MOUSE if (qgetenv("QWS_MOUSE_PROTO").isEmpty()) { - server->setDefaultMouse("None"); + QWSServer::instance()->->setDefaultMouse("None"); d_ptr->mouse = new QDirectFBMouseHandler; } #endif #ifndef QT_NO_DIRECTFB_KEYBOARD if (qgetenv("QWS_KEYBOARD").isEmpty()) { - server->setDefaultKeyboard("None"); + QWSServer::instance()->->setDefaultKeyboard("None"); d_ptr->keyboard = new QDirectFBKeyboardHandler(QString()); } #endif |