mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace overlooked QT_VERSION_CHECKs with explicit version.

Browse Source 
See 12eb26431f .
This commit is contained in:
Stefan Hacker 2014-09-20 00:38:47 +02:00
parent 8cf4e142e5
commit ddab6ed8eb
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/manual/manual.cpp
View File

@ -32,7 +32,7 @@
#include <QtCore/QtCore>
#include <QtGui/QtGui>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if QT_VERSION >= 0x050000
# if defined(Q_OS_WIN)
# include <qpa/qplatformnativeinterface.h>
# endif
@ -80,7 +80,7 @@ static struct {
#ifdef Q_OS_WIN
static QWidget *QWidgetForHWND(HWND hwnd) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if QT_VERSION >= 0x050000
QList<QWidget *> windows = qApp->topLevelWidgets();
foreach (QWidget *w, windows) {
QWindow *window = w->windowHandle();
@ -275,7 +275,7 @@ static void config(HWND h) {
#else
mDlg->setParent(reinterpret_cast<QWidget *>(h), Qt::Dialog);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#if QT_VERSION < 0x050000
mDlg->qpbUnhinge->setEnabled(true);
#endif
} else {
@ -286,7 +286,7 @@ static void config(HWND h) {
#endif
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if QT_VERSION >= 0x050000
mDlg->qpbUnhinge->setEnabled(false);
#endif
mDlg->show();
@ -325,7 +325,7 @@ static std::wstring shortname(L"Manual placement");
static void about(HWND h) {
QMessageBox::about(
#if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000
QWidgetForHWND(h),
#else
reinterpret_cast<QWidget *>(h),

2
plugins/manual/manual.h
View File

@ -2,7 +2,7 @@
#define MUMBLE_MANUAL_H_
#include <QtCore/QtGlobal>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if QT_VERSION >= 0x050000
# include <QtWidgets/QDialog>
# include <QtWidgets/QGraphicsItem>
# include <QtWidgets/QGraphicsScene>

4
src/mumble/MainWindow.h
View File

@ -33,7 +33,7 @@
#define MUMBLE_MUMBLE_MAINWINDOW_H_
#include <QtCore/QtGlobal>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if QT_VERSION >= 0x050000
# include <QtCore/QPointer>
# include <QtWidgets/QMainWindow>
# include <QtWidgets/QSystemTrayIcon>
@ -116,7 +116,7 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin
bool bSuppressAskOnQuit;
bool bAutoUnmute;
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#if QT_VERSION >= 0x050000
QPointer<Channel> cContextChannel;
QPointer<ClientUser> cuContextUser;
#else

2
src/mumble/MumbleApplication.cpp
View File

@ -68,7 +68,7 @@ bool MumbleApplication::event(QEvent *e) {
}
#ifdef Q_OS_WIN
# if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
# if QT_VERSION >= 0x050000
bool MumbleApplication::nativeEventFilter(const QByteArray &eventType, void *message, long *result) {
Q_UNUSED(eventType);
MSG *msg = reinterpret_cast<MSG *>(message);