Attachment #461832 for bug #607324

View | Details | Raw Unified | Return to bug 607324
Collapse All | Expand All

Lines 31-39 Link Here

(-)qbittorrent-3.1.12/src/geoip/geoipmanager.h (+2 lines)
31	#ifndef GEOIPMANAGER_H	31	#ifndef GEOIPMANAGER_H
32	#define GEOIPMANAGER_H	32	#define GEOIPMANAGER_H
33		33
		34	#ifndef Q_MOC_RUN
34	#include <libtorrent/session.hpp>	35	#include <libtorrent/session.hpp>
35	#include <QString>	36	#include <QString>
36	#include <QIcon>	37	#include <QIcon>
		38	#endif
37		39
38	class GeoIPManager : public QObject {	40	class GeoIPManager : public QObject {
39	Q_OBJECT	41	Q_OBJECT

Lines 28-33 Link Here

(-)qbittorrent-3.1.12/src/main.cpp (+3 lines)
28	* Contact : chris@qbittorrent.org	28	* Contact : chris@qbittorrent.org
29	*/	29	*/
30		30
		31	#ifndef Q_MOC_RUN
		32
31	#include <QLocale>	33	#include <QLocale>
32	#include <QTranslator>	34	#include <QTranslator>
33	#include <QFile>	35	#include <QFile>
Lines 74-79 Link Here
74	#include <stdlib.h>	76	#include <stdlib.h>
75	#include "misc.h"	77	#include "misc.h"
76	#include "preferences.h"	78	#include "preferences.h"
		79	#endif
77		80
78	#if defined(Q_OS_WIN) && !defined(QBT_HAS_GETCURRENTPID)	81	#if defined(Q_OS_WIN) && !defined(QBT_HAS_GETCURRENTPID)
79	#error You seem to have updated QtSingleApplication without porting our custom QtSingleApplication::getRunningPid() function. Please see previous version to understate how it works.	82	#error You seem to have updated QtSingleApplication without porting our custom QtSingleApplication::getRunningPid() function. Please see previous version to understate how it works.

Lines 31-38 Link Here

(-)qbittorrent-3.1.12/src/preferences/options_imp.h (+2 lines)
31	#ifndef OPTIONS_IMP_H	31	#ifndef OPTIONS_IMP_H
32	#define OPTIONS_IMP_H	32	#define OPTIONS_IMP_H
33		33
		34	#ifndef Q_MOC_RUN
34	#include "ui_options.h"	35	#include "ui_options.h"
35	#include <libtorrent/ip_filter.hpp>	36	#include <libtorrent/ip_filter.hpp>
		37	#endif
36		38
37	// actions on double-click on torrents	39	// actions on double-click on torrents
38	enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};	40	enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};

Lines 31-36 Link Here

(-)qbittorrent-3.1.12/src/properties/peeraddition.h (+3 lines)
31	#ifndef PEERADDITION_H	31	#ifndef PEERADDITION_H
32	#define PEERADDITION_H	32	#define PEERADDITION_H
33		33
		34	#ifndef Q_MOC_RUN
34	#include <QDialog>	35	#include <QDialog>
35	#include <QRegExp>	36	#include <QRegExp>
36	#include <QMessageBox>	37	#include <QMessageBox>
Lines 45-50 Link Here
45	#include <boost/asio/ip/tcp.hpp>	46	#include <boost/asio/ip/tcp.hpp>
46	#endif	47	#endif
47		48
		49	#endif
		50
48	class PeerAdditionDlg: public QDialog, private Ui::addPeerDialog {	51	class PeerAdditionDlg: public QDialog, private Ui::addPeerDialog {
49	Q_OBJECT	52	Q_OBJECT
50		53

Lines 31-36 Link Here

(-)qbittorrent-3.1.12/src/qtlibtorrent/filterparserthread.h (+2 lines)
31	#ifndef FILTERPARSERTHREAD_H	31	#ifndef FILTERPARSERTHREAD_H
32	#define FILTERPARSERTHREAD_H	32	#define FILTERPARSERTHREAD_H
33		33
		34	#ifndef Q_MOC_RUN
34	#include <QThread>	35	#include <QThread>
35	#include <QFile>	36	#include <QFile>
36	#include <QDataStream>	37	#include <QDataStream>
Lines 39-44 Link Here
39		40
40	#include <libtorrent/session.hpp>	41	#include <libtorrent/session.hpp>
41	#include <libtorrent/ip_filter.hpp>	42	#include <libtorrent/ip_filter.hpp>
		43	#endif
42		44
43	using namespace std;	45	using namespace std;
44		46

Lines 30-35 Link Here

(-)qbittorrent-3.1.12/src/qtlibtorrent/qbtsession.h (+2 lines)
30	#ifndef __BITTORRENT_H__	30	#ifndef __BITTORRENT_H__
31	#define __BITTORRENT_H__	31	#define __BITTORRENT_H__
32		32
		33	#ifndef Q_MOC_RUN
33	#include <QHash>	34	#include <QHash>
34	#include <QUrl>	35	#include <QUrl>
35	#include <QStringList>	36	#include <QStringList>
Lines 51-56 Link Here
51	#include "qtorrenthandle.h"	52	#include "qtorrenthandle.h"
52	#include "trackerinfos.h"	53	#include "trackerinfos.h"
53	#include "misc.h"	54	#include "misc.h"
		55	#endif
54		56
55	#define MAX_SAMPLES 20	57	#define MAX_SAMPLES 20
56		58




#ifndef TRACKERLOGIN_H
#define TRACKERLOGIN_H

#ifndef Q_MOC_RUN
#include <QDialog>
#include <QMessageBox>
#include <libtorrent/session.hpp>
#include "ui_login.h"
#include "qtorrenthandle.h"
#endif

class trackerLogin : public QDialog, private Ui::authentication{
  Q_OBJECT

Return to bug 607324

Lines 31-41 Link Here

(-)qbittorrent-3.1.12/src/trackerlogin.h (+2 lines)
31	#ifndef TRACKERLOGIN_H	31	#ifndef TRACKERLOGIN_H
32	#define TRACKERLOGIN_H	32	#define TRACKERLOGIN_H
33		33
		34	#ifndef Q_MOC_RUN
34	#include <QDialog>	35	#include <QDialog>
35	#include <QMessageBox>	36	#include <QMessageBox>
36	#include <libtorrent/session.hpp>	37	#include <libtorrent/session.hpp>
37	#include "ui_login.h"	38	#include "ui_login.h"
38	#include "qtorrenthandle.h"	39	#include "qtorrenthandle.h"
		40	#endif
39		41
40	class trackerLogin : public QDialog, private Ui::authentication{	42	class trackerLogin : public QDialog, private Ui::authentication{
41	Q_OBJECT	43	Q_OBJECT