[vlc-commits] Qt, controller: cosmetics

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr 22 13:59:40 2011 +0200| [3dcf9aca431b27ae3c119e594d4c51b6b165d2b0] | committer: Jean-Baptiste Kempf

Qt, controller: cosmetics

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

 modules/gui/qt4/components/controller.cpp |    6 +++---
 modules/gui/qt4/dialogs/toolbar.hpp       |   17 ++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index ae84b28..24ec1d3 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -26,9 +26,9 @@
 # include "config.h"
 #endif
 
-#include <vlc_vout.h>
-#include <vlc_keys.h>
+#include <vlc_vout.h>                       /* vout_thread_t for FSC */
 
+/* Widgets */
 #include "components/controller.hpp"
 #include "components/controller_widget.hpp"
 #include "components/interface_widgets.hpp"
@@ -736,8 +736,8 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QWi
 
     /* hiding timer */
     p_hideTimer = new QTimer( this );
-    CONNECT( p_hideTimer, timeout(), this, hideFSC() );
     p_hideTimer->setSingleShot( true );
+    CONNECT( p_hideTimer, timeout(), this, hideFSC() );
 
     /* slow hiding timer */
 #if HAVE_TRANSPARENCY
diff --git a/modules/gui/qt4/dialogs/toolbar.hpp b/modules/gui/qt4/dialogs/toolbar.hpp
index 59ccd6e..768632e 100644
--- a/modules/gui/qt4/dialogs/toolbar.hpp
+++ b/modules/gui/qt4/dialogs/toolbar.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * ToolbarEdit.hpp : ToolbarEdit dialogs
  ****************************************************************************
- * Copyright (C) 2008-2009 the VideoLAN team
+ * Copyright (C) 2008-2011 the VideoLAN team
  * $Id$
  *
  * Authors: Jean-Baptiste Kempf <jb (at) videolan.org>
@@ -24,8 +24,8 @@
 #ifndef QVLC_TOOLBAREDIT_DIALOG_H_
 #define QVLC_TOOLBAREDIT_DIALOG_H_ 1
 
-#include "util/qvlcframe.hpp"
-#include "components/controller.hpp"
+#include "util/qvlcframe.hpp"                                 /* QVLCDialog */
+#include "components/controller.hpp"                  /* AbstractController */
 
 #include <QListWidget>
 #include <QCheckBox>
@@ -43,7 +43,6 @@
 
 class ToolbarEditDialog;
 class DroppingController;
-class QCheckBox;
 class QComboBox;
 class QRubberBand;
 
@@ -67,8 +66,8 @@ public:
                         bigBox->isChecked() * WIDGET_BIG +
                         !shinyBox->isChecked() * WIDGET_SHINY; }
     virtual ~ToolbarEditDialog();
-private:
 
+private:
     QCheckBox *flatBox, *bigBox, *shinyBox;
     QComboBox *positionCombo, *profileCombo;
 
@@ -103,7 +102,8 @@ protected:
 
     virtual void doAction( int );
 
-    bool eventFilter( QObject *, QEvent * );
+    virtual bool eventFilter( QObject *, QEvent * );
+
 private:
     struct doubleInt
     {
@@ -112,12 +112,11 @@ private:
     };
     QRubberBand *rubberband;
     QList <doubleInt *> widgetList;
-    int i_dragIndex;
-
-    int getParentPosInLayout( QPoint point);
 
+    int i_dragIndex;
     bool b_draging;
 
+    int getParentPosInLayout( QPoint point);
 };
 
 #endif