A bunch of various fixes (encoding, refcount, layout)

[vlc] / modules / gui / qt4 / qt4.hpp

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 34a5d4a83efa56610cfcdd98c903036107d7265f..85d50c5206eec236ef8d7db07d46ae89708e717f 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * qt4.hpp : QT4 interface
  ****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
- * $Id: wxwidgets.cpp 15731 2006-05-25 14:43:53Z zorglub $
+ * Copyright (C) 2006 the VideoLAN team
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -28,17 +28,31 @@
 #include <QEvent>
 
 class QApplication;
+class QMenu;
 class MainInterface;
 class DialogsProvider;
+class VideoWidget;
 
 struct intf_sys_t
 {
     QApplication *p_app;
     MainInterface *p_mi;
-
+    playlist_t *p_playlist;
     msg_subscription_t *p_sub; ///< Subscription to the message bank
+
+    VideoWidget *p_video;
+    int i_saved_height, i_saved_width;
+
+    QMenu * p_popup_menu;
 };
 
+#define THEPL p_intf->p_sys->p_playlist
+#define THEDP DialogsProvider::getInstance()
+#define THEMIM MainInputManager::getInstance( NULL )
+
+#define qfu( i ) QString::fromUtf8( i )
+#define qtr( i ) QString::fromUtf8( _(i) )
+
 static int DialogEvent_Type = QEvent::User + 1;
 
 class DialogEvent : public QEvent