const-correct QIconLoader methods

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index ff27a55..1bd6b90 100644 (file)
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -90,7 +90,7 @@ void QIconLoader::setThemeName(const QString &themeName)
 void QIconLoader::setThemeSearchPath(const QStringList &searchPaths)
 {
     m_iconDirs = searchPaths;
-    themeList.clear();
+    m_themeList.clear();
     invalidateKey();
 }
 
@@ -162,7 +162,7 @@ QIconTheme::QIconTheme(const QString &themeName)
 
 QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName,
                                               const QString &iconName,
-                                              QStringList &visited) const
+                                              QStringList &visited)
 {
     QThemeIconEntries entries;
     Q_ASSERT(!themeName.isEmpty());
@@ -170,13 +170,13 @@ QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName,
     // Used to protect against potential recursions
     visited << themeName;
 
-    QIconTheme theme = themeList.value(themeName);
+    QIconTheme theme = m_themeList.value(themeName);
     if (!theme.isValid()) {
         theme = QIconTheme(themeName);
         if (!theme.isValid())
             theme = QIconTheme(fallbackTheme);
 
-        themeList.insert(themeName, theme);
+        m_themeList.insert(themeName, theme);
     }
 
     QString contentDir = theme.contentDir() + QLatin1Char('/');
@@ -221,7 +221,7 @@ QThemeIconEntries QIconLoader::findIconHelper(const QString &themeName,
     return entries;
 }
 
-QThemeIconEntries QIconLoader::loadIcon(const QString &name) const
+QThemeIconEntries QIconLoader::loadIcon(const QString &name)
 {
     if (!themeName().isEmpty()) {
         QStringList visited;

diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index be809b7..c631379 100644 (file)
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -128,12 +128,12 @@ class QIconLoader
 {
 public:
     QIconLoader();
-    QThemeIconEntries loadIcon(const QString &iconName) const;
+    QThemeIconEntries loadIcon(const QString &iconName);
     uint themeKey() const { return m_themeKey; }
 
     QString themeName() const { return m_userTheme.isEmpty() ? m_systemTheme : m_userTheme; }
     void setThemeName(const QString &themeName);
-    QIconTheme theme() const { return themeList.value(themeName()); }
+    QIconTheme theme() const { return m_themeList.value(themeName()); }
     void setThemeSearchPath(const QStringList &searchPaths);
     QStringList themeSearchPaths() const;
     static QIconLoader *instance();
@@ -143,14 +143,14 @@ public:
 private:
     QThemeIconEntries findIconHelper(const QString &themeName,
                                      const QString &iconName,
-                                     QStringList &visited) const;
+                                     QStringList &visited);
     uint m_themeKey;
     bool m_supportsSvg;
 
     QString m_userTheme;
     QString m_systemTheme;
     mutable QStringList m_iconDirs;
-    mutable QHash <QString, QIconTheme> themeList;
+    QHash <QString, QIconTheme> m_themeList;
 };
 
 QT_END_NAMESPACE