X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ficon.h;h=18ec665c051066763da7b6d599ab23f1f1157781;hp=4cecb2add7d7725a5edbb0931bb2422b22242170;hb=c27d5bfbe80bfeb583a25404f4ccee4b70b010e0;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/uisupport/icon.h b/src/uisupport/icon.h
index 4cecb2ad..18ec665c 100644
--- a/src/uisupport/icon.h
+++ b/src/uisupport/icon.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,40 +18,41 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef ICON_H_
-#define ICON_H_
+#pragma once
 
-#ifndef HAVE_KDE
+#include <vector>
 
 #include <QIcon>
-
-/// A very thin wrapper around QIcon
-/** This wrapper class allows us to load an icon by its theme name rather than its full file name.
- *  The overloaded ctor uses IconLoader to locate an icon with this basename in the current theme
- *  or in Qt Resources.
+#include <QString>
+
+namespace icon {
+
+/**
+ * Gets an icon from the current icon theme.
+ *
+ * If the theme does not provide the icon, tries to load the icon from the
+ * fallback path, if given.
+ *
+ * If no icon can be found, a warning is displayed and a null icon returned.
+ *
+ * @param iconName     Icon name
+ * @param fallbackPath Full path to a fallback icon
+ * @returns The requested icon, if available
  */
-class Icon : public QIcon
-{
-public:
-    Icon();
-    explicit Icon(const QString &iconName);
-    explicit Icon(const QIcon &copy);
-
-    Icon &operator=(const Icon &other);
-};
-
-
-#else /* HAVE_KDE */
-#include <KIcon>
-class Icon : public KIcon
-{
-public:
-    inline Icon() : KIcon() {};
-    inline explicit Icon(const QString &iconName) : KIcon(iconName) {};
-    inline explicit Icon(const QIcon &copy) : KIcon(copy) {};
-};
-
-
-#endif /* HAVE_KDE */
+QIcon get(const QString &iconName, const QString &fallbackPath = {});
+
+/**
+ * Gets an icon from the current icon theme.
+ *
+ * If the theme does not provide any of the given icon names, tries to load the
+ * icon from the fallback path, if given.
+ *
+ * If no icon can be found, a warning is displayed and a null icon returned.
+ *
+ * @param iconNames    List of icon names (first match wins)
+ * @param fallbackPath Full path to a fallback icon
+ * @returns The requested icon, if available
+ */
+QIcon get(const std::vector<QString> &iconNames, const QString &fallbackPath = {});
 
-#endif
+}