From bdd682ea4cc21938eed080817fb931d362d8231a Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 7 Aug 2012 00:11:51 +0200 Subject: [PATCH] QtGui: use new qEnvironmentVariableIsEmpty() In particular, static bool showRasterOverlay is safer. Change-Id: I9df6c9a9a56d2e61b13391b6889c0ac6e259e801 Reviewed-by: Gunnar Sletta Reviewed-by: Thiago Macieira --- src/gui/image/qpixmap_blitter.cpp | 2 +- .../services/genericunix/qgenericunixservices.cpp | 4 ++-- src/plugins/platforms/cocoa/qcocoaintegration.mm | 2 +- src/plugins/platforms/minimalegl/qminimaleglscreen.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp index 382c0b8d1a7..53e997e0639 100644 --- a/src/gui/image/qpixmap_blitter.cpp +++ b/src/gui/image/qpixmap_blitter.cpp @@ -204,7 +204,7 @@ QPaintEngine *QBlittablePlatformPixmap::paintEngine() const #ifdef QT_BLITTER_RASTEROVERLAY -static bool showRasterOverlay = !qgetenv("QT_BLITTER_RASTEROVERLAY").isEmpty(); +static bool showRasterOverlay = !qEnvironmentVariableIsEmpty("QT_BLITTER_RASTEROVERLAY"); void QBlittablePlatformPixmap::mergeOverlay() { diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/platformsupport/services/genericunix/qgenericunixservices.cpp index 168ecf82e49..6639f904b39 100644 --- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp +++ b/src/platformsupport/services/genericunix/qgenericunixservices.cpp @@ -54,10 +54,10 @@ enum { debug = 0 }; static inline QByteArray detectDesktopEnvironment() { - if (!qgetenv("KDE_FULL_SESSION").isEmpty()) + if (!qEnvironmentVariableIsEmpty("KDE_FULL_SESSION")) return QByteArray("KDE"); // GNOME_DESKTOP_SESSION_ID is deprecated for some reason, but still check it - if (qgetenv("DESKTOP_SESSION") == "gnome" || !qgetenv("GNOME_DESKTOP_SESSION_ID").isEmpty()) + if (qgetenv("DESKTOP_SESSION") == "gnome" || !qEnvironmentVariableIsEmpty("GNOME_DESKTOP_SESSION_ID")) return QByteArray("GNOME"); return QByteArray("UNKNOWN"); } diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index ccb11212766..95155f35405 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -165,7 +165,7 @@ QCocoaIntegration::QCocoaIntegration() NSApplication *cocoaApplication = [NSApplication sharedApplication]; - if (qgetenv("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM").isEmpty()) { + if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) { // Applications launched from plain executables (without an app // bundle) are "background" applications that does not take keybaord // focus or have a dock icon or task switcher entry. Qt Gui apps generally diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp index ff1617d5388..74ec3941d31 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp @@ -147,7 +147,7 @@ void QMinimalEglScreen::createAndSetPlatformContext() m_format = QImage::Format_RGB32; } - if (!qgetenv("QT_QPA_EGLFS_MULTISAMPLE").isEmpty()) + if (!qEnvironmentVariableIsEmpty("QT_QPA_EGLFS_MULTISAMPLE")) platformFormat.setSamples(4); EGLConfig config = q_configFromGLFormat(m_dpy, platformFormat);