Attachment #184174 for bug #175599

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

Lines 29-34 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/tcponudp/tcpstream.cc.orig (+1 lines)
29		29
30	#include "tcpstream.h"	30	#include "tcpstream.h"
31	#include <iostream>	31	#include <iostream>
		32	#include <climits>
32	#include <assert.h>	33	#include <assert.h>
33	#include <errno.h>	34	#include <errno.h>
34	#include <math.h>	35	#include <math.h>

Lines 30-35 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/dbase/findex.cc.orig (+2 lines)
30	#include <sstream>	30	#include <sstream>
31	#include <iomanip>	31	#include <iomanip>
32	#include <fstream>	32	#include <fstream>
		33	#include <algorithm>
		34	#include <cstdlib>
33		35
34	#include <openssl/sha.h>	36	#include <openssl/sha.h>
35		37

Lines 27-32 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/dbase/rsexpr.cc.orig (+1 lines)
27	#include "dbase/findex.h"	27	#include "dbase/findex.h"
28	#include "rsiface/rsexpr.h"	28	#include "rsiface/rsexpr.h"
29	#include <functional>	29	#include <functional>
		30	#include <algorithm>
30		31
31		32
32	/******************************************************************************************	33	/******************************************************************************************

Lines 105-111 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/pqi/pqinetwork.h.orig (-1 / +1 lines)
105		105
106	std::string socket_errorType(int err);	106	std::string socket_errorType(int err);
107	int sockaddr_cmp(struct sockaddr_in &addr1, struct sockaddr_in &addr2 );	107	int sockaddr_cmp(struct sockaddr_in &addr1, struct sockaddr_in &addr2 );
108	int inaddr_cmp(struct sockaddr_in addr1, struct sockaddr_in addr1 );	108	int inaddr_cmp(struct sockaddr_in addr1, struct sockaddr_in addr2 );
109	int inaddr_cmp(struct sockaddr_in addr1, unsigned long);	109	int inaddr_cmp(struct sockaddr_in addr1, unsigned long);
110		110
111	struct in_addr getPreferredInterface(); // returns best addr.	111	struct in_addr getPreferredInterface(); // returns best addr.

Lines 24-30 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/pqi/pqisecurity.cc.orig (-1 / +1 lines)
24	*/	24	*/
25		25
26		26
27		27	#include <stdlib.h>
28		28
29	#include "pqi/pqisecurity.h"	29	#include "pqi/pqisecurity.h"
30		30

Lines 20-25 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/BlogDialog.cpp.orig (+2 lines)
20	****************************************************************/	20	****************************************************************/
21	#include <QtGui>	21	#include <QtGui>
22		22
		23	#include <algorithm>
		24
23	#include "BlogDialog.h"	25	#include "BlogDialog.h"
24		26
25	#include "rsiface/rsQblog.h"	27	#include "rsiface/rsQblog.h"

Lines 29-34 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/ForumsDialog.cpp.orig (-1 / +2 lines)
29	#include "rsiface/rsmsgs.h"	29	#include "rsiface/rsmsgs.h"
30	#include "rsiface/rsforums.h"	30	#include "rsiface/rsforums.h"
31	#include <sstream>	31	#include <sstream>
		32	#include <algorithm>
32		33
33	#include <QContextMenuEvent>	34	#include <QContextMenuEvent>
34	#include <QMenu>	35	#include <QMenu>
Lines 400-406 Link Here
400	uint32_t i = 0;	401	uint32_t i = 0;
401	uint32_t popLimit = 0;	402	uint32_t popLimit = 0;
402	std::multimap<uint32_t, std::string>::reverse_iterator rit;	403	std::multimap<uint32_t, std::string>::reverse_iterator rit;
403	for(rit = popMap.rbegin(); ((rit != popMap.rend()) && (i < popCount)); rit++, i++);	404	for(rit = popMap.rbegin(); ((rit != popMap.rend()) && (i < popCount)); rit++, i++) ;
404	if (rit != popMap.rend())	405	if (rit != popMap.rend())
405	{	406	{
406	popLimit = rit->first;	407	popLimit = rit->first;

Lines 28-33 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/NetworkView.cpp.orig (+1 lines)
28	#include <QGraphicsItem>	28	#include <QGraphicsItem>
29		29
30	#include <iostream>	30	#include <iostream>
		31	#include <algorithm>
31		32
32	/** Constructor */	33	/** Constructor */
33	NetworkView::NetworkView(QWidget *parent)	34	NetworkView::NetworkView(QWidget *parent)

Lines 36-41 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/TransfersDialog.cpp.orig (+1 lines)
36	#include <QStandardItemModel>	36	#include <QStandardItemModel>
37		37
38	#include <sstream>	38	#include <sstream>
		39	#include <algorithm>
39	#include "rsiface/rsiface.h"	40	#include "rsiface/rsiface.h"
40		41
41	/* Images for context menu icons */	42	/* Images for context menu icons */

Lines 6-11 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/rsiface/RemoteDirModel.cpp.orig (-1 / +2 lines)
6		6
7	#include <iostream>	7	#include <iostream>
8	#include <sstream>	8	#include <sstream>
		9	#include <algorithm>
9	#include <math.h>	10	#include <math.h>
10		11
11		12
Lines 403-409 Link Here
403	std::list<DirStub>::iterator it;	404	std::list<DirStub>::iterator it;
404	int i = 0;	405	int i = 0;
405	for(it = details.children.begin();	406	for(it = details.children.begin();
406	(i < row) && (it != details.children.end()); it++, i++);	407	(i < row) && (it != details.children.end()); it++, i++) ;
407		408
408	if (it == details.children.end())	409	if (it == details.children.end())
409	{	410	{

Lines 25-30 Link Here

(-)retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/util/MouseEventFilter.cpp.orig (+1 lines)
25	#include <QtGui/QMouseEvent>	25	#include <QtGui/QMouseEvent>
26		26
27	#include <exception>	27	#include <exception>
		28	#include <typeinfo>
28		29
29	MouseMoveEventFilter::MouseMoveEventFilter(QObject * receiver, const char * member)	30	MouseMoveEventFilter::MouseMoveEventFilter(QObject * receiver, const char * member)
30	: EventFilter(receiver, member) {	31	: EventFilter(receiver, member) {

Return to bug 175599