Improve marker line behavior; allow manual setting (Ctrl+R)

[quassel.git] / src / uisupport / icon.h

diff --git a/src/uisupport/icon.h b/src/uisupport/icon.h
index 7ca1844..2c1d62e 100644 (file)
--- a/src/uisupport/icon.h
+++ b/src/uisupport/icon.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,8 @@
 #ifndef ICON_H_
 #define ICON_H_
 
+#ifndef HAVE_KDE
+
 #include <QIcon>
 
 /// A very thin wrapper around QIcon
@@ -31,8 +33,23 @@
 class Icon : public QIcon {
 
   public:
-    //explicit Icon();
+    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 */
+
 #endif