More cleaning
authorJean-Baptiste Kempf <jb@videolan.org>
Thu, 1 Oct 2009 18:06:34 +0000 (20:06 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 1 Oct 2009 20:19:07 +0000 (22:19 +0200)
modules/gui/qt4/main_interface.hpp

index 10db367..00483ab 100644 (file)
@@ -103,15 +103,6 @@ protected:
     virtual void resizeEvent( QResizeEvent * event );
 
 private:
-    QSettings           *settings;
-    QSystemTrayIcon     *sysTray;
-    QMenu               *systrayMenu;
-    QString              input_name;
-    QGridLayout         *mainLayout;
-    ControlsWidget      *controls;
-    InputControlsWidget *inputC;
-    FullscreenControllerWidget *fullscreenControls;
-
     void createMainWidget( QSettings* );
     void createStatusBar();
 
@@ -122,7 +113,16 @@ private:
     void handleSystray();
     void createSystray();
     void initSystray();
+    bool isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
 
+    QSettings           *settings;
+    QSystemTrayIcon     *sysTray;
+    QMenu               *systrayMenu;
+    QString              input_name;
+    QGridLayout         *mainLayout;
+    ControlsWidget      *controls;
+    InputControlsWidget *inputC;
+    FullscreenControllerWidget *fullscreenControls;
 
     /* Video */
     VideoWidget         *videoWidget;
@@ -131,6 +131,11 @@ private:
     VisualSelector      *visualSelector;
     PlaylistWidget      *playlistWidget;
 
+    /* Status Bar */
+    QLabel              *nameLabel;
+    QLabel              *cryptedLabel;
+
+    /* Status and flags */
     bool                 videoIsActive;       ///< Having a video now / THEMIM->hasV
     bool                 videoEmbeddedFlag;   ///< Want an external Video Window
     bool                 playlistVisible;     ///< Is the playlist visible ?
@@ -142,14 +147,9 @@ private:
     QSize                mainVideoSize;       ///< Wnd with video (all modes)
     int                  i_visualmode;        ///< Visual Mode
     pl_dock_e            i_pl_dock;
-    bool                 isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
     int                  i_bg_height;         ///< Save height of bgWidget
     bool                 b_shouldHide;
 
-    /* Status Bar */
-    QLabel              *nameLabel;
-    QLabel              *cryptedLabel;
-
 #ifdef WIN32
     HIMAGELIST himl;
     LPTASKBARLIST3 p_taskbl;