mirror of
https://invent.kde.org/network/krfb
synced 2024-06-28 22:14:41 +00:00
Use QList directly
This commit is contained in:
parent
014ced6e67
commit
882447a1af
|
@ -81,7 +81,7 @@ void XdpEventHandler::handlePointer(int buttonMask, int x, int y)
|
||||||
|
|
||||||
if (buttonMask != data->buttonMask) {
|
if (buttonMask != data->buttonMask) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
QVector<int> buttons = { BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, 0, 0, 0, 0, BTN_SIDE, BTN_EXTRA };
|
QList<int> buttons = { BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, 0, 0, 0, 0, BTN_SIDE, BTN_EXTRA };
|
||||||
for (auto it = buttons.constBegin(); it != buttons.constEnd(); ++it) {
|
for (auto it = buttons.constBegin(); it != buttons.constEnd(); ++it) {
|
||||||
int prevButtonState = (data->buttonMask >> i) & 0x01;
|
int prevButtonState = (data->buttonMask >> i) & 0x01;
|
||||||
int currentButtonState = (buttonMask >> i) & 0x01;
|
int currentButtonState = (buttonMask >> i) & 0x01;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QSharedPointer>
|
#include <QSharedPointer>
|
||||||
#include <QVector>
|
#include <QList>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
struct zkde_screencast_unstable_v1;
|
struct zkde_screencast_unstable_v1;
|
||||||
|
|
|
@ -41,7 +41,7 @@ Q_GLOBAL_STATIC(EventsManagerStatic, eventsManagerStatic)
|
||||||
|
|
||||||
EventsManager::EventsManager()
|
EventsManager::EventsManager()
|
||||||
{
|
{
|
||||||
const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events"), {}, KPluginMetaData::AllowEmptyMetaData);
|
const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/events"), {}, KPluginMetaData::AllowEmptyMetaData);
|
||||||
for (const KPluginMetaData &data : plugins) {
|
for (const KPluginMetaData &data : plugins) {
|
||||||
const KPluginFactory::Result<EventsPlugin> result = KPluginFactory::instantiatePlugin<EventsPlugin>(data);
|
const KPluginFactory::Result<EventsPlugin> result = KPluginFactory::instantiatePlugin<EventsPlugin>(data);
|
||||||
if (result.plugin) {
|
if (result.plugin) {
|
||||||
|
|
|
@ -44,7 +44,7 @@ FrameBufferManager::FrameBufferManager()
|
||||||
const auto platformFilter = [] (const KPluginMetaData &pluginData) {
|
const auto platformFilter = [] (const KPluginMetaData &pluginData) {
|
||||||
return pluginData.value(QStringLiteral("X-KDE-OnlyShowOnQtPlatforms"), QStringList()).contains(QGuiApplication::platformName());
|
return pluginData.value(QStringLiteral("X-KDE-OnlyShowOnQtPlatforms"), QStringList()).contains(QGuiApplication::platformName());
|
||||||
};
|
};
|
||||||
const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), platformFilter, KPluginMetaData::AllowEmptyMetaData);
|
const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), platformFilter, KPluginMetaData::AllowEmptyMetaData);
|
||||||
for (const KPluginMetaData &data : plugins) {
|
for (const KPluginMetaData &data : plugins) {
|
||||||
const KPluginFactory::Result<FrameBufferPlugin> result = KPluginFactory::instantiatePlugin<FrameBufferPlugin>(data);
|
const KPluginFactory::Result<FrameBufferPlugin> result = KPluginFactory::instantiatePlugin<FrameBufferPlugin>(data);
|
||||||
if (result.plugin) {
|
if (result.plugin) {
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QSizePolicy>
|
#include <QSizePolicy>
|
||||||
#include <QVector>
|
#include <QList>
|
||||||
#include <QSet>
|
#include <QSet>
|
||||||
#include <QNetworkInterface>
|
#include <QNetworkInterface>
|
||||||
#include <QHostInfo>
|
#include <QHostInfo>
|
||||||
|
@ -82,7 +82,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
void fillFrameBuffersCombo() {
|
void fillFrameBuffersCombo() {
|
||||||
const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
|
const QList<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("krfb/framebuffer"), {}, KPluginMetaData::AllowEmptyMetaData);
|
||||||
for (const KPluginMetaData &metadata : plugins) {
|
for (const KPluginMetaData &metadata : plugins) {
|
||||||
cb_preferredFrameBufferPlugin->addItem(metadata.pluginId());
|
cb_preferredFrameBufferPlugin->addItem(metadata.pluginId());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user