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

List:       kde-commits
Subject:    KDE/kdelibs/kde3support/kdecore
From:       Caleb Tennis <caleb () gentoo ! org>
Date:       2005-09-08 16:44:59
Message-ID: 1126197899.643820.29882.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 458612 by ctennis:

Use K3KeySequence internally

 M  +3 -3      k3shortcutmenu.cpp  
 M  +6 -6      k3shortcutmenu.h  


--- trunk/KDE/kdelibs/kde3support/kdecore/k3shortcutmenu.cpp #458611:458612
@@ -29,7 +29,7 @@
 #include "k3shortcutmenu.h"
 //#include <kkeynative.h>
 
-K3ShortcutMenu::K3ShortcutMenu( QWidget* pParent, KAccelActions* pActions, KKeySequence seq )
+K3ShortcutMenu::K3ShortcutMenu( QWidget* pParent, KAccelActions* pActions, K3KeySequence seq )
 :	Q3PopupMenu( pParent ),
 	m_pActions( pActions ),
 	m_seq( seq )
@@ -37,7 +37,7 @@
 	kdDebug() << seq.toStringInternal() << endl;
 }
 
-bool K3ShortcutMenu::insertAction( uint iAction, KKeySequence seq )
+bool K3ShortcutMenu::insertAction( uint iAction, K3KeySequence seq )
 {
 	KAccelAction* pAction = m_pActions->actionPtr( iAction );
 	
@@ -59,7 +59,7 @@
 		if( iAction >= 0 ) {
 			KAccelAction* pAction = m_pActions->actionPtr( iAction );
 			if( pAction ) {
-				KKeySequence seq = m_seqs[iItem];
+				K3KeySequence seq = m_seqs[iItem];
 				QString sSeq = seq.key(m_seq.count()).toString();
 				for( uint iKey = m_seq.count() + 1; iKey < seq.count(); iKey++ )
 					sSeq += QString(",") + seq.key(iKey).toString();
--- trunk/KDE/kdelibs/kde3support/kdecore/k3shortcutmenu.h #458611:458612
@@ -23,7 +23,7 @@
 #include <qmap.h>
 #include <q3popupmenu.h>
 
-#include "kshortcut.h"
+#include "k3keysequence.h"
 
 class KAccelActions;
 
@@ -34,9 +34,9 @@
 {
 	Q_OBJECT
  public:
-	K3ShortcutMenu( QWidget* pParent, KAccelActions* pActions, KKeySequence seq );
+	K3ShortcutMenu( QWidget* pParent, KAccelActions* pActions, K3KeySequence seq );
 
-	bool insertAction( uint iAction, KKeySequence seq );
+	bool insertAction( uint iAction, K3KeySequence seq );
 
 	void updateShortcuts();
  
@@ -48,11 +48,11 @@
 	void keepItemsMatching( KKey key );
  
  private:
-	typedef QMap<uint, KKeySequence> IndexToKKeySequence;
+	typedef QMap<uint, K3KeySequence> IndexToK3KeySequence;
 	
 	KAccelActions* m_pActions;
-	KKeySequence m_seq;
-	IndexToKKeySequence m_seqs;
+	K3KeySequence m_seq;
+	IndexToK3KeySequence m_seqs;
 };
 
 #endif // __K3ShortcutMenu_H
[prev in list] [next in list] [prev in thread] [next in thread]