From 0bd21a8111f3ec3a515f4c9d1587e6770f229275 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 7 Aug 2012 00:10:11 +0200 Subject: QtCore: use new qEnvironmentVariableIs{Set,Empty}() In particular, qEmergencyOut() is now completely exception-free. Incidentally, this patch shows that Qt isn't consistent in how it treats empty environment variables used as flags, but that is something for a separate commit. This patch aims to be behaviour-preserving, except in exceptional circumstances, of course. Change-Id: Ie106e7b430e1ab086c40c81cc1e56cd0e5400cb4 Reviewed-by: Thiago Macieira --- src/corelib/global/qlogging.cpp | 4 ++-- src/corelib/kernel/qcoreapplication.cpp | 2 +- src/corelib/kernel/qeventdispatcher_glib.cpp | 2 +- src/corelib/mimetypes/qmimeprovider.cpp | 2 +- src/corelib/thread/qthread_unix.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 527021381a..fb17496009 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -126,7 +126,7 @@ static void qEmergencyOut(QtMsgType msgType, const char *msg, va_list ap) Q_DECL if (msgType == QtFatalMsg || (msgType == QtWarningMsg - && (!qgetenv("QT_FATAL_WARNINGS").isNull())) ) { + && qEnvironmentVariableIsSet("QT_FATAL_WARNINGS"))) { #if defined(Q_CC_MSVC) && defined(QT_DEBUG) && defined(_DEBUG) && defined(_CRT_ERROR) // get the current report mode int reportMode = _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW); @@ -679,7 +679,7 @@ void qt_message_output(QtMsgType msgType, const QMessageLogContext &context, con if (msgType == QtFatalMsg || (msgType == QtWarningMsg - && (!qgetenv("QT_FATAL_WARNINGS").isNull())) ) { + && qEnvironmentVariableIsSet("QT_FATAL_WARNINGS")) ) { #if defined(Q_CC_MSVC) && defined(QT_DEBUG) && defined(_DEBUG) && defined(_CRT_ERROR) // get the current report mode diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 4c1f159552..d3fb7f4018 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -350,7 +350,7 @@ void QCoreApplicationPrivate::createEventDispatcher() eventDispatcher = new QEventDispatcherBlackberry(q); # else # if !defined(QT_NO_GLIB) - if (qgetenv("QT_NO_GLIB").isEmpty() && QEventDispatcherGlib::versionSupported()) + if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") && QEventDispatcherGlib::versionSupported()) eventDispatcher = new QEventDispatcherGlib(q); else # endif diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 3f75c4ec72..73abe8c374 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -293,7 +293,7 @@ static GSourceFuncs postEventSourceFuncs = { QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) : mainContext(context) { - if (qgetenv("QT_NO_THREADED_GLIB").isEmpty()) { + if (qEnvironmentVariableIsEmpty("QT_NO_THREADED_GLIB")) { static QBasicMutex mutex; QMutexLocker locker(&mutex); if (!g_thread_supported()) diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index 1f7d06caa4..3b0e0f51a0 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -188,7 +188,7 @@ enum { bool QMimeBinaryProvider::isValid() { #if defined(QT_USE_MMAP) - if (!qgetenv("QT_NO_MIME_CACHE").isEmpty()) + if (!qEnvironmentVariableIsEmpty("QT_NO_MIME_CACHE")) return false; Q_ASSERT(m_cacheFiles.isEmpty()); // this method is only ever called once diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index b3040f3dee..e9db276d48 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -256,8 +256,8 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data) data->eventDispatcher = new QEventDispatcherBlackberry; #else #if !defined(QT_NO_GLIB) - if (qgetenv("QT_NO_GLIB").isEmpty() - && qgetenv("QT_NO_THREADED_GLIB").isEmpty() + if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") + && qEnvironmentVariableIsEmpty("QT_NO_THREADED_GLIB") && QEventDispatcherGlib::versionSupported()) data->eventDispatcher = new QEventDispatcherGlib; else -- cgit v1.2.3