[vlc-devel] commit: Qt: simplifications. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan 19 12:32:49 2009 +0100| [ea39325de0a0149cf6a894ea980bb483567e47c5] | committer: Jean-Baptiste Kempf 

Qt: simplifications.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea39325de0a0149cf6a894ea980bb483567e47c5
---

 modules/gui/qt4/actions_manager.cpp |   59 ++++++++---------------------------
 modules/gui/qt4/actions_manager.hpp |    9 +-----
 2 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
index 475049f..ca7b3c6 100644
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/modules/gui/qt4/actions_manager.cpp
@@ -50,32 +50,34 @@ void ActionsManager::doAction( int id_action )
     {
         case PLAY_ACTION:
             play(); break;
+        case STOP_ACTION:
+            THEMIM->stop(); break;
+        case OPEN_ACTION:
+            break;
         case PREVIOUS_ACTION:
-            prev(); break;
+            THEMIM->prev(); break;
         case NEXT_ACTION:
-            next(); break;
-        case STOP_ACTION:
-            stop(); break;
+            THEMIM->next(); break;
         case SLOWER_ACTION:
-            slower(); break;
+            THEMIM->getIM()->slower(); break;
         case FASTER_ACTION:
-            faster(); break;
+            THEMIM->getIM()->faster(); break;
         case FULLSCREEN_ACTION:
             fullscreen(); break;
         case EXTENDED_ACTION:
-            extSettings(); break;
+            THEDP->extendedDialog(); break;
         case PLAYLIST_ACTION:
             playlist(); break;
         case SNAPSHOT_ACTION:
             snapshot(); break;
         case RECORD_ACTION:
             record(); break;
-        case ATOB_ACTION:
-            THEMIM->getIM()->setAtoB(); break;
         case FRAME_ACTION:
             frame(); break;
+        case ATOB_ACTION:
+            THEMIM->getIM()->setAtoB(); break;
         case REVERSE_ACTION:
-            reverse(); break;
+            THEMIM->getIM()->reverse(); break;
         case SKIP_BACK_ACTION:
             var_SetInteger( p_intf->p_libvlc, "key-pressed",
                     ACTIONID_JUMP_BACKWARD_SHORT );
@@ -90,11 +92,6 @@ void ActionsManager::doAction( int id_action )
     }
 }
 
-inline void ActionsManager::stop()
-{
-    THEMIM->stop();
-}
-
 void ActionsManager::play()
 {
     if( THEPL->current.i_size == 0 )
@@ -106,16 +103,6 @@ void ActionsManager::play()
     THEMIM->togglePlayPause();
 }
 
-inline void ActionsManager::prev()
-{
-    THEMIM->prev();
-}
-
-inline void ActionsManager::next()
-{
-    THEMIM->next();
-}
-
 /**
   * TODO
  * This functions toggle the fullscreen mode
@@ -144,27 +131,7 @@ void ActionsManager::snapshot()
     }
 }
 
-inline void ActionsManager::extSettings()
-{
-    THEDP->extendedDialog();
-}
-
-inline void ActionsManager::reverse()
-{
-    THEMIM->getIM()->reverse();
-}
-
-inline void ActionsManager::slower()
-{
-    THEMIM->getIM()->slower();
-}
-
-inline void ActionsManager::faster()
-{
-    THEMIM->getIM()->faster();
-}
-
-inline void ActionsManager::playlist()
+void ActionsManager::playlist()
 {
     if( p_intf->p_sys->p_mi ) p_intf->p_sys->p_mi->togglePlaylist();
 }
diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp
index 45ef03a..6bef13f 100644
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -79,16 +79,9 @@ protected slots:
 
 protected slots:
     void play();
-    void stop();
-    void prev();
-    void next();
     void fullscreen();
-    void extSettings();
-    void faster();
-    void slower();
-    void reverse();
-    void playlist();
     void snapshot();
+    void playlist();
     void record();
     void frame();