From d460986de0c84627d1725eada908e52911a97c5f Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 28 Jul 2023 01:09:21 +0300
Subject: format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
launcher/icons/IconList.cpp | 162 ++++++++++++++++++-------------------------
launcher/icons/IconList.h | 64 ++++++++---------
launcher/icons/IconUtils.cpp | 32 ++++-----
launcher/icons/IconUtils.h | 4 +-
launcher/icons/MMCIcon.cpp | 47 ++++++-------
launcher/icons/MMCIcon.h | 24 ++-----
6 files changed, 141 insertions(+), 192 deletions(-)
(limited to 'launcher/icons')
diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp
index 13174f6e..bfc5d5fb 100644
--- a/launcher/icons/IconList.cpp
+++ b/launcher/icons/IconList.cpp
@@ -35,32 +35,29 @@
#include "IconList.h"
#include <FileSystem.h>
-#include <QMap>
+#include <QDebug>
#include <QEventLoop>
-#include <QMimeData>
-#include <QUrl>
#include <QFileSystemWatcher>
+#include <QMap>
+#include <QMimeData>
#include <QSet>
-#include <QDebug>
+#include <QUrl>
#define MAX_SIZE 1024
-IconList::IconList(const QStringList &builtinPaths, QString path, QObject *parent) : QAbstractListModel(parent)
+IconList::IconList(const QStringList& builtinPaths, QString path, QObject* parent) : QAbstractListModel(parent)
{
QSet<QString> builtinNames;
// add builtin icons
- for(auto & builtinPath: builtinPaths)
- {
+ for (auto& builtinPath : builtinPaths) {
QDir instance_icons(builtinPath);
auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name);
- for (auto file_info : file_info_list)
- {
+ for (auto file_info : file_info_list) {
builtinNames.insert(file_info.completeBaseName());
}
}
- for(auto & builtinName : builtinNames)
- {
+ for (auto& builtinName : builtinNames) {
addThemeIcon(builtinName);
}
@@ -78,31 +75,27 @@ IconList::IconList(const QStringList &builtinPaths, QString path, QObject *paren
void IconList::sortIconList()
{
qDebug() << "Sorting icon list...";
- std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) {
- return a.m_key.localeAwareCompare(b.m_key) < 0;
- });
+ std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) { return a.m_key.localeAwareCompare(b.m_key) < 0; });
reindex();
}
-void IconList::directoryChanged(const QString &path)
+void IconList::directoryChanged(const QString& path)
{
- QDir new_dir (path);
- if(m_dir.absolutePath() != new_dir.absolutePath())
- {
+ QDir new_dir(path);
+ if (m_dir.absolutePath() != new_dir.absolutePath()) {
m_dir.setPath(path);
m_dir.refresh();
- if(is_watching)
+ if (is_watching)
stopWatching();
startWatching();
}
- if(!m_dir.exists())
- if(!FS::ensureFolderPathExists(m_dir.absolutePath()))
+ if (!m_dir.exists())
+ if (!FS::ensureFolderPathExists(m_dir.absolutePath()))
return;
m_dir.refresh();
auto new_list = m_dir.entryList(QDir::Files, QDir::Name);
- for (auto it = new_list.begin(); it != new_list.end(); it++)
- {
- QString &foo = (*it);
+ for (auto it = new_list.begin(); it != new_list.end(); it++) {
+ QString& foo = (*it);
foo = m_dir.filePath(foo);
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -111,8 +104,7 @@ void IconList::directoryChanged(const QString &path)
auto new_set = new_list.toSet();
#endif
QList<QString> current_list;
- for (auto &it : icons)
- {
+ for (auto& it : icons) {
if (!it.has(IconType::FileBased))
continue;
current_list.push_back(it.m_images[IconType::FileBased].filename);
@@ -129,8 +121,7 @@ void IconList::directoryChanged(const QString &path)
QSet<QString> to_add = new_set;
to_add -= current_set;
- for (auto remove : to_remove)
- {
+ for (auto remove : to_remove) {
qDebug() << "Removing " << remove;
QFileInfo rmfile(remove);
QString key = rmfile.completeBaseName();
@@ -144,23 +135,19 @@ void IconList::directoryChanged(const QString &path)
if (idx == -1)
continue;
icons[idx].remove(IconType::FileBased);
- if (icons[idx].type() == IconType::ToBeDeleted)
- {
+ if (icons[idx].type() == IconType::ToBeDeleted) {
beginRemoveRows(QModelIndex(), idx, idx);
icons.remove(idx);
reindex();
endRemoveRows();
- }
- else
- {
+ } else {
dataChanged(index(idx), index(idx));
}
m_watcher->removePath(remove);
emit iconUpdated(key);
}
- for (auto add : to_add)
- {
+ for (auto add : to_add) {
qDebug() << "Adding " << add;
QFileInfo addfile(add);
@@ -171,8 +158,7 @@ void IconList::directoryChanged(const QString &path)
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
key = addfile.fileName();
- if (addIcon(key, QString(), addfile.filePath(), IconType::FileBased))
- {
+ if (addIcon(key, QString(), addfile.filePath(), IconType::FileBased)) {
m_watcher->addPath(add);
emit iconUpdated(key);
}
@@ -181,7 +167,7 @@ void IconList::directoryChanged(const QString &path)
sortIconList();
}
-void IconList::fileChanged(const QString &path)
+void IconList::fileChanged(const QString& path)
{
qDebug() << "Checking " << path;
QFileInfo checkfile(path);
@@ -200,9 +186,9 @@ void IconList::fileChanged(const QString &path)
emit iconUpdated(key);
}
-void IconList::SettingChanged(const Setting &setting, QVariant value)
+void IconList::SettingChanged(const Setting& setting, QVariant value)
{
- if(setting.id() != "IconsDir")
+ if (setting.id() != "IconsDir")
return;
directoryChanged(value.toString());
@@ -213,12 +199,9 @@ void IconList::startWatching()
auto abs_path = m_dir.absolutePath();
FS::ensureFolderPathExists(abs_path);
is_watching = m_watcher->addPath(abs_path);
- if (is_watching)
- {
+ if (is_watching) {
qDebug() << "Started watching " << abs_path;
- }
- else
- {
+ } else {
qDebug() << "Failed to start watching " << abs_path;
}
}
@@ -241,7 +224,11 @@ Qt::DropActions IconList::supportedDropActions() const
return Qt::CopyAction;
}
-bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, [[maybe_unused]] const QModelIndex &parent)
+bool IconList::dropMimeData(const QMimeData* data,
+ Qt::DropAction action,
+ [[maybe_unused]] int row,
+ [[maybe_unused]] int column,
+ [[maybe_unused]] const QModelIndex& parent)
{
if (action == Qt::IgnoreAction)
return true;
@@ -250,12 +237,10 @@ bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[mayb
return false;
// files dropped from outside?
- if (data->hasUrls())
- {
+ if (data->hasUrls()) {
auto urls = data->urls();
QStringList iconFiles;
- for (auto url : urls)
- {
+ for (auto url : urls) {
// only local files may be dropped...
if (!url.isLocalFile())
continue;
@@ -267,7 +252,7 @@ bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[mayb
return false;
}
-Qt::ItemFlags IconList::flags(const QModelIndex &index) const
+Qt::ItemFlags IconList::flags(const QModelIndex& index) const
{
Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
if (index.isValid())
@@ -276,7 +261,7 @@ Qt::ItemFlags IconList::flags(const QModelIndex &index) const
return Qt::ItemIsDropEnabled | defaultFlags;
}
-QVariant IconList::data(const QModelIndex &index, int role) const
+QVariant IconList::data(const QModelIndex& index, int role) const
{
if (!index.isValid())
return QVariant();
@@ -286,28 +271,26 @@ QVariant IconList::data(const QModelIndex &index, int role) const
if (row < 0 || row >= icons.size())
return QVariant();
- switch (role)
- {
- case Qt::DecorationRole:
- return icons[row].icon();
- case Qt::DisplayRole:
- return icons[row].name();
- case Qt::UserRole:
- return icons[row].m_key;
- default:
- return QVariant();
+ switch (role) {
+ case Qt::DecorationRole:
+ return icons[row].icon();
+ case Qt::DisplayRole:
+ return icons[row].name();
+ case Qt::UserRole:
+ return icons[row].m_key;
+ default:
+ return QVariant();
}
}
-int IconList::rowCount(const QModelIndex &parent) const
+int IconList::rowCount(const QModelIndex& parent) const
{
return parent.isValid() ? 0 : icons.size();
}
-void IconList::installIcons(const QStringList &iconFiles)
+void IconList::installIcons(const QStringList& iconFiles)
{
- for (QString file : iconFiles)
- {
+ for (QString file : iconFiles) {
QFileInfo fileinfo(file);
if (!fileinfo.isReadable() || !fileinfo.isFile())
continue;
@@ -322,10 +305,10 @@ void IconList::installIcons(const QStringList &iconFiles)
}
}
-void IconList::installIcon(const QString &file, const QString &name)
+void IconList::installIcon(const QString& file, const QString& name)
{
QFileInfo fileinfo(file);
- if(!fileinfo.isReadable() || !fileinfo.isFile())
+ if (!fileinfo.isReadable() || !fileinfo.isFile())
return;
QString target = FS::PathCombine(getDirectory(), name);
@@ -333,17 +316,16 @@ void IconList::installIcon(const QString &file, const QString &name)
QFile::copy(file, target);
}
-bool IconList::iconFileExists(const QString &key) const
+bool IconList::iconFileExists(const QString& key) const
{
auto iconEntry = icon(key);
- if(!iconEntry)
- {
+ if (!iconEntry) {
return false;
}
return iconEntry->has(IconType::FileBased);
}
-const MMCIcon *IconList::icon(const QString &key) const
+const MMCIcon* IconList::icon(const QString& key) const
{
int iconIdx = getIconIndex(key);
if (iconIdx == -1)
@@ -351,7 +333,7 @@ const MMCIcon *IconList::icon(const QString &key) const
return &icons[iconIdx];
}
-bool IconList::deleteIcon(const QString &key)
+bool IconList::deleteIcon(const QString& key)
{
if (!iconFileExists(key))
return false;
@@ -359,7 +341,7 @@ bool IconList::deleteIcon(const QString &key)
return QFile::remove(icon(key)->getFilePath());
}
-bool IconList::trashIcon(const QString &key)
+bool IconList::trashIcon(const QString& key)
{
if (!iconFileExists(key))
return false;
@@ -370,15 +352,12 @@ bool IconList::trashIcon(const QString &key)
bool IconList::addThemeIcon(const QString& key)
{
auto iter = name_index.find(key);
- if (iter != name_index.end())
- {
- auto &oldOne = icons[*iter];
+ if (iter != name_index.end()) {
+ auto& oldOne = icons[*iter];
oldOne.replace(Builtin, key);
dataChanged(index(*iter), index(*iter));
return true;
- }
- else
- {
+ } else {
// add a new icon
beginInsertRows(QModelIndex(), icons.size(), icons.size());
{
@@ -394,22 +373,19 @@ bool IconList::addThemeIcon(const QString& key)
}
}
-bool IconList::addIcon(const QString &key, const QString &name, const QString &path, const IconType type)
+bool IconList::addIcon(const QString& key, const QString& name, const QString& path, const IconType type)
{
// replace the icon even? is the input valid?
QIcon icon(path);
if (icon.isNull())
return false;
auto iter = name_index.find(key);
- if (iter != name_index.end())
- {
- auto &oldOne = icons[*iter];
+ if (iter != name_index.end()) {
+ auto& oldOne = icons[*iter];
oldOne.replace(type, icon, path);
dataChanged(index(*iter), index(*iter));
return true;
- }
- else
- {
+ } else {
// add a new icon
beginInsertRows(QModelIndex(), icons.size(), icons.size());
{
@@ -425,26 +401,24 @@ bool IconList::addIcon(const QString &key, const QString &name, const QString &p
}
}
-void IconList::saveIcon(const QString &key, const QString &path, const char * format) const
+void IconList::saveIcon(const QString& key, const QString& path, const char* format) const
{
auto icon = getIcon(key);
auto pixmap = icon.pixmap(128, 128);
pixmap.save(path, format);
}
-
void IconList::reindex()
{
name_index.clear();
int i = 0;
- for (auto &iter : icons)
- {
+ for (auto& iter : icons) {
name_index[iter.m_key] = i;
i++;
}
}
-QIcon IconList::getIcon(const QString &key) const
+QIcon IconList::getIcon(const QString& key) const
{
int icon_index = getIconIndex(key);
@@ -459,7 +433,7 @@ QIcon IconList::getIcon(const QString &key) const
return QIcon();
}
-int IconList::getIconIndex(const QString &key) const
+int IconList::getIconIndex(const QString& key) const
{
auto iter = name_index.find(key == "default" ? "grass" : key);
if (iter != name_index.end())
@@ -473,4 +447,4 @@ QString IconList::getDirectory() const
return m_dir.absolutePath();
}
-//#include "IconList.moc"
+// #include "IconList.moc"
diff --git a/launcher/icons/IconList.h b/launcher/icons/IconList.h
index 97141e4a..bc1dd3b9 100644
--- a/launcher/icons/IconList.h
+++ b/launcher/icons/IconList.h
@@ -15,10 +15,10 @@
#pragma once
-#include <QMutex>
#include <QAbstractListModel>
-#include <QFile>
#include <QDir>
+#include <QFile>
+#include <QMutex>
#include <QtGui/QIcon>
#include <memory>
@@ -29,58 +29,58 @@
class QFileSystemWatcher;
-class IconList : public QAbstractListModel
-{
+class IconList : public QAbstractListModel {
Q_OBJECT
-public:
- explicit IconList(const QStringList &builtinPaths, QString path, QObject *parent = 0);
- virtual ~IconList() {};
+ public:
+ explicit IconList(const QStringList& builtinPaths, QString path, QObject* parent = 0);
+ virtual ~IconList(){};
- QIcon getIcon(const QString &key) const;
- int getIconIndex(const QString &key) const;
+ QIcon getIcon(const QString& key) const;
+ int getIconIndex(const QString& key) const;
QString getDirectory() const;
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+ virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
virtual QStringList mimeTypes() const override;
virtual Qt::DropActions supportedDropActions() const override;
- virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
- virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
+ virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
+ virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
- bool addThemeIcon(const QString &key);
- bool addIcon(const QString &key, const QString &name, const QString &path, const IconType type);
- void saveIcon(const QString &key, const QString &path, const char * format) const;
- bool deleteIcon(const QString &key);
- bool trashIcon(const QString &key);
- bool iconFileExists(const QString &key) const;
+ bool addThemeIcon(const QString& key);
+ bool addIcon(const QString& key, const QString& name, const QString& path, const IconType type);
+ void saveIcon(const QString& key, const QString& path, const char* format) const;
+ bool deleteIcon(const QString& key);
+ bool trashIcon(const QString& key);
+ bool iconFileExists(const QString& key) const;
- void installIcons(const QStringList &iconFiles);
- void installIcon(const QString &file, const QString &name);
+ void installIcons(const QStringList& iconFiles);
+ void installIcon(const QString& file, const QString& name);
- const MMCIcon * icon(const QString &key) const;
+ const MMCIcon* icon(const QString& key) const;
void startWatching();
void stopWatching();
-signals:
+ signals:
void iconUpdated(QString key);
-private:
+ private:
// hide copy constructor
- IconList(const IconList &) = delete;
+ IconList(const IconList&) = delete;
// hide assign op
- IconList &operator=(const IconList &) = delete;
+ IconList& operator=(const IconList&) = delete;
void reindex();
void sortIconList();
-public slots:
- void directoryChanged(const QString &path);
+ public slots:
+ void directoryChanged(const QString& path);
+
+ protected slots:
+ void fileChanged(const QString& path);
+ void SettingChanged(const Setting& setting, QVariant value);
-protected slots:
- void fileChanged(const QString &path);
- void SettingChanged(const Setting & setting, QVariant value);
-private:
+ private:
shared_qobject_ptr<QFileSystemWatcher> m_watcher;
bool is_watching;
QMap<QString, int> name_index;
diff --git a/launcher/icons/IconUtils.cpp b/launcher/icons/IconUtils.cpp
index bf530c16..0b06639e 100644
--- a/launcher/icons/IconUtils.cpp
+++ b/launcher/icons/IconUtils.cpp
@@ -1,24 +1,18 @@
#include "IconUtils.h"
-#include "FileSystem.h"
#include <QDirIterator>
+#include "FileSystem.h"
#include <array>
namespace {
-std::array<const char *, 6> validIconExtensions = {{
- "svg",
- "png",
- "ico",
- "gif",
- "jpg",
- "jpeg"
-}};
+std::array<const char*, 6> validIconExtensions = { { "svg", "png", "ico", "gif", "jpg", "jpeg" } };
}
-namespace IconUtils{
+namespace IconUtils {
-QString findBestIconIn(const QString &folder, const QString & iconKey) {
+QString findBestIconIn(const QString& folder, const QString& iconKey)
+{
int best_found = validIconExtensions.size();
QString best_filename;
@@ -27,13 +21,13 @@ QString findBestIconIn(const QString &folder, const QString & iconKey) {
it.next();
auto fileInfo = it.fileInfo();
- if(fileInfo.completeBaseName() != iconKey)
+ if (fileInfo.completeBaseName() != iconKey)
continue;
auto extension = fileInfo.suffix();
- for(int i = 0; i < best_found; i++) {
- if(extension == validIconExtensions[i]) {
+ for (int i = 0; i < best_found; i++) {
+ if (extension == validIconExtensions[i]) {
best_found = i;
qDebug() << i << " : " << fileInfo.fileName();
best_filename = fileInfo.fileName();
@@ -43,12 +37,13 @@ QString findBestIconIn(const QString &folder, const QString & iconKey) {
return FS::PathCombine(folder, best_filename);
}
-QString getIconFilter() {
+QString getIconFilter()
+{
QString out;
QTextStream stream(&out);
stream << '(';
- for(size_t i = 0; i < validIconExtensions.size() - 1; i++) {
- if(i > 0) {
+ for (size_t i = 0; i < validIconExtensions.size() - 1; i++) {
+ if (i > 0) {
stream << " ";
}
stream << "*." << validIconExtensions[i];
@@ -58,5 +53,4 @@ QString getIconFilter() {
return out;
}
-}
-
+} // namespace IconUtils
diff --git a/launcher/icons/IconUtils.h b/launcher/icons/IconUtils.h
index be93d914..8c6f677d 100644
--- a/launcher/icons/IconUtils.h
+++ b/launcher/icons/IconUtils.h
@@ -5,9 +5,9 @@
namespace IconUtils {
// Given a folder and an icon key, find 'best' of the icons with the given key in there and return its path
-QString findBestIconIn(const QString &folder, const QString & iconKey);
+QString findBestIconIn(const QString& folder, const QString& iconKey);
// Get icon file type filter for file browser dialogs
QString getIconFilter();
-}
+} // namespace IconUtils
diff --git a/launcher/icons/MMCIcon.cpp b/launcher/icons/MMCIcon.cpp
index 436ef75f..9c1b366c 100644
--- a/launcher/icons/MMCIcon.cpp
+++ b/launcher/icons/MMCIcon.cpp
@@ -37,23 +37,21 @@
#include <QFileInfo>
#include <QIcon>
-IconType operator--(IconType &t, int)
+IconType operator--(IconType& t, int)
{
IconType temp = t;
- switch (t)
- {
- case IconType::Builtin:
- t = IconType::ToBeDeleted;
- break;
- case IconType::Transient:
- t = IconType::Builtin;
- break;
- case IconType::FileBased:
- t = IconType::Transient;
- break;
- default:
- {
- }
+ switch (t) {
+ case IconType::Builtin:
+ t = IconType::ToBeDeleted;
+ break;
+ case IconType::Transient:
+ t = IconType::Builtin;
+ break;
+ case IconType::FileBased:
+ t = IconType::Transient;
+ break;
+ default: {
+ }
}
return temp;
}
@@ -79,8 +77,8 @@ QIcon MMCIcon::icon() const
{
if (m_current_type == IconType::ToBeDeleted)
return QIcon();
- auto & icon = m_images[m_current_type].icon;
- if(!icon.isNull())
+ auto& icon = m_images[m_current_type].icon;
+ if (!icon.isNull())
return icon;
// FIXME: inject this.
return QIcon::fromTheme(m_images[m_current_type].key);
@@ -90,10 +88,8 @@ void MMCIcon::remove(IconType rm_type)
{
m_images[rm_type].filename = QString();
m_images[rm_type].icon = QIcon();
- for (auto iter = rm_type; iter != IconType::ToBeDeleted; iter--)
- {
- if (m_images[iter].present())
- {
+ for (auto iter = rm_type; iter != IconType::ToBeDeleted; iter--) {
+ if (m_images[iter].present()) {
m_current_type = iter;
return;
}
@@ -103,8 +99,7 @@ void MMCIcon::remove(IconType rm_type)
void MMCIcon::replace(IconType new_type, QIcon icon, QString path)
{
- if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted)
- {
+ if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted) {
m_current_type = new_type;
}
m_images[new_type].icon = icon;
@@ -114,8 +109,7 @@ void MMCIcon::replace(IconType new_type, QIcon icon, QString path)
void MMCIcon::replace(IconType new_type, const QString& key)
{
- if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted)
- {
+ if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted) {
m_current_type = new_type;
}
m_images[new_type].icon = QIcon();
@@ -125,13 +119,12 @@ void MMCIcon::replace(IconType new_type, const QString& key)
QString MMCIcon::getFilePath() const
{
- if(m_current_type == IconType::ToBeDeleted){
+ if (m_current_type == IconType::ToBeDeleted) {
return QString();
}
return m_images[m_current_type].filename;
}
-
bool MMCIcon::isBuiltIn() const
{
return m_current_type == IconType::Builtin;
diff --git a/launcher/icons/MMCIcon.h b/launcher/icons/MMCIcon.h
index 13d99318..c968f306 100644
--- a/launcher/icons/MMCIcon.h
+++ b/launcher/icons/MMCIcon.h
@@ -14,32 +14,20 @@
*/
#pragma once
-#include <QString>
#include <QDateTime>
#include <QIcon>
+#include <QString>
-enum IconType : unsigned
-{
- Builtin,
- Transient,
- FileBased,
- ICONS_TOTAL,
- ToBeDeleted
-};
+enum IconType : unsigned { Builtin, Transient, FileBased, ICONS_TOTAL, ToBeDeleted };
-struct MMCImage
-{
+struct MMCImage {
QIcon icon;
QString key;
QString filename;
- bool present() const
- {
- return !icon.isNull() || !key.isEmpty();
- }
+ bool present() const { return !icon.isNull() || !key.isEmpty(); }
};
-struct MMCIcon
-{
+struct MMCIcon {
QString m_key;
QString m_name;
MMCImage m_images[ICONS_TOTAL];
@@ -51,7 +39,7 @@ struct MMCIcon
QIcon icon() const;
void remove(IconType rm_type);
void replace(IconType new_type, QIcon icon, QString path = QString());
- void replace(IconType new_type, const QString &key);
+ void replace(IconType new_type, const QString& key);
bool isBuiltIn() const;
QString getFilePath() const;
};
--
cgit