[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kdeui
From: Stephan Kulow <coolo () kde ! org>
Date: 2006-07-19 5:47:13
Message-ID: 1153288033.875868.18266.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 564007 by coolo:
compile without warnings
M +21 -8 kselectaction.cpp
--- trunk/KDE/kdelibs/kdeui/kselectaction.cpp #564006:564007
@@ -109,7 +109,7 @@
}
KSelectAction::KSelectAction( const QString & icon, const QString & text, \
KActionCollection * parent, const QString& name )
- : KAction(icon, text, parent, name)
+ : KAction(KIcon(icon), text, parent, name)
, d(new KSelectActionPrivate())
{
init();
@@ -117,36 +117,43 @@
KSelectAction::KSelectAction( const QString& text, const KShortcut& cut,
KActionCollection* parent, const QString& name )
- : KAction( text, cut, 0,0,parent, name )
+ : KAction( text, parent, name )
, d(new KSelectActionPrivate())
-{
+{
+ setShortcut(cut);
init();
}
KSelectAction::KSelectAction( const QString& text, const KShortcut& cut,
const QObject* receiver, const char* slot,
KActionCollection* parent, const QString& name )
- : KAction( text, cut, receiver, slot, parent, name )
+ : KAction( text, parent, name )
, d(new KSelectActionPrivate())
{
+ connect(this, SIGNAL(triggered(bool)), receiver, slot);
+ setShortcut(cut);
init();
}
KSelectAction::KSelectAction( const QString& text, const QIcon& pix,
const KShortcut& cut,
KActionCollection* parent, const QString& name )
- : KAction( text, pix, cut, 0,0,parent, name )
+ : KAction( text, parent, name )
, d(new KSelectActionPrivate())
{
+ setShortcut(cut);
+ QAction::setIcon(pix);
init();
}
KSelectAction::KSelectAction( const QString& text, const QString& pix,
const KShortcut& cut,
KActionCollection* parent, const QString& name )
- : KAction( text, pix, cut, 0,0,parent, name )
+ : KAction( text, parent, name )
, d(new KSelectActionPrivate())
{
+ setShortcut(cut);
+ setIcon(KIcon(pix));
init();
}
@@ -155,9 +162,12 @@
const QObject* receiver,
const char* slot, KActionCollection* parent,
const QString& name )
- : KAction( text, pix, cut, receiver, slot, parent, name )
+ : KAction( text, parent, name )
, d(new KSelectActionPrivate())
{
+ setShortcut(cut);
+ QAction::setIcon(pix);
+ connect(this, SIGNAL(triggered(bool)), receiver, slot);
init();
}
@@ -166,9 +176,12 @@
const QObject* receiver,
const char* slot, KActionCollection* parent,
const QString& name )
- : KAction( text, pix, cut, receiver, slot, parent, name )
+ : KAction( text, parent, name )
, d(new KSelectActionPrivate())
{
+ setShortcut(cut);
+ setIcon(KIcon(pix));
+ connect(this, SIGNAL(triggered(bool)), receiver, slot);
init();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic