[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdelibs/kdeui
From: Benjamin Meyer <benjamin () csh ! rit ! edu>
Date: 2005-04-02 2:25:11
Message-ID: 20050402022511.2FC37490 () office ! kde ! org
[Download RAW message or body]
CVS commit by bmeyer:
KDE_NO_COMPAT cleanup to compile
M +7 -3 kaction.h 1.189
M +3 -1 kguiitem.h 1.11
--- kdelibs/kdeui/kaction.h #1.188:1.189
@@ -466,9 +466,13 @@ public:
* Get the QIconSet from which the icons used to display this action will
* be chosen.
+ *
+ * In KDE4 set group default to KIcon::Small while removing the other
+ * iconSet() function.
*/
virtual QIconSet iconSet( KIcon::Group group, int size=0 ) const;
-#ifndef KDE_NO_COMPAT
+ /**
+ * Remove in KDE4
+ */
QIconSet iconSet() const { return iconSet( KIcon::Small ); }
-#endif
virtual QString icon() const;
--- kdelibs/kdeui/kguiitem.h #1.10:1.11
@@ -60,7 +60,9 @@ public:
QString text() const;
QString plainText() const;
- QIconSet iconSet( KIcon::Group, int size = 0, KInstance* instance = KGlobal::instance()) const;
#ifndef KDE_NO_COMPAT
+ QIconSet iconSet( KIcon::Group, int size = 0, KInstance* instance = KGlobal::instance()) const;
QIconSet iconSet() const { return iconSet( KIcon::Small ); }
+#else
+ QIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, KInstance* instance = KGlobal::instance()) const;
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic