Attachment #447024 for bug #587954

Lines 25-30 Link Here

(-)a/modules/gui/qt4/actions_manager.cpp (+2 lines)
25	# include "config.h"	25	# include "config.h"
26	#endif	26	#endif
27		27
		28	#include "qt4.hpp"
		29
28	#include <vlc_vout.h>	30	#include <vlc_vout.h>
29	#include <vlc_keys.h>	31	#include <vlc_keys.h>
30		32




 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 *****************************************************************************/

#include "seekpoints.hpp"

#include "recents.hpp"
#include "dialogs_provider.hpp"
#include "menus.hpp"

#include "seekpoints.hpp"

#include "qt4.hpp"
#include "input_manager.hpp"

SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :

Lines 22-30 Link Here

(-)a/modules/gui/qt4/adapters/seekpoints.hpp (-3 / +1 lines)
22	#ifndef SEEKPOINTS_HPP	22	#ifndef SEEKPOINTS_HPP
23	#define SEEKPOINTS_HPP	23	#define SEEKPOINTS_HPP
24		24
25	#ifdef HAVE_CONFIG_H	25	#include "qt4.hpp"
26	#include "config.h"
27	#endif
28		26
29	#include <vlc_common.h>	27	#include <vlc_common.h>
30	#include <vlc_interface.h>	28	#include <vlc_interface.h>

Lines 26-31 Link Here

(-)a/modules/gui/qt4/components/controller.cpp (+2 lines)
26	# include "config.h"	26	# include "config.h"
27	#endif	27	#endif
28		28
		29	#include "qt4.hpp"
		30
29	#include <vlc_vout.h> /* vout_thread_t for FSC */	31	#include <vlc_vout.h> /* vout_thread_t for FSC */
30		32
31	/* Widgets */	33	/* Widgets */

Lines 25-33 Link Here

(-)a/modules/gui/qt4/components/playlist/playlist_model.hpp (-3 / +1 lines)
25	#ifndef _PLAYLIST_MODEL_H_	25	#ifndef _PLAYLIST_MODEL_H_
26	#define _PLAYLIST_MODEL_H_	26	#define _PLAYLIST_MODEL_H_
27		27
28	#ifdef HAVE_CONFIG_H	28	#include "qt4.hpp"
29	# include "config.h"
30	#endif
31		29
32	#include <vlc_input.h>	30	#include <vlc_input.h>
33	#include <vlc_playlist.h>	31	#include <vlc_playlist.h>

Lines 21-26 Link Here

(-)a/modules/gui/qt4/components/playlist/views.cpp (+6 lines)
21	* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.	21	* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
22	*****************************************************************************/	22	*****************************************************************************/
23		23
		24	#ifdef HAVE_CONFIG_H
		25	#include "config.h"
		26	#endif
		27
		28	#include "qt4.hpp"
		29
24	#include "components/playlist/views.hpp"	30	#include "components/playlist/views.hpp"
25	#include "components/playlist/vlc_model.hpp" /* VLCModel */	31	#include "components/playlist/vlc_model.hpp" /* VLCModel */
26	#include "components/playlist/sorting.h" /* Columns List */	32	#include "components/playlist/sorting.h" /* Columns List */

Lines 24-29 Link Here

(-)a/modules/gui/qt4/dialogs/messages.cpp (+2 lines)
24	# include "config.h"	24	# include "config.h"
25	#endif	25	#endif
26		26
		27	#include "qt4.hpp"
		28
27	#include "dialogs/messages.hpp"	29	#include "dialogs/messages.hpp"
28		30
29	#include <QPlainTextEdit>	31	#include <QPlainTextEdit>

Lines 23-32 Link Here

(-)a/modules/gui/qt4/dialogs/vlm.cpp (-4 lines)
23	* Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.	23	* Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
24	*****************************************************************************/	24	*****************************************************************************/
25		25
26	#ifdef HAVE_CONFIG_H
27	# include "config.h"
28	#endif
29
30	#include "dialogs/vlm.hpp"	26	#include "dialogs/vlm.hpp"
31		27
32	#ifdef ENABLE_VLM	28	#ifdef ENABLE_VLM

Lines 25-32 Link Here

(-)a/modules/gui/qt4/dialogs/vlm.hpp (-1 / +3 lines)
25	#ifndef QVLC_VLM_DIALOG_H_	25	#ifndef QVLC_VLM_DIALOG_H_
26	#define QVLC_VLM_DIALOG_H_ 1	26	#define QVLC_VLM_DIALOG_H_ 1
27		27
		28	#include "qt4.hpp"
		29
28	#ifdef HAVE_CONFIG_H	30	#ifdef HAVE_CONFIG_H
29	# include "config.h"	31	#include "config.h"
30	#endif	32	#endif
31		33
32	#ifdef ENABLE_VLM	34	#ifdef ENABLE_VLM

Lines 30-35 Link Here

(-)a/modules/gui/qt4/input_manager.cpp (+2 lines)
30	# include "config.h"	30	# include "config.h"
31	#endif	31	#endif
32		32
		33	#include "qt4.hpp"
		34
33	#include "input_manager.hpp"	35	#include "input_manager.hpp"
34	#include "recents.hpp"	36	#include "recents.hpp"
35		37

Lines 29-37 Link Here

(-)a/modules/gui/qt4/input_manager.hpp (-1 / +2 lines)
29	# include "config.h"	29	# include "config.h"
30	#endif	30	#endif
31		31
		32	#include "qt4.hpp"
		33
32	#include <vlc_input.h>	34	#include <vlc_input.h>
33		35
34	#include "qt4.hpp"
35	#include "util/singleton.hpp"	36	#include "util/singleton.hpp"
36	#include "adapters/variables.hpp"	37	#include "adapters/variables.hpp"
37		38

Lines 34-39 Link Here

(-)a/modules/gui/qt4/menus.cpp (+2 lines)
34	# include "config.h"	34	# include "config.h"
35	#endif	35	#endif
36		36
		37	#include "qt4.hpp"
		38
37	#include <vlc_common.h>	39	#include <vlc_common.h>
38	#include <vlc_intf_strings.h>	40	#include <vlc_intf_strings.h>
39	#include <vlc_vout.h> /* vout_thread_t */	41	#include <vlc_vout.h> /* vout_thread_t */




# include "config.h"
#endif

#include <QtGlobal>
#include <vlc_interface.h> /* intf_thread_t */
#include <vlc_playlist.h>  /* playlist_t */

#define QT_NO_CAST_TO_ASCII
#include <QString>

#if ( QT_VERSION < 0x040600 )
# error Update your Qt version to at least 4.6.0

#define HAS_QT47 ( QT_VERSION >= 0x040700 )
#define HAS_QT5  ( QT_VERSION >= 0x050000 )

#if HAS_QT5
  #include <QtCore/qcompilerdetection.h>
  #if defined(Q_COMPILER_ATOMICS) && \
             ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
   #define VLC_ATOMIC_H
   #include <atomic>
   using namespace std;
   #  define atomic_store(object,desired) \
      do { \
          *(object) = (desired); \
          __sync_synchronize(); \
      } while (0)

   #  define atomic_load(object) \
       (__sync_synchronize(), *(object))
  #endif
#endif

#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
#include <vlc_interface.h> /* intf_thread_t */
#include <vlc_playlist.h>  /* playlist_t */

#define QT_NO_CAST_TO_ASCII
#include <QString>

enum {
    DialogEventTypeOffset = 0,
    IMEventTypeOffset     = 100,

Lines 29-34 Link Here

(-)a/modules/gui/qt4/util/pictureflow.cpp (+2 lines)
29	THE SOFTWARE.	29	THE SOFTWARE.
30	*/	30	*/
31		31
		32	#include "qt4.hpp"
		33
32	#include "pictureflow.hpp"	34	#include "pictureflow.hpp"
33		35
34	#include <QApplication>	36	#include <QApplication>

Lines 30-35 Link Here

(-)a/modules/visualization/projectm.cpp (-1 / +4 lines)
30	#endif	30	#endif
31		31
32	#include <assert.h>	32	#include <assert.h>
		33	#if defined(__GNUC__) && \
		34	( __GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
		35	#define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
		36	#endif
33		37
34	#include <vlc_common.h>	38	#include <vlc_common.h>
35	#include <vlc_plugin.h>	39	#include <vlc_plugin.h>
36	-

Return to bug 587954

Lines 29-40 Link Here

(-)a/modules/gui/qt4/qt4.hpp (-6 / +26 lines)
29	# include "config.h"	29	# include "config.h"
30	#endif	30	#endif
31		31
32	#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */	32	#include <QtGlobal>
33	#include <vlc_interface.h> /* intf_thread_t */
34	#include <vlc_playlist.h> /* playlist_t */
35
36	#define QT_NO_CAST_TO_ASCII
37	#include <QString>
38		33
39	#if ( QT_VERSION < 0x040600 )	34	#if ( QT_VERSION < 0x040600 )
40	# error Update your Qt version to at least 4.6.0	35	# error Update your Qt version to at least 4.6.0
Lines 43-48 Link Here
43	#define HAS_QT47 ( QT_VERSION >= 0x040700 )	38	#define HAS_QT47 ( QT_VERSION >= 0x040700 )
44	#define HAS_QT5 ( QT_VERSION >= 0x050000 )	39	#define HAS_QT5 ( QT_VERSION >= 0x050000 )
45		40
		41	#if HAS_QT5
		42	#include <QtCore/qcompilerdetection.h>
		43	#if defined(Q_COMPILER_ATOMICS) && \
		44	( __GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
		45	#define VLC_ATOMIC_H
		46	#include <atomic>
		47	using namespace std;
		48	# define atomic_store(object,desired) \
		49	do { \
		50	*(object) = (desired); \
		51	__sync_synchronize(); \
		52	} while (0)
		53
		54	# define atomic_load(object) \
		55	(__sync_synchronize(), *(object))
		56	#endif
		57	#endif
		58
		59	#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */
		60	#include <vlc_interface.h> /* intf_thread_t */
		61	#include <vlc_playlist.h> /* playlist_t */
		62
		63	#define QT_NO_CAST_TO_ASCII
		64	#include <QString>
		65
46	enum {	66	enum {
47	DialogEventTypeOffset = 0,	67	DialogEventTypeOffset = 0,
48	IMEventTypeOffset = 100,	68	IMEventTypeOffset = 100,