diff --git a/app/layout/centrallayout.cpp b/app/layout/centrallayout.cpp index caa2211e2..d93bce57d 100644 --- a/app/layout/centrallayout.cpp +++ b/app/layout/centrallayout.cpp @@ -445,10 +445,10 @@ QList CentralLayout::freeEdges(int screen) const return edges; } -Types::ViewType CentralLayout::latteViewType(int containmentId) const +Types::ViewType CentralLayout::latteViewType(uint containmentId) const { for (const auto view : m_latteViews) { - if (view->containment() && view->containment()->id() == containmentId) { + if (view->containment() && view->containment()->id() == (uint)containmentId) { return view->type(); } } diff --git a/app/layout/centrallayout.h b/app/layout/centrallayout.h index c578481be..557d4d98c 100644 --- a/app/layout/centrallayout.h +++ b/app/layout/centrallayout.h @@ -71,12 +71,12 @@ public: void setSharedLayout(SharedLayout *layout); //! OVERRIDE GeneralLayout implementations - void addView(Plasma::Containment *containment, bool forceOnPrimary = false, int explicitScreen = -1, Layout::ViewsMap *occupied = nullptr); + void addView(Plasma::Containment *containment, bool forceOnPrimary = false, int explicitScreen = -1, Layout::ViewsMap *occupied = nullptr) override; void syncLatteViewsToScreens(Layout::ViewsMap *occupiedMap = nullptr) override; void unloadContainments() override; bool configViewIsShown() const override; const QStringList appliedActivities() override; - Types::ViewType latteViewType(int containmentId) const override; + Types::ViewType latteViewType(uint containmentId) const override; QList latteViews() override; int viewsCount(int screen) const override; diff --git a/app/layout/genericlayout.cpp b/app/layout/genericlayout.cpp index f14cab975..8d57009e5 100644 --- a/app/layout/genericlayout.cpp +++ b/app/layout/genericlayout.cpp @@ -323,7 +323,7 @@ Latte::Corona *GenericLayout::corona() return m_corona; } -Types::ViewType GenericLayout::latteViewType(int containmentId) const +Types::ViewType GenericLayout::latteViewType(uint containmentId) const { for (const auto view : m_latteViews) { if (view->containment() && view->containment()->id() == containmentId) { @@ -580,7 +580,7 @@ QList GenericLayout::viewsWithPlasmaShortcuts() return views; } - QList appletsWithShortcuts = m_corona->globalShortcuts()->shortcutsTracker()->appletsWithPlasmaShortcuts(); + QList appletsWithShortcuts = m_corona->globalShortcuts()->shortcutsTracker()->appletsWithPlasmaShortcuts(); for (const auto &appletId : appletsWithShortcuts) { for (const auto view : m_latteViews) { diff --git a/app/layout/genericlayout.h b/app/layout/genericlayout.h index a3a534ffa..2763779a7 100644 --- a/app/layout/genericlayout.h +++ b/app/layout/genericlayout.h @@ -99,7 +99,7 @@ public: QStringList unloadedContainmentsIds(); - virtual Types::ViewType latteViewType(int containmentId) const; + virtual Types::ViewType latteViewType(uint containmentId) const; const QList *containments(); Latte::View *highestPriorityView(); diff --git a/app/layout/sharedlayout.h b/app/layout/sharedlayout.h index ce04712e7..a3a5867a8 100644 --- a/app/layout/sharedlayout.h +++ b/app/layout/sharedlayout.h @@ -48,7 +48,7 @@ public: SharedLayout(CentralLayout *assigned, QObject *parent, QString layoutFile, QString layoutName = QString()); ~SharedLayout() override; - const QStringList appliedActivities(); + const QStringList appliedActivities() override; CentralLayout *currentCentralLayout() const; //! OVERRIDE GeneralLayout implementations diff --git a/app/layout/storage.cpp b/app/layout/storage.cpp index d7e4877e0..ce8416e37 100644 --- a/app/layout/storage.cpp +++ b/app/layout/storage.cpp @@ -204,7 +204,7 @@ void Storage::copyView(Plasma::Containment *containment) //!investigate if there multiple systray(s) in the containment to copy also //! systrayId, systrayAppletId - QHash systraysInfo; + QHash systraysInfo; auto applets = containment->config().group("Applets"); for (const auto &applet : applets.groupList()) { diff --git a/app/layouts/importer.cpp b/app/layouts/importer.cpp index bfe2c86cf..af74d44e9 100644 --- a/app/layouts/importer.cpp +++ b/app/layouts/importer.cpp @@ -475,7 +475,7 @@ Importer::LatteFileVersion Importer::fileVersion(QString file) version2LatteDir = true; } - if (version1applets && version1applets) { + if (version1applets) { return ConfigVersion1; } else if (version2rc && version2LatteDir) { return ConfigVersion2; diff --git a/app/layouts/launcherssignals.cpp b/app/layouts/launcherssignals.cpp index c63b19d79..e9bc9cc7b 100644 --- a/app/layouts/launcherssignals.cpp +++ b/app/layouts/launcherssignals.cpp @@ -242,7 +242,7 @@ void LaunchersSignals::urlsDropped(QString layoutName, int launcherGroup, QStrin } } -void LaunchersSignals::moveTask(QString layoutName, int senderId, int launcherGroup, int from, int to) +void LaunchersSignals::moveTask(QString layoutName, uint senderId, int launcherGroup, int from, int to) { Types::LaunchersGroup group = static_cast(launcherGroup); @@ -278,7 +278,7 @@ void LaunchersSignals::moveTask(QString layoutName, int senderId, int launcherGr } } -void LaunchersSignals::validateLaunchersOrder(QString layoutName, int senderId, int launcherGroup, QStringList launchers) +void LaunchersSignals::validateLaunchersOrder(QString layoutName, uint senderId, int launcherGroup, QStringList launchers) { Types::LaunchersGroup group = static_cast(launcherGroup); diff --git a/app/layouts/launcherssignals.h b/app/layouts/launcherssignals.h index 78eb284b5..00d3df53c 100644 --- a/app/layouts/launcherssignals.h +++ b/app/layouts/launcherssignals.h @@ -61,8 +61,8 @@ public slots: Q_INVOKABLE void removeLauncherFromActivity(QString layoutName, int launcherGroup, QString launcher, QString activity); Q_INVOKABLE void urlsDropped(QString layoutName, int launcherGroup, QStringList urls); //!Deprecated because it could create crashes, validateLaunchersOrder provides a better approach - Q_INVOKABLE void moveTask(QString layoutName, int senderId, int launcherGroup, int from, int to); - Q_INVOKABLE void validateLaunchersOrder(QString layoutName, int senderId, int launcherGroup, QStringList launchers); + Q_INVOKABLE void moveTask(QString layoutName, uint senderId, int launcherGroup, int from, int to); + Q_INVOKABLE void validateLaunchersOrder(QString layoutName, uint senderId, int launcherGroup, QStringList launchers); private: QList lattePlasmoids(QString layoutName); diff --git a/app/settings/delegates/activitiesdelegate.cpp b/app/settings/delegates/activitiesdelegate.cpp index 95cfade36..41a9eac69 100644 --- a/app/settings/delegates/activitiesdelegate.cpp +++ b/app/settings/delegates/activitiesdelegate.cpp @@ -71,8 +71,7 @@ QWidget *Activities::createEditor(QWidget *parent, const QStyleOptionViewItem &o QStringList allActivities = index.data(Model::Layouts::ALLACTIVITIESROLE).toStringList(); QStringList assignedActivities = index.data(Qt::UserRole).toStringList(); - for (unsigned int i = 0; i < allActivities.count(); ++i) { - + for (int i = 0; i < allActivities.count(); ++i) { if (allActivities[i] == Model::Layouts::FREEACTIVITIESID) { bool isFreeActivitiesChecked = assignedActivities.contains(Model::Layouts::FREEACTIVITIESID); diff --git a/app/shortcuts/shortcutstracker.cpp b/app/shortcuts/shortcutstracker.cpp index 38824f895..be6ef8d48 100644 --- a/app/shortcuts/shortcutstracker.cpp +++ b/app/shortcuts/shortcutstracker.cpp @@ -85,7 +85,7 @@ void ShortcutsTracker::shortcutsFileChanged(const QString &file) parseGlobalShortcuts(); } -QList ShortcutsTracker::appletsWithPlasmaShortcuts() +QList ShortcutsTracker::appletsWithPlasmaShortcuts() { return m_appletShortcuts.keys(); } diff --git a/app/shortcuts/shortcutstracker.h b/app/shortcuts/shortcutstracker.h index 78c0b3aa5..ae2601a7a 100644 --- a/app/shortcuts/shortcutstracker.h +++ b/app/shortcuts/shortcutstracker.h @@ -44,7 +44,7 @@ public: QStringList badgesForActivate() const; - QList appletsWithPlasmaShortcuts(); + QList appletsWithPlasmaShortcuts(); public slots: Q_INVOKABLE QString appletShortcutBadge(int appletId); @@ -69,7 +69,7 @@ private: //! shortcuts assigned to applets through plasma infrastructure //! - QHash m_appletShortcuts; + QHash m_appletShortcuts; KSharedConfig::Ptr m_shortcutsConfigPtr; }; diff --git a/app/view/containmentinterface.cpp b/app/view/containmentinterface.cpp index 8480387e4..dab5e2f73 100644 --- a/app/view/containmentinterface.cpp +++ b/app/view/containmentinterface.cpp @@ -87,7 +87,7 @@ bool ContainmentInterface::applicationLauncherHasGlobalShortcut() const return false; } - int launcherAppletId = applicationLauncherId(); + uint launcherAppletId = applicationLauncherId(); const auto applets = m_view->containment()->applets(); @@ -106,7 +106,7 @@ bool ContainmentInterface::applicationLauncherInPopup() const return false; } - int launcherAppletId = applicationLauncherId(); + uint launcherAppletId = applicationLauncherId(); QString launcherPluginId; const auto applets = m_view->containment()->applets(); diff --git a/app/view/view.cpp b/app/view/view.cpp index 74c561596..92fb41590 100644 --- a/app/view/view.cpp +++ b/app/view/view.cpp @@ -1378,7 +1378,7 @@ bool View::appletIsExpandable(const int id) } for (const auto applet : containment()->applets()) { - if (applet->id() == id) { + if (applet->id() == (uint)id) { PlasmaQuick::AppletQuickItem *ai = applet->property("_plasma_graphicObject").value(); if (ai) { @@ -1397,7 +1397,7 @@ bool View::appletIsExpanded(const int id) } for (const auto applet : containment()->applets()) { - if (applet->id() == id) { + if (applet->id() == (uint)id) { PlasmaQuick::AppletQuickItem *ai = applet->property("_plasma_graphicObject").value(); if (ai) { @@ -1416,7 +1416,7 @@ void View::toggleAppletExpanded(const int id) } for (const auto applet : containment()->applets()) { - if (applet->id() == id) { + if (applet->id() == (uint)id) { PlasmaQuick::AppletQuickItem *ai = applet->property("_plasma_graphicObject").value(); if (ai) { diff --git a/app/wm/waylandinterface.h b/app/wm/waylandinterface.h index ce9550451..1d0d1616d 100644 --- a/app/wm/waylandinterface.h +++ b/app/wm/waylandinterface.h @@ -87,7 +87,7 @@ public: bool windowCanBeDragged(WindowId wid) const override; bool windowCanBeMaximized(WindowId wid) const override; - QIcon iconFor(WindowId wid) const; + QIcon iconFor(WindowId wid) const override; WindowId winIdFor(QString appId, QRect geometry) const override; WindowId winIdFor(QString appId, QString title) const override; diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp index dd731c1d3..32eca6961 100644 --- a/app/wm/xwindowinterface.cpp +++ b/app/wm/xwindowinterface.cpp @@ -93,10 +93,6 @@ void XWindowInterface::setViewExtraFlags(QObject *view,bool isPanelWindow, Latte } } - if (winId < 0) { - return; - } - NETWinInfo winfo(QX11Info::connection() , static_cast(winId) , static_cast(winId)