diff options
Diffstat (limited to 'tests/manual/x11vkbtest/memorymonitor.h')
| -rw-r--r-- | tests/manual/x11vkbtest/memorymonitor.h | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/tests/manual/x11vkbtest/memorymonitor.h b/tests/manual/x11vkbtest/memorymonitor.h index 01239383..47c8566d 100644 --- a/tests/manual/x11vkbtest/memorymonitor.h +++ b/tests/manual/x11vkbtest/memorymonitor.h @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef MEMORYMONITOR_H #define MEMORYMONITOR_H @@ -33,12 +7,10 @@ #include <QtCharts/QChart> #include <QtCore/QTimer> -QT_CHARTS_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QSplineSeries; class QValueAxis; -QT_CHARTS_END_NAMESPACE - -QT_CHARTS_USE_NAMESPACE +QT_END_NAMESPACE class QMainWindow; @@ -46,7 +18,7 @@ class MemoryMonitor : public QChart { Q_OBJECT public: - explicit MemoryMonitor(QMainWindow &window, QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = nullptr); + explicit MemoryMonitor(QMainWindow &window, QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~MemoryMonitor(); public: |