[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:38:59
[Download RAW message or body]

CVS commit by ellis: 

Disable default kaccel object if collection is used for XML plugging


  M +5 -2      kactioncollection.cpp   1.310.2.1


--- kdelibs/kdeui/kactioncollection.cpp  #1.310:1.310.2.1
@@ -31,5 +31,4 @@
 
 #include <kaccel.h>
-#include <kaccelbase.h>
 #include <kapplication.h>
 #include <kdebug.h>
@@ -172,4 +171,6 @@ void KActionCollection::beginXMLPlug( QW
         if( widget && !d->m_builderKAccel ) {
             d->m_builderKAccel = new KAccel( widget, this, "KActionCollection-BuilderKAccel" );
+                if( d->m_kaccel )
+                        d->m_kaccel->setEnabled( false );
         }
 }
@@ -190,4 +191,6 @@ void KActionCollection::prepareXMLUnplug
                 delete d->m_builderKAccel;
                 d->m_builderKAccel = 0;
+                //if( d->m_kaccel )
+                //      d->m_kaccel->setEnabled( true );
         }
 }


[prev in list] [next in list] [prev in thread] [next in thread]