Attachment #409010 for bug #542528




++ b/src/core/boundfuturewatcher.h


#include <QFutureWatcher>

#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
#endif

template <typename T, typename D>
class BoundFutureWatcher : public QFutureWatcher<T>, boost::noncopyable {
++ b/src/core/database.cpp

#include "core/logging.h"
#include "core/taskmanager.h"

#ifndef Q_MOC_RUN
#include <boost/scope_exit.hpp>
#endif

#include <QCoreApplication>
#include <QDir>
++ b/src/core/macglobalshortcutbackend.mm

#include "mac_startup.h"
#import "mac_utilities.h"

#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
#endif

#include <QAction>
#include <QList>
++ b/src/core/mergedproxymodel.h

using std::placeholders::_1;
using std::placeholders::_2;

#ifndef Q_MOC_RUN
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/hashed_index.hpp>
#endif

using boost::multi_index::multi_index_container;
using boost::multi_index::indexed_by;
++ b/src/core/scopedtransaction.h

#ifndef SCOPEDTRANSACTION_H
#define SCOPEDTRANSACTION_H

#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
#endif

class QSqlDatabase;

++ b/src/core/signalchecker.h


#include <glib-object.h>

#ifndef Q_MOC_RUN
#include <boost/function_types/function_arity.hpp>
#include <boost/typeof/typeof.hpp>
#endif

// Do not call this directly, use CHECKED_GCONNECT instead.
bool CheckedGConnect(
++ b/src/devices/macdevicelister.mm

#import <Foundation/NSString.h>
#import <Foundation/NSURL.h>

#ifndef Q_MOC_RUN
#include <boost/scope_exit.hpp>
#endif

#include <libmtp.h>

++ b/src/library/groupbydialog.h

using std::placeholders::_1;
using std::placeholders::_2;

#ifndef Q_MOC_RUN
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/multi_index/ordered_index.hpp>
#endif

#include "librarymodel.h"

++ b/tests/database_test.cpp


#include "core/database.h"

#ifndef Q_MOC_RUN
#include <boost/scoped_ptr.hpp>
#endif

#include <QtDebug>
#include <QSqlQuery>
++ b/tests/librarybackend_test.cpp

#include "core/song.h"
#include "core/database.h"

#ifndef Q_MOC_RUN
#include <boost/scoped_ptr.hpp>
#endif

#include <QFileInfo>
#include <QSignalSpy>
++ b/tests/plsparser_test.cpp

#include <QUrl>
#include <QtDebug>

#ifndef Q_MOC_RUN
#include <boost/shared_ptr.hpp>
#endif

using boost::shared_ptr;

++ b/tests/songloader_test.cpp

#include <QSignalSpy>
#include <QtDebug>

#ifndef Q_MOC_RUN
#include <boost/scoped_ptr.hpp>
#endif

#include <cstdlib>

using ::testing::_;
++ b/tests/songplaylistitem_test.cpp

#include "test_utils.h"

#include <gtest/gtest.h>

#ifndef Q_MOC_RUN
#include <boost/scoped_ptr.hpp>
#endif

#include <QTemporaryFile>
#include <QFileInfo>
++ b/tests/utilities_test.cpp


#include "core/utilities.h"

#ifndef Q_MOC_RUN
#include <boost/scoped_ptr.hpp>
#endif

#include <QtDebug>


Return to bug 542528

Line Link Here

(-)file_not_specified_in_diff (-14 / +44 lines)
0	-- a/src/core/boundfuturewatcher.h	0	++ b/src/core/boundfuturewatcher.h
Lines 3-9 Link Here
3		3
4	#include <QFutureWatcher>	4	#include <QFutureWatcher>
5		5
		6	#ifndef Q_MOC_RUN
6	#include <boost/noncopyable.hpp>	7	#include <boost/noncopyable.hpp>
		8	#endif
7		9
8	template <typename T, typename D>	10	template <typename T, typename D>
9	class BoundFutureWatcher : public QFutureWatcher<T>, boost::noncopyable {	11	class BoundFutureWatcher : public QFutureWatcher<T>, boost::noncopyable {
10	-- a/src/core/database.cpp	12	++ b/src/core/database.cpp
Lines 23-29 Link Here
23	#include "core/logging.h"	23	#include "core/logging.h"
24	#include "core/taskmanager.h"	24	#include "core/taskmanager.h"
25		25
		26	#ifndef Q_MOC_RUN
26	#include <boost/scope_exit.hpp>	27	#include <boost/scope_exit.hpp>
		28	#endif
27		29
28	#include <QCoreApplication>	30	#include <QCoreApplication>
29	#include <QDir>	31	#include <QDir>
30	-- a/src/core/macglobalshortcutbackend.mm	32	++ b/src/core/macglobalshortcutbackend.mm
Lines 22-28 Link Here
22	#include "mac_startup.h"	22	#include "mac_startup.h"
23	#import "mac_utilities.h"	23	#import "mac_utilities.h"
24		24
		25	#ifndef Q_MOC_RUN
25	#include <boost/noncopyable.hpp>	26	#include <boost/noncopyable.hpp>
		27	#endif
26		28
27	#include <QAction>	29	#include <QAction>
28	#include <QList>	30	#include <QList>
29	-- a/src/core/mergedproxymodel.h	31	++ b/src/core/mergedproxymodel.h
Lines 25-34 Link Here
25	using std::placeholders::_1;	25	using std::placeholders::_1;
26	using std::placeholders::_2;	26	using std::placeholders::_2;
27		27
		28	#ifndef Q_MOC_RUN
28	#include <boost/multi_index_container.hpp>	29	#include <boost/multi_index_container.hpp>
29	#include <boost/multi_index/member.hpp>	30	#include <boost/multi_index/member.hpp>
30	#include <boost/multi_index/ordered_index.hpp>	31	#include <boost/multi_index/ordered_index.hpp>
31	#include <boost/multi_index/hashed_index.hpp>	32	#include <boost/multi_index/hashed_index.hpp>
		33	#endif
32		34
33	using boost::multi_index::multi_index_container;	35	using boost::multi_index::multi_index_container;
34	using boost::multi_index::indexed_by;	36	using boost::multi_index::indexed_by;
35	-- a/src/core/scopedtransaction.h	37	++ b/src/core/scopedtransaction.h
Lines 18-24 Link Here
18	#ifndef SCOPEDTRANSACTION_H	18	#ifndef SCOPEDTRANSACTION_H
19	#define SCOPEDTRANSACTION_H	19	#define SCOPEDTRANSACTION_H
20		20
		21	#ifndef Q_MOC_RUN
21	#include <boost/noncopyable.hpp>	22	#include <boost/noncopyable.hpp>
		23	#endif
22		24
23	class QSqlDatabase;	25	class QSqlDatabase;
24		26
25	-- a/src/core/signalchecker.h	27	++ b/src/core/signalchecker.h
Lines 20-27 Link Here
20		20
21	#include <glib-object.h>	21	#include <glib-object.h>
22		22
		23	#ifndef Q_MOC_RUN
23	#include <boost/function_types/function_arity.hpp>	24	#include <boost/function_types/function_arity.hpp>
24	#include <boost/typeof/typeof.hpp>	25	#include <boost/typeof/typeof.hpp>
		26	#endif
25		27
26	// Do not call this directly, use CHECKED_GCONNECT instead.	28	// Do not call this directly, use CHECKED_GCONNECT instead.
27	bool CheckedGConnect(	29	bool CheckedGConnect(
28	-- a/src/devices/macdevicelister.mm	30	++ b/src/devices/macdevicelister.mm
Lines 38-44 Link Here
38	#import <Foundation/NSString.h>	38	#import <Foundation/NSString.h>
39	#import <Foundation/NSURL.h>	39	#import <Foundation/NSURL.h>
40		40
		41	#ifndef Q_MOC_RUN
41	#include <boost/scope_exit.hpp>	42	#include <boost/scope_exit.hpp>
		43	#endif
42		44
43	#include <libmtp.h>	45	#include <libmtp.h>
44		46
45	-- a/src/library/groupbydialog.h	47	++ b/src/library/groupbydialog.h
Lines 25-33 Link Here
25	using std::placeholders::_1;	25	using std::placeholders::_1;
26	using std::placeholders::_2;	26	using std::placeholders::_2;
27		27
		28	#ifndef Q_MOC_RUN
28	#include <boost/multi_index_container.hpp>	29	#include <boost/multi_index_container.hpp>
29	#include <boost/multi_index/member.hpp>	30	#include <boost/multi_index/member.hpp>
30	#include <boost/multi_index/ordered_index.hpp>	31	#include <boost/multi_index/ordered_index.hpp>
		32	#endif
31		33
32	#include "librarymodel.h"	34	#include "librarymodel.h"
33		35
34	-- a/tests/database_test.cpp	36	++ b/tests/database_test.cpp
Lines 20-26 Link Here
20		20
21	#include "core/database.h"	21	#include "core/database.h"
22		22
		23	#ifndef Q_MOC_RUN
23	#include <boost/scoped_ptr.hpp>	24	#include <boost/scoped_ptr.hpp>
		25	#endif
24		26
25	#include <QtDebug>	27	#include <QtDebug>
26	#include <QSqlQuery>	28	#include <QSqlQuery>
27	-- a/tests/librarybackend_test.cpp	29	++ b/tests/librarybackend_test.cpp
Lines 23-29 Link Here
23	#include "core/song.h"	23	#include "core/song.h"
24	#include "core/database.h"	24	#include "core/database.h"
25		25
		26	#ifndef Q_MOC_RUN
26	#include <boost/scoped_ptr.hpp>	27	#include <boost/scoped_ptr.hpp>
		28	#endif
27		29
28	#include <QFileInfo>	30	#include <QFileInfo>
29	#include <QSignalSpy>	31	#include <QSignalSpy>
30	-- a/tests/plsparser_test.cpp	32	++ b/tests/plsparser_test.cpp
Lines 27-33 Link Here
27	#include <QUrl>	27	#include <QUrl>
28	#include <QtDebug>	28	#include <QtDebug>
29		29
		30	#ifndef Q_MOC_RUN
30	#include <boost/shared_ptr.hpp>	31	#include <boost/shared_ptr.hpp>
		32	#endif
31		33
32	using boost::shared_ptr;	34	using boost::shared_ptr;
33		35
34	-- a/tests/songloader_test.cpp	36	++ b/tests/songloader_test.cpp
Lines 29-35 Link Here
29	#include <QSignalSpy>	29	#include <QSignalSpy>
30	#include <QtDebug>	30	#include <QtDebug>
31		31
		32	#ifndef Q_MOC_RUN
32	#include <boost/scoped_ptr.hpp>	33	#include <boost/scoped_ptr.hpp>
		34	#endif
		35
33	#include <cstdlib>	36	#include <cstdlib>
34		37
35	using ::testing::_;	38	using ::testing::_;
36	-- a/tests/songplaylistitem_test.cpp	39	++ b/tests/songplaylistitem_test.cpp
Lines 19-25 Link Here
19	#include "test_utils.h"	19	#include "test_utils.h"
20		20
21	#include <gtest/gtest.h>	21	#include <gtest/gtest.h>
		22
		23	#ifndef Q_MOC_RUN
22	#include <boost/scoped_ptr.hpp>	24	#include <boost/scoped_ptr.hpp>
		25	#endif
23		26
24	#include <QTemporaryFile>	27	#include <QTemporaryFile>
25	#include <QFileInfo>	28	#include <QFileInfo>
26	-- a/tests/utilities_test.cpp	29	++ b/tests/utilities_test.cpp
Lines 21-27 Link Here
21		21
22	#include "core/utilities.h"	22	#include "core/utilities.h"
23		23
		24	#ifndef Q_MOC_RUN
24	#include <boost/scoped_ptr.hpp>	25	#include <boost/scoped_ptr.hpp>
		26	#endif
25		27
26	#include <QtDebug>	28	#include <QtDebug>
27		29