From 98dda3f5ac8e96fe34a343b4fc8cab1dc6939513 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 31 Jul 2018 11:57:43 -0700 Subject: [PATCH] Move the createUnixEventDispatcher() function to a namespace Easier than renaming it with a "qt_" prefix everywhere it's used (it's in a lot of plugins). Change-Id: Ie01831ddac5446fdbdeefffd15468918f3bc2238 Reviewed-by: Edward Welbourne --- .../eventdispatchers/qgenericunixeventdispatcher.cpp | 2 +- .../eventdispatchers/qgenericunixeventdispatcher_p.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp index 11d9c259d5..2e1d81a181 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -class QAbstractEventDispatcher *createUnixEventDispatcher() +class QAbstractEventDispatcher *QtGenericUnixDispatcher::createUnixEventDispatcher() { #if !defined(QT_NO_GLIB) && !defined(Q_OS_WIN) if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") && QEventDispatcherGlib::versionSupported()) diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h index adf70adc05..61b4d0515c 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h @@ -56,7 +56,10 @@ QT_BEGIN_NAMESPACE class QAbstractEventDispatcher; +namespace QtGenericUnixDispatcher { QAbstractEventDispatcher* createUnixEventDispatcher(); +} +using QtGenericUnixDispatcher::createUnixEventDispatcher; QT_END_NAMESPACE