diff options
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbxsettings.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbxsettings.cpp | 74 |
1 files changed, 39 insertions, 35 deletions
diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp index effdbf7334..899dc0158a 100644 --- a/src/plugins/platforms/xcb/qxcbxsettings.cpp +++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** 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. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** 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$ ** @@ -36,6 +42,9 @@ #include <QtCore/QByteArray> #include <QtCore/QtEndian> +#include <vector> +#include <algorithm> + #ifdef XCB_USE_XLIB #include <X11/extensions/XIproto.h> #endif //XCB_USE_XLIB @@ -49,9 +58,8 @@ enum XSettingsType { XSettingsTypeColor = 2 }; -class QXcbXSettingsCallback +struct QXcbXSettingsCallback { -public: QXcbXSettings::PropertyChangeFunc func; void *handle; }; @@ -69,23 +77,19 @@ public: return; this->value = value; this->last_change_serial = last_change_serial; - QLinkedList<QXcbXSettingsCallback>::const_iterator it = callback_links.begin(); - for (;it != callback_links.end();++it) { - it->func(screen,name,value,it->handle); - } + for (const auto &callback : callback_links) + callback.func(screen, name, value, callback.handle); } void addCallback(QXcbXSettings::PropertyChangeFunc func, void *handle) { - QXcbXSettingsCallback callback; - callback.func = func; - callback.handle = handle; - callback_links.append(callback); + QXcbXSettingsCallback callback = { func, handle }; + callback_links.push_back(callback); } QVariant value; int last_change_serial; - QLinkedList<QXcbXSettingsCallback> callback_links; + std::vector<QXcbXSettingsCallback> callback_links; }; @@ -119,8 +123,9 @@ public: if (!reply) return settings; - settings += QByteArray((const char *)xcb_get_property_value(reply), xcb_get_property_value_length(reply)); - offset += xcb_get_property_value_length(reply); + const auto property_value_length = xcb_get_property_value_length(reply); + settings.append(static_cast<const char *>(xcb_get_property_value(reply)), property_value_length); + offset += property_value_length; more = reply->bytes_after != 0; free(reply); @@ -299,14 +304,13 @@ void QXcbXSettings::registerCallbackForProperty(const QByteArray &property, QXcb void QXcbXSettings::removeCallbackForHandle(const QByteArray &property, void *handle) { Q_D(QXcbXSettings); - QXcbXSettingsPropertyValue &value = d->settings[property]; - QLinkedList<QXcbXSettingsCallback>::iterator it = value.callback_links.begin(); - while (it != value.callback_links.end()) { - if (it->handle == handle) - it = value.callback_links.erase(it); - else - ++it; - } + auto &callbacks = d->settings[property].callback_links; + + auto isCallbackForHandle = [handle](const QXcbXSettingsCallback &cb) { return cb.handle == handle; }; + + callbacks.erase(std::remove_if(callbacks.begin(), callbacks.end(), + isCallbackForHandle), + callbacks.end()); } void QXcbXSettings::removeCallbackForHandle(void *handle) |