From b8a6fd7c4678c948fe5936e393168442933b3b00 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 19 Sep 2019 18:16:14 +0300 Subject: [PATCH] Don't initialize QFlags with nullptr Summary: This looks very odd. Test Plan: Compiles. Reviewers: #kwin, romangg Reviewed By: #kwin, romangg Subscribers: apol, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D24086 --- client.cpp | 4 ++-- effects/desktopgrid/desktopgrid_config.cpp | 2 +- effects/trackmouse/trackmouse.cpp | 2 +- events.cpp | 2 +- geometry.cpp | 2 +- group.cpp | 2 +- kcmkwin/kwinrules/ruleswidget.cpp | 2 +- manage.cpp | 2 +- utils.cpp | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client.cpp b/client.cpp index 873522efe0..d2fc36817b 100644 --- a/client.cpp +++ b/client.cpp @@ -116,7 +116,7 @@ Client::Client() , m_killHelperPID(0) , m_pingTimestamp(XCB_TIME_CURRENT_TIME) , m_userTime(XCB_TIME_CURRENT_TIME) // Not known yet - , allowed_actions(nullptr) + , allowed_actions() , shade_geometry_change(false) , sm_stacking_order(-1) , activitiesDefined(false) @@ -1768,7 +1768,7 @@ void Client::updateAllowedActions(bool force) if (!isManaged() && !force) return; NET::Actions old_allowed_actions = NET::Actions(allowed_actions); - allowed_actions = nullptr; + allowed_actions = NET::Actions(); if (isMovable()) allowed_actions |= NET::ActionMove; if (isResizable()) diff --git a/effects/desktopgrid/desktopgrid_config.cpp b/effects/desktopgrid/desktopgrid_config.cpp index ab5525d8fe..3bf771cfee 100644 --- a/effects/desktopgrid/desktopgrid_config.cpp +++ b/effects/desktopgrid/desktopgrid_config.cpp @@ -73,7 +73,7 @@ DesktopGridEffectConfig::DesktopGridEffectConfig(QWidget* parent, const QVariant m_ui->shortcutEditor->addCollection(m_actionCollection); - m_ui->desktopNameAlignmentCombo->addItem(i18nc("Desktop name alignment:", "Disabled"), QVariant(Qt::Alignment(nullptr))); + m_ui->desktopNameAlignmentCombo->addItem(i18nc("Desktop name alignment:", "Disabled"), QVariant(Qt::Alignment())); m_ui->desktopNameAlignmentCombo->addItem(i18n("Top"), QVariant(Qt::AlignHCenter | Qt::AlignTop)); m_ui->desktopNameAlignmentCombo->addItem(i18n("Top-Right"), QVariant(Qt::AlignRight | Qt::AlignTop)); m_ui->desktopNameAlignmentCombo->addItem(i18n("Right"), QVariant(Qt::AlignRight | Qt::AlignVCenter)); diff --git a/effects/trackmouse/trackmouse.cpp b/effects/trackmouse/trackmouse.cpp index e84728d98b..fb02e54259 100644 --- a/effects/trackmouse/trackmouse.cpp +++ b/effects/trackmouse/trackmouse.cpp @@ -83,7 +83,7 @@ TrackMouseEffect::~TrackMouseEffect() void TrackMouseEffect::reconfigure(ReconfigureFlags) { - m_modifiers = nullptr; + m_modifiers = Qt::KeyboardModifiers(); TrackMouseConfig::self()->read(); if (TrackMouseConfig::shift()) m_modifiers |= Qt::ShiftModifier; diff --git a/events.cpp b/events.cpp index 54d812c511..b49e6008ca 100644 --- a/events.cpp +++ b/events.cpp @@ -444,7 +444,7 @@ bool Client::windowEvent(xcb_generic_event_t *e) emit opacityChanged(this, old_opacity); } else { // forward to the frame if there's possibly another compositing manager running - NETWinInfo i(connection(), frameId(), rootWindow(), nullptr, nullptr); + NETWinInfo i(connection(), frameId(), rootWindow(), NET::Properties(), NET::Properties2()); i.setOpacity(info->opacity()); } } diff --git a/geometry.cpp b/geometry.cpp index 7164e6b4f8..e517ac9981 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -894,7 +894,7 @@ void Workspace::setMoveResizeClient(AbstractClient *c) // (the property with the size of the frame remains on the window after the crash). void Workspace::fixPositionAfterCrash(xcb_window_t w, const xcb_get_geometry_reply_t *geometry) { - NETWinInfo i(connection(), w, rootWindow(), NET::WMFrameExtents, nullptr); + NETWinInfo i(connection(), w, rootWindow(), NET::WMFrameExtents, NET::Properties2()); NETStrut frame = i.frameExtents(); if (frame.left != 0 || frame.top != 0) { diff --git a/group.cpp b/group.cpp index 44d3821c8e..8df0a51888 100644 --- a/group.cpp +++ b/group.cpp @@ -60,7 +60,7 @@ Group::Group(xcb_window_t leader_P) if (leader_P != XCB_WINDOW_NONE) { leader_client = workspace()->findClient(Predicate::WindowMatch, leader_P); leader_info = new NETWinInfo(connection(), leader_P, rootWindow(), - nullptr, NET::WM2StartupId); + NET::Properties(), NET::WM2StartupId); } effect_group = new EffectWindowGroupImpl(this); workspace()->addGroup(this); diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp index b6029a9e78..0a7c8a0e47 100644 --- a/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kcmkwin/kwinrules/ruleswidget.cpp @@ -586,7 +586,7 @@ Rules* RulesWidget::rules() const rules->wmclassmatch = static_cast< Rules::StringMatch >(wmclass_match->currentIndex()); rules->windowrole = role->text().toUtf8(); rules->windowrolematch = static_cast< Rules::StringMatch >(role_match->currentIndex()); - rules->types = nullptr; + rules->types = {}; bool all_types = true; for (int i = 0; i < types->count(); diff --git a/manage.cpp b/manage.cpp index 31cc30910a..beb8a52a0f 100644 --- a/manage.cpp +++ b/manage.cpp @@ -606,7 +606,7 @@ bool Client::manage(xcb_window_t w, bool isMapped) if (opacity() == 1.0) { return; } - NETWinInfo info(connection(), frameId(), rootWindow(), nullptr, nullptr); + NETWinInfo info(connection(), frameId(), rootWindow(), NET::Properties(), NET::Properties2()); info.setOpacity(static_cast(opacity() * 0xffffffff)); } ); diff --git a/utils.cpp b/utils.cpp index b28330fbbe..53864a34d1 100644 --- a/utils.cpp +++ b/utils.cpp @@ -172,7 +172,7 @@ Qt::MouseButton x11ToQtMouseButton(int button) Qt::MouseButtons x11ToQtMouseButtons(int state) { - Qt::MouseButtons ret = nullptr; + Qt::MouseButtons ret = {}; if (state & XCB_KEY_BUT_MASK_BUTTON_1) ret |= Qt::LeftButton; if (state & XCB_KEY_BUT_MASK_BUTTON_2) @@ -188,7 +188,7 @@ Qt::MouseButtons x11ToQtMouseButtons(int state) Qt::KeyboardModifiers x11ToQtKeyboardModifiers(int state) { - Qt::KeyboardModifiers ret = nullptr; + Qt::KeyboardModifiers ret = {}; if (state & XCB_KEY_BUT_MASK_SHIFT) ret |= Qt::ShiftModifier; if (state & XCB_KEY_BUT_MASK_CONTROL)