From d721dcd56008bcafbecaeb6347b5fb0cc0069cb1 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Tue, 23 Jan 2018 18:14:17 +0100 Subject: [PATCH] Prefer prefer QVector over QList --- .../workers/launcher/applauncherwidget.cpp | 10 ++--- .../workers/launcher/applauncherwidget.h | 4 +- src/config/buttonlistview.h | 2 +- src/main.cpp | 2 +- src/utils/confighandler.cpp | 40 +++++++++---------- src/utils/confighandler.h | 12 +++--- src/utils/desktopfileparse.cpp | 8 ++-- src/utils/desktopfileparse.h | 6 +-- src/utils/systemnotification.cpp | 2 +- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/capture/workers/launcher/applauncherwidget.cpp b/src/capture/workers/launcher/applauncherwidget.cpp index 438f3531..d20ded44 100644 --- a/src/capture/workers/launcher/applauncherwidget.cpp +++ b/src/capture/workers/launcher/applauncherwidget.cpp @@ -134,14 +134,14 @@ void AppLauncherWidget::searchChanged(const QString &text) { m_filterList->show(); m_filterList->clear(); QRegExp regexp(text, Qt::CaseInsensitive, QRegExp::Wildcard); - QList apps; + QVector apps; for (auto const& i : catIconNames.toStdMap()) { const QString &cat = i.first; if (!m_appsMap.contains(cat)) { continue; } - const QList &appList = m_appsMap[cat]; + const QVector &appList = m_appsMap[cat]; for (const DesktopAppData &app: appList) { if (!apps.contains(app) && (app.name.contains(regexp) || app.description.contains(regexp) )) @@ -170,7 +170,7 @@ void AppLauncherWidget::initListWidget() { QListWidget *itemsWidget = new QListWidget(); configureListView(itemsWidget); - const QList &appList = m_appsMap[cat]; + const QVector &appList = m_appsMap[cat]; addAppsToListWidget(itemsWidget, appList); m_tabWidget->addTab(itemsWidget, QIcon::fromTheme(iconName), ""); @@ -197,7 +197,7 @@ void AppLauncherWidget::initAppMap() { m_appsMap = m_parser.getAppsByCategory(categories); // Unify multimedia. - QList multimediaList; + QVector multimediaList; QStringList multimediaNames; multimediaNames << "AudioVideo" << "Audio" << "Video"; for (const QString &name : multimediaNames) { @@ -227,7 +227,7 @@ void AppLauncherWidget::configureListView(QListWidget *widget) { } void AppLauncherWidget::addAppsToListWidget( - QListWidget *widget, const QList &appList) + QListWidget *widget, const QVector &appList) { for (const DesktopAppData &app: appList) { QListWidgetItem *buttonItem = new QListWidgetItem(widget); diff --git a/src/capture/workers/launcher/applauncherwidget.h b/src/capture/workers/launcher/applauncherwidget.h index bb785752..bdb375ce 100644 --- a/src/capture/workers/launcher/applauncherwidget.h +++ b/src/capture/workers/launcher/applauncherwidget.h @@ -43,13 +43,13 @@ private: void initAppMap(); void configureListView(QListWidget *widget); void addAppsToListWidget(QListWidget *widget, - const QList &appList); + const QVector &appList); DesktopFileParser m_parser; QPixmap m_pixmap; QString m_tempFile; bool m_keepOpen; - QMap> m_appsMap; + QMap> m_appsMap; QCheckBox *m_keepOpenCheckbox; QCheckBox *m_terminalCheckbox; QVBoxLayout *m_layout; diff --git a/src/config/buttonlistview.h b/src/config/buttonlistview.h index 6dfd4424..5ae1f19c 100644 --- a/src/config/buttonlistview.h +++ b/src/config/buttonlistview.h @@ -35,7 +35,7 @@ protected: void initButtonList(); private: - QList m_listButtons; + QVector m_listButtons; QMap m_buttonTypeByName; void updateActiveButtons(QListWidgetItem *); diff --git a/src/main.cpp b/src/main.cpp index a86167a2..116cd75e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { // required for the button serialization - qRegisterMetaTypeStreamOperators >("QList"); + qRegisterMetaTypeStreamOperators >("QVector"); qApp->setApplicationVersion(static_cast(APP_VERSION)); QTranslator translator; diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 277bb6b0..cc1f0448 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -25,23 +25,23 @@ ConfigHandler::ConfigHandler(){ m_settings.setDefaultFormat(QSettings::IniFormat); } -QList ConfigHandler::getButtons() { - QList buttons; +QVector ConfigHandler::getButtons() { + QVector buttons; if (m_settings.contains("buttons")) { - QList buttonsInt = m_settings.value("buttons").value >(); + QVector buttonsInt = m_settings.value("buttons").value >(); bool modified = normalizeButtons(buttonsInt); if (modified) { m_settings.setValue("buttons", QVariant::fromValue(buttonsInt)); } buttons = fromIntToButton(buttonsInt); } else { - buttons = CaptureButton::getIterableButtonTypes().toList(); + buttons = CaptureButton::getIterableButtonTypes(); } return buttons; } -void ConfigHandler::setButtons(const QList &buttons) { - QList l = fromButtonToInt(buttons); +void ConfigHandler::setButtons(const QVector &buttons) { + QVector l = fromButtonToInt(buttons); normalizeButtons(l); m_settings.setValue("buttons", QVariant::fromValue(l)); } @@ -210,7 +210,7 @@ void ConfigHandler::setDefaults() { } void ConfigHandler::setAllTheButtons() { - QList buttons; + QVector buttons; auto listTypes = CaptureButton::getIterableButtonTypes(); for (const CaptureButton::ButtonType t: listTypes) { buttons << static_cast(t); @@ -222,16 +222,16 @@ QString ConfigHandler::configFilePath() const { return m_settings.fileName(); } -bool ConfigHandler::normalizeButtons(QList &buttons) { +bool ConfigHandler::normalizeButtons(QVector &buttons) { auto listTypes = CaptureButton::getIterableButtonTypes(); - QList listTypesInt; - for(auto i: listTypes) listTypesInt << static_cast(i); + QVector listTypesInt; + for(auto i: listTypes) + listTypesInt << static_cast(i); bool hasChanged = false; - QMutableListIterator i(buttons); - while (i.hasNext()) { - if (!listTypesInt.contains(i.next())) { - i.remove(); + for (int i = 0; i < buttons.size(); i++) { + if (!listTypesInt.contains(buttons.at(i))) { + buttons.remove(i); hasChanged = true; } } @@ -242,19 +242,19 @@ bool ConfigHandler::normalizeButtons(QList &buttons) { return hasChanged; } -QList ConfigHandler::fromIntToButton( - const QList &l) +QVector ConfigHandler::fromIntToButton( + const QVector &l) { - QList buttons; + QVector buttons; for (auto const i: l) buttons << static_cast(i); return buttons; } -QList ConfigHandler::fromButtonToInt( - const QList &l) +QVector ConfigHandler::fromButtonToInt( + const QVector &l) { - QList buttons; + QVector buttons; for (auto const i: l) buttons << static_cast(i); return buttons; diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h index b1e6658c..97d12ab2 100644 --- a/src/utils/confighandler.h +++ b/src/utils/confighandler.h @@ -18,7 +18,7 @@ #pragma once #include "src/capture/widget/capturebutton.h" -#include +#include #include class ConfigHandler @@ -26,8 +26,8 @@ class ConfigHandler public: explicit ConfigHandler(); - QList getButtons(); - void setButtons(const QList &); + QVector getButtons(); + void setButtons(const QVector &); QString savePathValue(); void setSavePath(const QString &); @@ -73,9 +73,9 @@ public: private: QSettings m_settings; - bool normalizeButtons(QList &); + bool normalizeButtons(QVector &); - QList fromIntToButton(const QList &l); - QList fromButtonToInt(const QList &l); + QVector fromIntToButton(const QVector &l); + QVector fromButtonToInt(const QVector &l); }; diff --git a/src/utils/desktopfileparse.cpp b/src/utils/desktopfileparse.cpp index 042a4050..5096cb4a 100644 --- a/src/utils/desktopfileparse.cpp +++ b/src/utils/desktopfileparse.cpp @@ -127,8 +127,8 @@ int DesktopFileParser::processDirectory(const QDir &dir) { return m_appList.length() - length; } -QList DesktopFileParser::getAppsByCategory(const QString &category) { - QList res; +QVector DesktopFileParser::getAppsByCategory(const QString &category) { + QVector res; for (const DesktopAppData &app : m_appList) { if (app.categories.contains(category)) { res.append(app); @@ -137,10 +137,10 @@ QList DesktopFileParser::getAppsByCategory(const QString &catego return res; } -QMap> DesktopFileParser::getAppsByCategory( +QMap> DesktopFileParser::getAppsByCategory( const QStringList &categories) { - QMap> res; + QMap> res; for (const DesktopAppData &app : m_appList) { for (const QString &category: categories) { if (app.categories.contains(category)) { diff --git a/src/utils/desktopfileparse.h b/src/utils/desktopfileparse.h index 74b772fe..0b117a27 100644 --- a/src/utils/desktopfileparse.h +++ b/src/utils/desktopfileparse.h @@ -57,8 +57,8 @@ struct DesktopFileParser { DesktopAppData parseDesktopFile(const QString &fileName, bool &ok) const; int processDirectory(const QDir &dir); - QList getAppsByCategory(const QString &category); - QMap> getAppsByCategory( + QVector getAppsByCategory(const QString &category); + QMap> getAppsByCategory( const QStringList &categories); private: @@ -68,5 +68,5 @@ private: QString m_localeDescriptionShort; QIcon m_defaultIcon; - QList m_appList; + QVector m_appList; }; diff --git a/src/utils/systemnotification.cpp b/src/utils/systemnotification.cpp index dcccbffb..c7564553 100644 --- a/src/utils/systemnotification.cpp +++ b/src/utils/systemnotification.cpp @@ -34,7 +34,7 @@ void SystemNotification::sendMessage( } #ifndef Q_OS_WIN - QList args; + QList args; args << (qAppName()) //appname << static_cast(0) //id << "flameshot.png" //icon