Qt: includes barrier fix.

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

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 45d116bbaed4e561515ce80fcb20f31f13b75dbc..62a26c5dfddb360775539feccb79fd0dec0eba64 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _QVLC_H_
-#define _QVLC_H_
+#ifndef QVLC_H_
+#define QVLC_H_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -68,16 +68,21 @@ struct intf_sys_t
 
     bool b_isDialogProvider; /* Qt mode or Skins mode */
 
+    int  i_screenHeight;     /* Detection of Small screens */
+
     playlist_t *p_playlist;  /* Core Playlist discussion */
 
     const char *psz_filepath; /* Last path used in dialogs */
 
     QMenu * p_popup_menu;    /* The right click menu */
+#ifdef Q_WS_X11 /* WTH is this included in ALL files? :( */
+    void *display;
+#endif
 };
 
 #define THEPL p_intf->p_sys->p_playlist
-#define QPL_LOCK vlc_object_lock( THEPL );
-#define QPL_UNLOCK vlc_object_unlock( THEPL );
+#define QPL_LOCK playlist_Lock( THEPL );
+#define QPL_UNLOCK playlist_Unlock( THEPL );
 
 #define THEDP DialogsProvider::getInstance()
 #define THEMIM MainInputManager::getInstance( p_intf )