[vlc-commits] Qt: cosmetics and update copyright for ActionsManager
Jean-Baptiste Kempf
git at videolan.org
Sun May 18 13:34:10 CEST 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun May 18 13:32:20 2014 +0200| [c5f17c47b86397c145800759b04343658c0e1d3f] | committer: Jean-Baptiste Kempf
Qt: cosmetics and update copyright for ActionsManager
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5f17c47b86397c145800759b04343658c0e1d3f
---
modules/gui/qt4/actions_manager.cpp | 21 ++++++++++-----------
modules/gui/qt4/actions_manager.hpp | 2 +-
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
index 99e984b..8b79da6 100644
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/modules/gui/qt4/actions_manager.cpp
@@ -1,11 +1,10 @@
/*****************************************************************************
* actions_manager.cpp : Controller for the main interface
****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright © 2009-2014 VideoLAN and VLC authors
* $Id$
*
* Authors: Jean-Baptiste Kempf <jb at videolan.org>
- * Ilkka Ollakka <ileoo at videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,9 +29,10 @@
#include <vlc_keys.h>
#include "actions_manager.hpp"
-#include "dialogs_provider.hpp" /* Opening Dialogs */
-#include "input_manager.hpp"
-#include "main_interface.hpp" /* Show playlist */
+
+#include "dialogs_provider.hpp" /* Opening Dialogs */
+#include "input_manager.hpp" /* THEMIM */
+#include "main_interface.hpp" /* Show playlist */
#include "components/controller.hpp" /* Toggle FSC controller width */
ActionsManager::ActionsManager( intf_thread_t * _p_i )
@@ -40,8 +40,6 @@ ActionsManager::ActionsManager( intf_thread_t * _p_i )
p_intf = _p_i;
}
-ActionsManager::~ActionsManager(){}
-
void ActionsManager::doAction( int id_action )
{
switch( id_action )
@@ -95,7 +93,7 @@ void ActionsManager::doAction( int id_action )
p_intf->p_sys->p_mi->getFullscreenControllerWidget()->toggleFullwidth();
break;
default:
- msg_Dbg( p_intf, "Action: %i", id_action );
+ msg_Warn( p_intf, "Action not supported: %i", id_action );
break;
}
}
@@ -112,10 +110,10 @@ void ActionsManager::play()
}
/**
- * TODO
+ * TODO
* This functions toggle the fullscreen mode
* If there is no video, it should first activate Visualisations...
- * This has also to be fixed in enableVideo()
+ * This has also to be fixed in enableVideo()
*/
void ActionsManager::fullscreen()
{
@@ -140,7 +138,8 @@ void ActionsManager::snapshot()
void ActionsManager::playlist()
{
- if( p_intf->p_sys->p_mi ) p_intf->p_sys->p_mi->togglePlaylist();
+ if( p_intf->p_sys->p_mi )
+ p_intf->p_sys->p_mi->togglePlaylist();
}
void ActionsManager::record()
diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp
index e397ac2..ad678c1 100644
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -69,7 +69,7 @@ public:
private:
ActionsManager( intf_thread_t *_p_i );
- virtual ~ActionsManager();
+ virtual ~ActionsManager() {}
intf_thread_t *p_intf;
More information about the vlc-commits
mailing list