From 4343a79ba43b42bc08a8e99ec2e8aec7d939c8da Mon Sep 17 00:00:00 2001 From: Filippo Gentile Date: Wed, 28 Feb 2024 19:35:55 +0100 Subject: [PATCH] Replace QVector with QList In Qt6 it's an alias --- panel/lxqtpanelapplication.cpp | 2 +- panel/lxqtpanellayout.cpp | 6 +++--- plugin-fancymenu/lxqtfancymenuappmap.cpp | 6 +++--- plugin-fancymenu/lxqtfancymenuappmap.h | 8 ++++---- plugin-fancymenu/lxqtfancymenuappmodel.cpp | 4 ++-- plugin-fancymenu/lxqtfancymenuappmodel.h | 4 ++-- plugin-taskbar/lxqttaskgroup.cpp | 2 +- plugin-tray/snidbus.h | 4 ++-- plugin-tray/xcbutils.h | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/panel/lxqtpanelapplication.cpp b/panel/lxqtpanelapplication.cpp index 22cd97d81..430ea6f35 100644 --- a/panel/lxqtpanelapplication.cpp +++ b/panel/lxqtpanelapplication.cpp @@ -47,7 +47,7 @@ LXQtPanelApplicationPrivate::LXQtPanelApplicationPrivate(LXQtPanelApplication *q ILXQtPanel::Position LXQtPanelApplicationPrivate::computeNewPanelPosition(const LXQtPanel *p, const int screenNum) { Q_Q(LXQtPanelApplication); - QVector screenPositions(4, false); // false means not occupied + QList screenPositions(4, false); // false means not occupied for (int i = 0; i < q->mPanels.size(); ++i) { if (p != q->mPanels.at(i)) { diff --git a/panel/lxqtpanellayout.cpp b/panel/lxqtpanellayout.cpp index d304c8e23..41b8b545b 100644 --- a/panel/lxqtpanellayout.cpp +++ b/panel/lxqtpanellayout.cpp @@ -156,7 +156,7 @@ class LayoutItemGrid void moveItem(int from, int to); private: - QVector mInfoItems; + QList mInfoItems; int mColCount; int mUsedColCount; int mRowCount; @@ -648,7 +648,7 @@ void LXQtPanelLayout::setGeometryHoriz(const QRect &geometry) } // Calc baselines for plugins like button. - QVector baseLines(qMax(mLeftGrid->colCount(), mRightGrid->colCount())); + QList baseLines(qMax(mLeftGrid->colCount(), mRightGrid->colCount())); const int bh = geometry.height() / baseLines.count(); const int base_center = bh >> 1; const int height_remain = 0 < bh ? geometry.height() % baseLines.size() : 0; @@ -787,7 +787,7 @@ void LXQtPanelLayout::setGeometryVert(const QRect &geometry) } // Calc baselines for plugins like button. - QVector baseLines(qMax(mLeftGrid->colCount(), mRightGrid->colCount())); + QList baseLines(qMax(mLeftGrid->colCount(), mRightGrid->colCount())); const int bw = geometry.width() / baseLines.count(); const int base_center = bw >> 1; const int width_remain = 0 < bw ? geometry.width() % baseLines.size() : 0; diff --git a/plugin-fancymenu/lxqtfancymenuappmap.cpp b/plugin-fancymenu/lxqtfancymenuappmap.cpp index aaa392e2d..905b56295 100644 --- a/plugin-fancymenu/lxqtfancymenuappmap.cpp +++ b/plugin-fancymenu/lxqtfancymenuappmap.cpp @@ -230,10 +230,10 @@ LXQtFancyMenuAppMap::AppItem *LXQtFancyMenuAppMap::getAppAt(int index) return *mCachedIterator; } -QVector LXQtFancyMenuAppMap::getMatchingApps(const QString &query) const +QList LXQtFancyMenuAppMap::getMatchingApps(const QString &query) const { - QVector byName; - QVector byKeyword; + QList byName; + QList byKeyword; //TODO: implement some kind of score to get better matches on top diff --git a/plugin-fancymenu/lxqtfancymenuappmap.h b/plugin-fancymenu/lxqtfancymenuappmap.h index 698e40be4..187b327e1 100644 --- a/plugin-fancymenu/lxqtfancymenuappmap.h +++ b/plugin-fancymenu/lxqtfancymenuappmap.h @@ -30,7 +30,7 @@ #define LXQTFANCYMENUAPPMAP_H #include -#include +#include #include #include @@ -74,7 +74,7 @@ class LXQtFancyMenuAppMap LXQtFancyMenuItemType type = LXQtFancyMenuItemType::AppItem; }; - QVector apps; + QList apps; LXQtFancyMenuItemType type; }; @@ -108,7 +108,7 @@ class LXQtFancyMenuAppMap AppItem *getAppAt(int index); - QVector getMatchingApps(const QString& query) const; + QList getMatchingApps(const QString& query) const; private: void parseMenu(const QDomElement& menu, const QString &topLevelCategory); @@ -121,7 +121,7 @@ class LXQtFancyMenuAppMap typedef QMap AppMap; AppMap mAppSortedByDesktopFile; AppMap mAppSortedByName; - QVector mCategories; + QList mCategories; // Cache sort by name map access AppMap::const_iterator mCachedIterator; diff --git a/plugin-fancymenu/lxqtfancymenuappmodel.cpp b/plugin-fancymenu/lxqtfancymenuappmodel.cpp index 0baa05ed9..f72b2de11 100644 --- a/plugin-fancymenu/lxqtfancymenuappmodel.cpp +++ b/plugin-fancymenu/lxqtfancymenuappmodel.cpp @@ -176,7 +176,7 @@ bool LXQtFancyMenuAppModel::dropMimeData(const QMimeData *data_, Qt::DropAction return false; // No-op // realRow is needed because beginMoveRows() behaves differenlty than - // QVector<...>::move() on index counting. + // QList<...>::move() on index counting. beginMoveRows(QModelIndex(), oldRow, oldRow, QModelIndex(), realRow); mAppMap->moveFavoriteItem(oldRow, row); @@ -208,7 +208,7 @@ void LXQtFancyMenuAppModel::setCurrentCategory(int category) endResetModel(); } -void LXQtFancyMenuAppModel::showSearchResults(const QVector &matches) +void LXQtFancyMenuAppModel::showSearchResults(const QList &matches) { beginResetModel(); mSearchMatches = matches; diff --git a/plugin-fancymenu/lxqtfancymenuappmodel.h b/plugin-fancymenu/lxqtfancymenuappmodel.h index def2328d9..6b50cfbd4 100644 --- a/plugin-fancymenu/lxqtfancymenuappmodel.h +++ b/plugin-fancymenu/lxqtfancymenuappmodel.h @@ -59,7 +59,7 @@ class LXQtFancyMenuAppModel : public QAbstractListModel void reloadAppMap(bool end); void setCurrentCategory(int category); - void showSearchResults(const QVector &matches); + void showSearchResults(const QList &matches); void endSearch(); LXQtFancyMenuAppMap *appMap() const; @@ -77,7 +77,7 @@ class LXQtFancyMenuAppModel : public QAbstractListModel LXQtFancyMenuAppMap *mAppMap; int mCurrentCategory; - QVector mSearchMatches; + QList mSearchMatches; bool mInSearch; }; diff --git a/plugin-taskbar/lxqttaskgroup.cpp b/plugin-taskbar/lxqttaskgroup.cpp index 1af953ba7..4735764bd 100644 --- a/plugin-taskbar/lxqttaskgroup.cpp +++ b/plugin-taskbar/lxqttaskgroup.cpp @@ -620,7 +620,7 @@ void LXQtTaskGroup::wheelEvent(QWheelEvent* event) bool LXQtTaskGroup::onWindowChanged(WId window, NET::Properties prop, NET::Properties2 prop2) { // returns true if the class is preserved bool needsRefreshVisibility{false}; - QVector buttons; + QList buttons; if (mButtonHash.contains(window)) buttons.append(mButtonHash.value(window)); diff --git a/plugin-tray/snidbus.h b/plugin-tray/snidbus.h index f05a7465d..2ee79821d 100644 --- a/plugin-tray/snidbus.h +++ b/plugin-tray/snidbus.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include // Custom message type for DBus struct KDbusImageStruct { @@ -41,7 +41,7 @@ struct KDbusImageStruct { QByteArray data; }; -typedef QVector KDbusImageVector; +typedef QList KDbusImageVector; struct KDbusToolTipStruct { QString icon; diff --git a/plugin-tray/xcbutils.h b/plugin-tray/xcbutils.h index d5a471e0e..497aa8c84 100644 --- a/plugin-tray/xcbutils.h +++ b/plugin-tray/xcbutils.h @@ -36,7 +36,7 @@ #include #include -#include +#include /** XEMBED messages */ #define XEMBED_EMBEDDED_NOTIFY 0