diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures.cpp | 10 | ||||
-rw-r--r-- | src/imports/winextras/qquickiconloader.cpp | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistitem_p.h | 3 | ||||
-rw-r--r-- | src/winextras/qwinfunctions.h | 12 |
4 files changed, 8 insertions, 19 deletions
diff --git a/src/imports/winextras/qquickdwmfeatures.cpp b/src/imports/winextras/qquickdwmfeatures.cpp index 313f27e..d8f706d 100644 --- a/src/imports/winextras/qquickdwmfeatures.cpp +++ b/src/imports/winextras/qquickdwmfeatures.cpp @@ -228,10 +228,7 @@ void QQuickDwmFeatures::setBlurBehindEnabled(bool enabled) bool QQuickDwmFeatures::isExcludedFromPeek() const { Q_D(const QQuickDwmFeatures); - if (window()) - return QtWin::isWindowExcludedFromPeek(window()); - else - return d->peekExcluded; + return window() ? QtWin::isWindowExcludedFromPeek(window()) : d->peekExcluded; } void QQuickDwmFeatures::setExcludedFromPeek(bool exclude) @@ -255,10 +252,7 @@ void QQuickDwmFeatures::setExcludedFromPeek(bool exclude) bool QQuickDwmFeatures::isPeekDisallowed() const { Q_D(const QQuickDwmFeatures); - if (window()) - return QtWin::isWindowPeekDisallowed(window()); - else - return d->peekDisallowed; + return window() ? QtWin::isWindowPeekDisallowed(window()) : d->peekDisallowed; } void QQuickDwmFeatures::setPeekDisallowed(bool disallow) diff --git a/src/imports/winextras/qquickiconloader.cpp b/src/imports/winextras/qquickiconloader.cpp index df9a19d..88b064a 100644 --- a/src/imports/winextras/qquickiconloader.cpp +++ b/src/imports/winextras/qquickiconloader.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QVariant QQuickIconLoader::loadFromFile(const QUrl &url, QVariant::Type type) { const QString path = QQmlFile::urlToLocalFileOrQrc(url); - if (QFileInfo(path).exists()) { + if (QFileInfo::exists(path)) { switch (type) { case QMetaType::QIcon: return QVariant(QIcon(path)); diff --git a/src/imports/winextras/qquickjumplistitem_p.h b/src/imports/winextras/qquickjumplistitem_p.h index ca47a35..47d92d7 100644 --- a/src/imports/winextras/qquickjumplistitem_p.h +++ b/src/imports/winextras/qquickjumplistitem_p.h @@ -61,14 +61,13 @@ class QQuickJumpListItem : public QObject { Q_OBJECT Q_PROPERTY(int __jumpListItemType READ type WRITE setType) - Q_ENUMS(JumpListItemType) - public: enum JumpListItemType { ItemTypeLink = 1, ItemTypeDestination = 2, ItemTypeSeparator = 3 }; + Q_ENUM(JumpListItemType) explicit QQuickJumpListItem(QObject *p = nullptr); ~QQuickJumpListItem(); diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h index fe461d1..ef2aece 100644 --- a/src/winextras/qwinfunctions.h +++ b/src/winextras/qwinfunctions.h @@ -131,10 +131,8 @@ namespace QtWin inline bool isWindowExcludedFromPeek(QWidget *window) { - if (!window->windowHandle()) - return false; - else - return isWindowExcludedFromPeek(window->windowHandle()); + auto handle = window->windowHandle(); + return handle && isWindowExcludedFromPeek(handle); } inline void setWindowDisallowPeek(QWidget *window, bool disallow) @@ -145,10 +143,8 @@ namespace QtWin inline bool isWindowPeekDisallowed(QWidget *window) { - if (!window->windowHandle()) - return false; - else - return isWindowPeekDisallowed(window->windowHandle()); + auto handle = window->windowHandle(); + return handle && isWindowPeekDisallowed(handle); } inline void setWindowFlip3DPolicy(QWidget *window, WindowFlip3DPolicy policy) |