[vlc-devel] commit: Qt4: main_interface, cleaning (Jean-Baptiste Kempf )
git version control
git at videolan.org
Tue Apr 21 00:58:07 CEST 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 21 00:52:26 2009 +0200| [1921905891a8c06de5435ed151db14df458489da] | committer: Jean-Baptiste Kempf
Qt4: main_interface, cleaning
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1921905891a8c06de5435ed151db14df458489da
---
modules/gui/qt4/main_interface.hpp | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 5aa5343..e61fa9c 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -90,13 +90,16 @@ public:
virtual QSize sizeHint() const;
protected:
-// void resizeEvent( QResizeEvent * );
- void dropEvent( QDropEvent *);
void dropEventPlay( QDropEvent *, bool);
- void dragEnterEvent( QDragEnterEvent * );
- void dragMoveEvent( QDragMoveEvent * );
- void dragLeaveEvent( QDragLeaveEvent * );
- void closeEvent( QCloseEvent *);
+ virtual void dropEvent( QDropEvent *);
+ virtual void dragEnterEvent( QDragEnterEvent * );
+ virtual void dragMoveEvent( QDragMoveEvent * );
+ virtual void dragLeaveEvent( QDragLeaveEvent * );
+ virtual void closeEvent( QCloseEvent *);
+ virtual void customEvent( QEvent *);
+ virtual void keyPressEvent( QKeyEvent *);
+ virtual void wheelEvent( QWheelEvent * );
+ virtual void resizeEvent( QResizeEvent * event );
private:
QSettings *settings;
@@ -111,6 +114,7 @@ private:
void createMainWidget( QSettings* );
void createStatusBar();
+
void askForPrivacy();
int privacyDialog( QList<ConfigControl *> *controls );
@@ -145,11 +149,6 @@ private:
QLabel *nameLabel;
QLabel *cryptedLabel;
- virtual void customEvent( QEvent *);
- virtual void keyPressEvent( QKeyEvent *);
- virtual void wheelEvent( QWheelEvent * );
- virtual void resizeEvent( QResizeEvent * event );
-
public slots:
void undockPlaylist();
void dockPlaylist( pl_dock_e i_pos = PL_BOTTOM );
More information about the vlc-devel
mailing list