summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-10 11:04:16 (UTC)
committer zecke <zecke>2004-09-10 11:04:16 (UTC)
commit2ec724fc789cd34f6b3743896516f2fef2731456 (patch) (unidiff)
tree67830cb237efa4201ff530bb0c66e496222a5fd3
parent29ed6115bd14aa95d29cf922fd179a6e470b5d53 (diff)
downloadopie-2ec724fc789cd34f6b3743896516f2fef2731456.zip
opie-2ec724fc789cd34f6b3743896516f2fef2731456.tar.gz
opie-2ec724fc789cd34f6b3743896516f2fef2731456.tar.bz2
Move handleWidget of OKeyConfigManager to a slot
Add some @see statements to the OKeyConfigManager
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/okeyconfigmanager.cpp10
-rw-r--r--libopie2/opiecore/okeyconfigmanager.h7
2 files changed, 14 insertions, 3 deletions
diff --git a/libopie2/opiecore/okeyconfigmanager.cpp b/libopie2/opiecore/okeyconfigmanager.cpp
index ccb96cc..891cda7 100644
--- a/libopie2/opiecore/okeyconfigmanager.cpp
+++ b/libopie2/opiecore/okeyconfigmanager.cpp
@@ -637,8 +637,11 @@ Opie::Core::OKeyConfigItem::List OKeyConfigManager::keyConfigList()const{
637 637
638/** 638/**
639 * Add this OKeyPair to the blackList. 639 * Add this OKeyPair to the blackList.
640 * Internal lists will be destroyed 640 * Internal lists will be destroyed
641 *
642 * @see clearBlackList
643 * @see removeFromBlackList
641 */ 644 */
642void OKeyConfigManager::addToBlackList( const OKeyPair& key) { 645void OKeyConfigManager::addToBlackList( const OKeyPair& key) {
643 m_blackKeys.append( key ); 646 m_blackKeys.append( key );
644 delete m_map; m_map = 0; 647 delete m_map; m_map = 0;
@@ -647,8 +650,11 @@ void OKeyConfigManager::addToBlackList( const OKeyPair& key) {
647 650
648/** 651/**
649 * Remove this OKeyPair from the black List 652 * Remove this OKeyPair from the black List
650 * Internal lists will be destroyed 653 * Internal lists will be destroyed
654 *
655 * @see addToBlackList
656 * @see clearBlackList
651 */ 657 */
652void OKeyConfigManager::removeFromBlackList( const OKeyPair& key ) { 658void OKeyConfigManager::removeFromBlackList( const OKeyPair& key ) {
653 m_blackKeys.remove( key ); 659 m_blackKeys.remove( key );
654 delete m_map; m_map = 0; 660 delete m_map; m_map = 0;
@@ -665,8 +671,12 @@ void OKeyConfigManager::clearBlackList() {
665 671
666 672
667/** 673/**
668 * Return a copy of the blackList 674 * Return a copy of the blackList
675 *
676 * @see addToBlackList
677 * @see clearBlackList
678 * @see removeFromBlackList
669 */ 679 */
670OKeyPair::List OKeyConfigManager::blackList()const { 680OKeyPair::List OKeyConfigManager::blackList()const {
671 return m_blackKeys; 681 return m_blackKeys;
672} 682}
diff --git a/libopie2/opiecore/okeyconfigmanager.h b/libopie2/opiecore/okeyconfigmanager.h
index d0a6247..12804ee 100644
--- a/libopie2/opiecore/okeyconfigmanager.h
+++ b/libopie2/opiecore/okeyconfigmanager.h
@@ -65,9 +65,9 @@ private:
65 * It consists out of a Text exposed to the user, Config Key Item, 65 * It consists out of a Text exposed to the user, Config Key Item,
66 * Pixmap, A default OKeyPair and the set OKeyPair. 66 * Pixmap, A default OKeyPair and the set OKeyPair.
67 * You can also pass an id to it 67 * You can also pass an id to it
68 * 68 *
69 * @since 1.1.2 69 * @since 1.2
70 */ 70 */
71class OKeyConfigItem { 71class OKeyConfigItem {
72 friend class OKeyConfigManager; 72 friend class OKeyConfigManager;
73public: 73public:
@@ -155,11 +155,14 @@ public:
155 bool grabkeyboard = false, QObject * par = 0, 155 bool grabkeyboard = false, QObject * par = 0,
156 const char* name = 0 ); 156 const char* name = 0 );
157 virtual ~OKeyConfigManager(); 157 virtual ~OKeyConfigManager();
158 158
159public slots:
159 virtual void load(); 160 virtual void load();
160 virtual void save(); 161 virtual void save();
162 void handleWidget( QWidget* );
161 163
164public:
162 virtual OKeyConfigItem handleKeyEvent( QKeyEvent* ); 165 virtual OKeyConfigItem handleKeyEvent( QKeyEvent* );
163 int handleKeyEventId( QKeyEvent* ); 166 int handleKeyEventId( QKeyEvent* );
164 167
165 void addKeyConfig( const OKeyConfigItem& ); 168 void addKeyConfig( const OKeyConfigItem& );
@@ -170,10 +173,8 @@ public:
170 void removeFromBlackList( const OKeyPair& ); 173 void removeFromBlackList( const OKeyPair& );
171 void clearBlackList(); 174 void clearBlackList();
172 OKeyPair::List blackList()const; 175 OKeyPair::List blackList()const;
173 176
174 void handleWidget( QWidget* );
175
176 bool eventFilter( QObject*, QEvent* ); 177 bool eventFilter( QObject*, QEvent* );
177 178
178 /** 179 /**
179 * Sets the event mask flags aMask. 180 * Sets the event mask flags aMask.