diff options
Diffstat (limited to 'src/widgets/util/qsystemtrayicon_x11.cpp')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 52 |
1 files changed, 9 insertions, 43 deletions
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 86c11f98ed..2983dc6646 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtwidgetsglobal.h" #if QT_CONFIG(label) @@ -66,6 +30,8 @@ #ifndef QT_NO_SYSTEMTRAYICON QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static inline unsigned long locateSystemTray() { return (unsigned long)QGuiApplication::platformNativeInterface()->nativeResourceForScreen(QByteArrayLiteral("traywindow"), QGuiApplication::primaryScreen()); @@ -120,12 +86,12 @@ QRect QSystemTrayIconSys::globalGeometry() const void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev) { - QPoint globalPos = ev->globalPos(); + QPoint globalPos = ev->globalPosition().toPoint(); #ifndef QT_NO_CONTEXTMENU if (ev->button() == Qt::RightButton && q->contextMenu()) q->contextMenu()->popup(globalPos); #else - Q_UNUSED(globalPos) + Q_UNUSED(globalPos); #endif // QT_NO_CONTEXTMENU if (QBalloonTip::isBalloonVisible()) { @@ -137,7 +103,7 @@ void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev) emit q->activated(QSystemTrayIcon::Trigger); else if (ev->button() == Qt::RightButton) emit q->activated(QSystemTrayIcon::Context); - else if (ev->button() == Qt::MidButton) + else if (ev->button() == Qt::MiddleButton) emit q->activated(QSystemTrayIcon::MiddleClick); } @@ -308,7 +274,7 @@ void QSystemTrayIconPrivate::updateToolTip_sys() } if (!sys) return; -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) sys->setToolTip(toolTip); #endif } @@ -321,7 +287,7 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior const QString platform = QGuiApplication::platformName(); - if (platform.compare(QLatin1String("xcb"), Qt::CaseInsensitive) == 0) + if (platform.compare("xcb"_L1, Qt::CaseInsensitive) == 0) return locateSystemTray(); return false; } |