From 739ddbd10ff6ee8f90a783d9c64418173a07f96f Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 23 Apr 2017 20:30:25 +0200 Subject: [PATCH] Some clazy fixes. --- src/core/feedsmodel.cpp | 6 +++--- src/core/feedsproxymodel.cpp | 2 +- src/miscellaneous/iofactory.h | 2 +- src/miscellaneous/settings.h | 8 ++++---- src/services/abstract/rootitem.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index 728af737f..949c4397c 100755 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -86,12 +86,12 @@ QMimeData *FeedsModel::mimeData(const QModelIndexList &indexes) const { } } - mime_data->setData(MIME_TYPE_ITEM_POINTER, encoded_data); + mime_data->setData(QSL(MIME_TYPE_ITEM_POINTER), encoded_data); return mime_data; } QStringList FeedsModel::mimeTypes() const { - return QStringList() << MIME_TYPE_ITEM_POINTER; + return QStringList() << QSL(MIME_TYPE_ITEM_POINTER); } bool FeedsModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { @@ -105,7 +105,7 @@ bool FeedsModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int return false; } - QByteArray dragged_items_data = data->data(MIME_TYPE_ITEM_POINTER); + QByteArray dragged_items_data = data->data(QSL(MIME_TYPE_ITEM_POINTER)); if (dragged_items_data.isEmpty()) { return false; diff --git a/src/core/feedsproxymodel.cpp b/src/core/feedsproxymodel.cpp index df43676f6..7e77f982b 100755 --- a/src/core/feedsproxymodel.cpp +++ b/src/core/feedsproxymodel.cpp @@ -241,7 +241,7 @@ void FeedsProxyModel::invalidateReadFeedsFilter(bool set_new_value, bool show_un setShowUnreadOnly(show_unread_only); } - QTimer::singleShot(0, this, SLOT(invalidateFilter())); + QTimer::singleShot(0, this, &FeedsProxyModel::invalidateFilter); } void FeedsProxyModel::setShowUnreadOnly(bool show_unread_only) { diff --git a/src/miscellaneous/iofactory.h b/src/miscellaneous/iofactory.h index 2422deb53..8b32ed2ec 100755 --- a/src/miscellaneous/iofactory.h +++ b/src/miscellaneous/iofactory.h @@ -48,7 +48,7 @@ class IOFactory { // Throws exception when no such file exists. static QByteArray readTextFile(const QString &file_path); - static void writeTextFile(const QString &file_path, const QByteArray &data, const QString &encoding = "UTF-8"); + static void writeTextFile(const QString &file_path, const QByteArray &data, const QString &encoding = QSL("UTF-8")); // Copies file, overwrites destination. static bool copyFile(const QString &source, const QString &destination); diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index f57ce0d24..04a6a8865 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -317,11 +317,11 @@ class Settings : public QSettings { // Getters/setters for settings values. inline QVariant value(const QString §ion, const QString &key, const QVariant &default_value = QVariant()) const { - return QSettings::value(QString("%1/%2").arg(section, key), default_value); + return QSettings::value(QString(QSL("%1/%2")).arg(section, key), default_value); } inline void setValue(const QString §ion, const QString &key, const QVariant &value) { - QSettings::setValue(QString("%1/%2").arg(section, key), value); + QSettings::setValue(QString(QSL("%1/%2")).arg(section, key), value); } inline void setValue(const QString &key, const QVariant &value) { @@ -329,11 +329,11 @@ class Settings : public QSettings { } inline bool contains(const QString §ion, const QString &key) const { - return QSettings::contains(QString("%1/%2").arg(section, key)); + return QSettings::contains(QString(QSL("%1/%2")).arg(section, key)); } inline void remove(const QString §ion, const QString &key) { - QSettings::remove(QString("%1/%2").arg(section, key)); + QSettings::remove(QString(QSL("%1/%2")).arg(section, key)); } // Returns the path which contains the settings. diff --git a/src/services/abstract/rootitem.h b/src/services/abstract/rootitem.h index d3ddd2486..309a3164f 100755 --- a/src/services/abstract/rootitem.h +++ b/src/services/abstract/rootitem.h @@ -152,7 +152,7 @@ class RootItem : public QObject { m_childItems.clear(); } - inline void setChildItems(QList child_items) { + inline void setChildItems(const QList &child_items) { m_childItems = child_items; }