[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:38:29
Message-ID: 1126197509.879488.29574.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 458606 by ctennis:

Update k3shortcut menu to K3 syntax

 M  +2 -2      Makefile.am  
 M  +7 -9      k3shortcutmenu.cpp  
 M  +5 -5      k3shortcutmenu.h  


--- trunk/KDE/kdelibs/kde3support/kdecore/Makefile.am #458605:458606
@@ -6,8 +6,8 @@
 libkde3core_la_LDFLAGS = $(all_libraries)
 #libkde3core_la_LIBADD  = $(LIB_KPARTS)
 
-libkde3core_la_SOURCES = k3shortcut.cpp k3keysequence.cpp
-include_HEADERS = k3shortcut.h k3keysequence.h
+libkde3core_la_SOURCES = k3shortcut.cpp k3keysequence.cpp k3shortcutmenu.cpp
+include_HEADERS = k3shortcut.h k3keysequence.h k3shortcutmenu.h
 
 METASOURCES = AUTO
 
--- trunk/KDE/kdelibs/kde3support/kdecore/k3shortcutmenu.cpp #458605:458606
@@ -26,10 +26,10 @@
 #include "kaccelaction.h"
 #include <kdebug.h>
 #include <kglobalsettings.h>
-#include "kshortcutmenu.h"
+#include "k3shortcutmenu.h"
 //#include <kkeynative.h>
 
-KShortcutMenu::KShortcutMenu( QWidget* pParent, KAccelActions* pActions, KKeySequence seq )
+K3ShortcutMenu::K3ShortcutMenu( QWidget* pParent, KAccelActions* pActions, KKeySequence seq )
 :	Q3PopupMenu( pParent ),
 	m_pActions( pActions ),
 	m_seq( seq )
@@ -37,7 +37,7 @@
 	kdDebug() << seq.toStringInternal() << endl;
 }
 
-bool KShortcutMenu::insertAction( uint iAction, KKeySequence seq )
+bool K3ShortcutMenu::insertAction( uint iAction, KKeySequence seq )
 {
 	KAccelAction* pAction = m_pActions->actionPtr( iAction );
 	
@@ -50,7 +50,7 @@
 }
 
 
-void KShortcutMenu::updateShortcuts()
+void K3ShortcutMenu::updateShortcuts()
 {
 	setTitle( m_seq.toString() + ",..." );
 	
@@ -71,7 +71,7 @@
 	}
 }
 
-void KShortcutMenu::keyPressEvent( QKeyEvent* pEvent )
+void K3ShortcutMenu::keyPressEvent( QKeyEvent* pEvent )
 {
 	kdDebug() << "keypress; " << pEvent->key() << endl;
 	KKey key( pEvent );
@@ -110,7 +110,7 @@
 	}
 }
 
-int KShortcutMenu::searchForKey( KKey key )
+int K3ShortcutMenu::searchForKey( KKey key )
 {
 	int iItemFound = -1; // -1 indicates no match
 	uint iKey = m_seq.count();
@@ -131,7 +131,7 @@
 	return iItemFound;
 }
 
-void KShortcutMenu::keepItemsMatching( KKey key )
+void K3ShortcutMenu::keepItemsMatching( KKey key )
 {
 	kdDebug(125) << "MyAccel::keepItemsMatching( " << key.toStringInternal() << " )" << endl;
 	
@@ -150,5 +150,3 @@
 	
 	updateShortcuts();
 }
-
-#include "kshortcutmenu.moc"
--- trunk/KDE/kdelibs/kde3support/kdecore/k3shortcutmenu.h #458605:458606
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KSHORTCUTMENU_H
-#define __KSHORTCUTMENU_H
+#ifndef __K3SHORTCUTMENU_H
+#define __K3SHORTCUTMENU_H
 
 #include <qmap.h>
 #include <q3popupmenu.h>
@@ -30,11 +30,11 @@
 /**
  * @internal
  */
-class KDECORE_EXPORT KShortcutMenu : public Q3PopupMenu
+class KDECORE_EXPORT K3ShortcutMenu : public Q3PopupMenu
 {
 	Q_OBJECT
  public:
-	KShortcutMenu( QWidget* pParent, KAccelActions* pActions, KKeySequence seq );
+	K3ShortcutMenu( QWidget* pParent, KAccelActions* pActions, KKeySequence seq );
 
 	bool insertAction( uint iAction, KKeySequence seq );
 
@@ -55,4 +55,4 @@
 	IndexToKKeySequence m_seqs;
 };
 
-#endif // __KSHORTCUTMENU_H
+#endif // __K3ShortcutMenu_H
[prev in list] [next in list] [prev in thread] [next in thread]