[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: adventure_and_danger: kdelibs/kdeui
From: Ellis Whitehead <kde () ellisw ! net>
Date: 2003-07-09 21:39:37
[Download RAW message or body]
CVS commit by ellis:
Use new KAccelCollection class
M +7 -7 kaction.cpp 1.312.2.1
--- kdelibs/kdeui/kaction.cpp #1.312:1.312.2.1
@@ -32,5 +32,5 @@
#include <kaccel.h>
-#include <kaccelbase.h>
+#include <kaccelcollection.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -433,5 +433,5 @@ bool KAction::updateKAccelShortcut( KAcc
bool b = true;
- if ( !kaccel->actions().actionPtr( name() ) ) {
+ if ( !kaccel->collection()->findDataPtr( name() ) ) {
if(!d->m_cut.isNull() ) {
kdDebug(129) << "Inserting " << name() << ", " << d->text() << ", " << d->plainText() << endl;
@@ -451,5 +451,5 @@ void KAction::insertKAccel( KAccel* kacc
{
//kdDebug(129) << "KAction::insertKAccel( " << kaccel << " ): this = " << this << endl;
- if ( !kaccel->actions().actionPtr( name() ) ) {
+ if ( !kaccel->collection()->findDataPtr( name() ) ) {
if( updateKAccelShortcut( kaccel ) ) {
d->m_kaccelList.append( kaccel );
@@ -750,5 +750,5 @@ void KAction::plugAccel(KAccel *kacc, bo
// We can only plug this action into the given KAccel object
// if it does not already contain an action with the same name.
- if ( !kacc->actions().actionPtr(name()) )
+ if ( !kacc->collection()->findDataPtr(name()) )
{
d->m_kaccel = kacc;
@@ -833,5 +833,5 @@ void KAction::setText( const QString& te
// KDE 4: remove
if (d->m_kaccel) {
- KAccelAction* pAction = d->m_kaccel->actions().actionPtr(name());
+ KAccelData* pAction = d->m_kaccel->collection()->findDataPtr(name());
if (pAction)
pAction->setLabel( text );
@@ -840,5 +840,5 @@ void KAction::setText( const QString& te
for( uint i = 0; i < d->m_kaccelList.count(); i++ ) {
- KAccelAction* pAction = d->m_kaccelList[i]->actions().actionPtr(name());
+ KAccelData* pAction = d->m_kaccelList[i]->collection()->findDataPtr(name());
if (pAction)
pAction->setLabel( text );
@@ -1122,5 +1122,5 @@ void KAction::slotKeycodeChanged()
{
kdDebug(129) << "KAction::slotKeycodeChanged()" << endl; // -- ellis
- KAccelAction* pAction = d->m_kaccel->actions().actionPtr(name());
+ KAccelData* pAction = d->m_kaccel->collection()->findDataPtr(name());
if( pAction )
setShortcut(pAction->shortcut());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic