Changeset 575 for branches/midiAutosense/libs/hydrogen/src/preferences.cpp

Timestamp:

10/16/08 19:54:32 (5 years ago)

Author:

smoors

Message:

renamed action-class to "Action" as a preparation for merge with trunk

Files:

• branches/midiAutosense/libs/hydrogen/src/preferences.cpp (modified) (7 diffs)

branches/midiAutosense/libs/hydrogen/src/preferences.cpp

@@ -478 +478 @@
                                                 QString s_param = pMidiEventNode->FirstChild("parameter")->FirstChild()->Value();
         
-                                                action * pAction = new action( s_action );
+                                                Action * pAction = new Action( s_action );
 
                                                 pAction->setParameter1( s_param );
@@ -496 +496 @@
                                                 QString s_eventParameter = pMidiEventNode->FirstChild("eventParameter")->FirstChild()->Value();
         
-                                                action * pAction = new action( s_action );
+                                                Action * pAction = new Action( s_action );
 
                                                 pAction->setParameter1( s_param );
@@ -512 +512 @@
                                                 QString s_eventParameter = pMidiEventNode->FirstChild("eventParameter")->FirstChild()->Value();
         
-                                                action * pAction = new action( s_action );
+                                                Action * pAction = new Action( s_action );
 
                                                 pAction->setParameter1( s_param );
@@ -809 +809 @@
 
         midiMap * mM = midiMap::getInstance();
-        std::map< QString , action *> mmcMap = mM->getMMCMap();
+        std::map< QString , Action *> mmcMap = mM->getMMCMap();
 
 
@@ -816 +816 @@
         {
                 
-                std::map< QString , action *>::iterator dIter( mmcMap.begin() );
+                std::map< QString , Action *>::iterator dIter( mmcMap.begin() );
                 for( dIter = mmcMap.begin(); dIter != mmcMap.end(); dIter++ ){
                         
                         QString event;
-                        action * pAction;
+                        Action * pAction;
 
                         event = dIter->first;
@@ -842 +842 @@
                 
                 for( int note=0; note < 128; note++ ){
-                        action * pAction = mM->getNoteAction( note );
+                        Action * pAction = mM->getNoteAction( note );
                         if( pAction != NULL && pAction->getType() != "NOTHING")
                         {
@@ -860 +860 @@
 
                 for( int parameter=0; parameter < 128; parameter++ ){
-                        action * pAction = mM->getCCAction( parameter );
+                        Action * pAction = mM->getCCAction( parameter );
                         if( pAction != NULL && pAction->getType() != "NOTHING")
                         {