Commit 62dc9260 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: cosmetic on Main_Interface.

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 212ac2d4
...@@ -151,15 +151,14 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -151,15 +151,14 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
**************************/ **************************/
/* Connect the input manager to the GUI elements it manages */ /* Connect the input manager to the GUI elements it manages */
/** /**
* Connects on nameChanged() * Connects on nameChanged()
* Those connects are not merged because different options can trigger * Those connects are not merged because different options can trigger
* them down. * them down.
*/ */
/* Naming in the controller statusbar */ /* Naming in the controller statusbar */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this, CONNECT( THEMIM->getIM(), nameChanged( QString ),
setName( QString ) ); this, setName( QString ) );
/* and in the systray */ /* and in the systray */
if( sysTray ) if( sysTray )
{ {
......
...@@ -66,7 +66,6 @@ class MainInterface : public QVLCMW ...@@ -66,7 +66,6 @@ class MainInterface : public QVLCMW
{ {
Q_OBJECT; Q_OBJECT;
friend class VolumeClickHandler;
friend class InteractionDialog; friend class InteractionDialog;
friend class PlaylistWidget; friend class PlaylistWidget;
...@@ -87,7 +86,8 @@ public: ...@@ -87,7 +86,8 @@ public:
int getControlsVisibilityStatus(); int getControlsVisibilityStatus();
/* Sizehint() */ /* Sizehint() */
QSize sizeHint() const; virtual QSize sizeHint() const;
protected: protected:
// void resizeEvent( QResizeEvent * ); // void resizeEvent( QResizeEvent * );
void dropEvent( QDropEvent *); void dropEvent( QDropEvent *);
...@@ -105,8 +105,6 @@ private: ...@@ -105,8 +105,6 @@ private:
QVBoxLayout *mainLayout; QVBoxLayout *mainLayout;
ControlsWidget *controls; ControlsWidget *controls;
FullscreenControllerWidget *fullscreenControls; FullscreenControllerWidget *fullscreenControls;
QMenu *speedControlMenu;
SpeedControlWidget *speedControl;
void handleMainUi( QSettings* ); void handleMainUi( QSettings* );
void askForPrivacy(); void askForPrivacy();
...@@ -115,9 +113,9 @@ private: ...@@ -115,9 +113,9 @@ private:
/* Systray */ /* Systray */
void handleSystray(); void handleSystray();
void createSystray(); void createSystray();
void initSystray();
void createStatusBar(); void createStatusBar();
void initSystray();
/* Video */ /* Video */
VideoWidget *videoWidget; VideoWidget *videoWidget;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment