///////////////////////////////////////////////////////////////////////////////
// MuldeR's Utilities for Qt
-// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <QtPlugin>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <QAbstractNativeEventFilter>
+#else
+#define QAbstractNativeEventFilter QObject
+#define Q_DECL_OVERRIDE
#endif
//CRT
#include <string.h>
+//MSVC
+#if defined(_MSC_VER)
+#define FORCE_INLINE __forceinline
+#else
+#define FORCE_INLINE inline
+#endif
+
///////////////////////////////////////////////////////////////////////////////
// Qt Static Initialization
///////////////////////////////////////////////////////////////////////////////
}
#endif
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-static bool qt_event_filter(void *message, long *result)
-{
- return MUtils::OS::handle_os_message(message, result);
-}
-#else
+///////////////////////////////////////////////////////////////////////////////
+// EVENT FILTER
+///////////////////////////////////////////////////////////////////////////////
+
namespace MUtils
{
namespace Startup
public:
bool nativeEventFilter(const QByteArray&, void *message, long *result) Q_DECL_OVERRIDE
{
- return MUtils::OS::handle_os_message(message, result);
+ return filterEvent(message, result);
};
+
+ static FORCE_INLINE bool filterEvent(void *message, long *result)
+ {
+ return MUtils::OS::handle_os_message(message, result);
+ }
+
+ static NativeEventFilter *instance(void)
+ {
+ while (m_instance.isNull())
+ {
+ m_instance.reset(new NativeEventFilter());
+ }
+ return m_instance.data();
+ }
+
+ private:
+ NativeEventFilter(void) {}
+ static QScopedPointer<MUtils::Startup::Internal::NativeEventFilter> m_instance;
};
}
}
}
-static QScopedPointer<MUtils::Startup::Internal::NativeEventFilter> qt_event_filter;
-#endif
///////////////////////////////////////////////////////////////////////////////
// STARTUP FUNCTION
///////////////////////////////////////////////////////////////////////////////
-static int startup_main(int &argc, char **argv, MUtils::Startup::main_function_t *const entry_point, const char* const appName, const bool &debugConsole)
+static FORCE_INLINE int startup_main(int &argc, char **argv, MUtils::Startup::main_function_t *const entry_point, const char* const appName, const bool &debugConsole)
{
qInstallMsgHandler(qt_message_handler);
MUtils::Terminal::setup(argc, argv, appName, MUTILS_DEBUG || debugConsole);
return entry_point(argc, argv);
}
-static int startup_helper(int &argc, char **argv, MUtils::Startup::main_function_t *const entry_point, const char* const appName, const bool &debugConsole)
+static FORCE_INLINE int startup_helper(int &argc, char **argv, MUtils::Startup::main_function_t *const entry_point, const char* const appName, const bool &debugConsole)
{
int iResult = -1;
try
static QMutex g_init_lock;
static const char *const g_imageformats[] = {"bmp", "png", "jpg", "gif", "ico", "xpm", "svg", NULL};
-static QString getExecutableName(int &argc, char **argv)
+static FORCE_INLINE QString getExecutableName(int &argc, char **argv)
{
if(argc >= 1)
{
return QLatin1String("Program.exe");
}
-static void qt_registry_cleanup(void)
+static FORCE_INLINE void qt_registry_cleanup(void)
{
static const wchar_t *const QT_JUNK_KEY = L"Software\\Trolltech\\OrganizationDefaults";
MUtils::Registry::reg_key_delete(MUtils::Registry::root_user, MUTILS_QSTR(QT_JUNK_KEY), true, true);
}
-QApplication *MUtils::Startup::create_qt(int &argc, char **argv, const QString &appName)
+QApplication *MUtils::Startup::create_qt(int &argc, char **argv, const QString &appName, const QString &appAuthor, const QString &appDomain)
{
QMutexLocker lock(&g_init_lock);
const OS::ArgumentMap &arguments = MUtils::OS::arguments();
//Don't initialized again, if done already
- if(QApplication::instance() != NULL)
+ QScopedPointer<QApplication> application(dynamic_cast<QApplication*>(QApplication::instance()));
+ if(!application.isNull())
{
qWarning("Qt is already initialized!");
- return NULL;
+ return application.take();
}
//Extract executable name from argv[] array
//Check the Windows version
const MUtils::OS::Version::os_version_t &osVersion = MUtils::OS::os_version();
- if((osVersion.type != MUtils::OS::Version::OS_WINDOWS) || (osVersion < MUtils::OS::Version::WINDOWS_WINXP))
+#ifdef QT_NODLL
+ if ((osVersion.type != MUtils::OS::Version::OS_WINDOWS) || (osVersion < MUtils::OS::Version::WINDOWS_WINXP) || ((osVersion == MUtils::OS::Version::WINDOWS_WINXP) && (osVersion.versionSPack < 3)))
+ {
+ qFatal("%s", QApplication::tr("Executable '%1' requires Windows XP with SP-3 or later.").arg(executableName).toLatin1().constData());
+ }
+#else
+ if ((osVersion.type != MUtils::OS::Version::OS_WINDOWS) || (osVersion < MUtils::OS::Version::WINDOWS_VISTA) || ((osVersion == MUtils::OS::Version::WINDOWS_VISTA) && (osVersion.versionSPack < 2)))
{
- qFatal("%s", QApplication::tr("Executable '%1' requires Windows XP or later.").arg(executableName).toLatin1().constData());
+ qFatal("%s", QApplication::tr("Executable '%1' requires Windows Vista with SP-2 or later.").arg(executableName).toLatin1().constData());
}
+#endif
//Check whether we are running on a supported Windows version
if(const char *const friendlyName = MUtils::OS::os_friendly_name(osVersion))
{
- qDebug("Running on %s (NT v%u.%u.%u).\n", friendlyName, osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild);
+ qDebug("Running on %s (NT v%u.%u.%u, SP-%u).\n", friendlyName, osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
}
else
{
- const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (v%u.%u.%u).", osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild);
+ const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (NT v%u.%u.%u, SP-%u).", osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
qWarning("%s\n", MUTILS_UTF8(message));
MUtils::OS::system_message_wrn(MUTILS_WCHR(executableName), MUTILS_WCHR(message));
}
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
//Create Qt application instance
- QApplication *application = new QApplication(argc, argv);
+ application.reset(new QApplication(argc, argv));
//Register the Qt clean-up function
atexit(qt_registry_cleanup);
//Set application properties
application->setApplicationName(appName);
- application->setOrganizationName("LoRd_MuldeR");
- application->setOrganizationDomain("mulder.at.gg");
+ application->setOrganizationDomain(appDomain);
+ application->setOrganizationName(appAuthor);
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
- application->setEventFilter(qt_event_filter);
+ application->setEventFilter(&Internal::NativeEventFilter::filterEvent);
#else
- qt_event_filter.reset(new Internal::NativeEventFilter);
- application->installNativeEventFilter(qt_event_filter.data());
+ application->installNativeEventFilter(Internal::NativeEventFilter::instance());
#endif
//Check for supported image formats
if(!supportedFormats.contains(g_imageformats[i]))
{
qFatal("Qt initialization error: QImageIOHandler for '%s' missing!", g_imageformats[i]);
- MUTILS_DELETE(application);
return NULL;
}
}
messageBox.addButton("Ignore", QMessageBox::NoRole);
if(messageBox.exec() == 0)
{
- MUTILS_DELETE(application);
return NULL;
}
}
- //Qt created successfully
- return application;
+ //QApplication created successfully
+ return application.take();
}
///////////////////////////////////////////////////////////////////////////////
OSDN Git Service
