Attachment #150242 for bug #205223




++ src/dialogs/ksexportpicturedlg.cpp

#include <qfile.h>
#include <qpainter.h>
#include <cstdio> // tmpfile
#include <cstdlib>

QString KSExportPictureDlg::m_file_name;
int KSExportPictureDlg::m_file_format = 0;
++ src/dialogs/kswizarddlgs.h

 {
  Q_OBJECT
  public:
     KSWizardDlgSurface( QWidget *parent, KSWorkbook *workbook, KSSheet *sheet, QSAxes *parentx, bool surface = true );
    ~KSWizardDlgSurface();

  public slots:
++ src/formula/mpformula.h

  * MPSymbol *QSFormula::parse( const QString& formula, MPError& error, FactoryList *locals )
  * @author Kamil
  */
int yyparse( void *formula_ptr );
class MPFormula {
	friend int yylex( MPParserSymbol *symbol_value, void *location_info_ptr, void *formula_ptr );
	friend void yyerr(  const char *message, void *location_info_ptr, void *formula_ptr );
++ src/formula/mpparser.cpp

#include"mpsymbols.h"
#include <cmath>
#include <cstdio>
#include <cstdlib>

void yyerr(  const char *message, void *location_info_ptr, void *formula_ptr );
int yylex( YYSTYPE *symbol_value, void *location_info_ptr, void *formula_ptr );
++ src/formula/mpsymbol.cpp


#include"mpsymbol.h"
#include <string>
#include <cstring>
#include <cstdlib>

//--------------------------------------------------------------------------//

++ src/ksmatrixeditor.cpp

#include <qmessagebox.h>
#include <qpainter.h>
#include <qcursor.h>
#include <cstdlib>
#include <climits>

//--------------------------------------------------------------------//
//--------------------------------------------------------------------//
++ src/kssocketio.cpp

 ***************************************************************************/

#include <cassert>
#include <cstdlib>
#include <cstdio> // P_tmpdir
#include <unistd.h> // unlink
#include <fcntl.h>
++ src/widgets/qsaxis.cpp

#include"qsaxis.h"
#include <qregexp.h>
#include <cassert>
#include <ext/algorithm> // this is needed for __gnu_cxx::is_sorted
using namespace __gnu_cxx;


//-------------------------------------------------------------//
//-------------------------------------------------------------//
++ src/widgets/qsctool.cpp

#include"qsdrvqt.h"
#include"qsplotview.h"
#include <qpainter.h>
#include <cstdlib>

QSTool::QSTool( QObject *parent )
: QObject( parent )
++ src/widgets/qsgattr.h

             friend QString  toQString( const QSGColor& a );
             friend QSGColor toQSGColor( const QString&  s );
            };
bool operator==( const QSGColor&, const QSGColor& );
bool operator!=( const QSGColor&, const QSGColor& );
QString  toQString( const QSGColor& a );
QSGColor toQSGColor( const QString&  s );

 //-------------------------------------------------------------//


              friend QString toQString( const QSGFont& font );
              friend QSGFont toQSGFont( const QString& string );
             };
bool operator==( const QSGFont&, const QSGFont& );
bool operator!=( const QSGFont&, const QSGFont& );
QString toQString( const QSGFont& font );
QSGFont toQSGFont( const QString& string );

//-------------------------------------------------------------//


            friend QString toQString( const QSGLine& line );
            friend QSGLine toQSGLine( const QString& string );
           };
bool operator==( const QSGLine&, const QSGLine& );
bool operator!=( const QSGLine&, const QSGLine& );
QString toQString( const QSGLine& line );
QSGLine toQSGLine( const QString& string );


//-------------------------------------------------------------//

            friend QString toQString( const QSGFill& fill );
            friend QSGFill toQSGFill( const QString& string );
       };
bool operator==( const QSGFill&, const QSGFill& );
bool operator!=( const QSGFill&, const QSGFill& );
QString toQString( const QSGFill& fill );
QSGFill toQSGFill( const QString& string );




	friend QString toQString( const QSGPoint& point );
	friend QSGPoint toQSGPoint( const QString& string );
       };
bool operator==( const QSGPoint&, const QSGPoint& );
bool operator!=( const QSGPoint&, const QSGPoint& );
QString toQString( const QSGPoint& point );
QSGPoint toQSGPoint( const QString& string );

//-------------------------------------------------------------//


	friend QString toQString( const QSGArrow& arrow );
	friend QSGArrow toQSGArrow( const QString& string );
	};
bool operator==( const QSGArrow&, const QSGArrow& );
bool operator!=( const QSGArrow&, const QSGArrow& );
QString toQString( const QSGArrow& arrow );
QSGArrow toQSGArrow( const QString& string );

//-------------------------------------------------------------//


	bool m_all_colors;
	void set_default_colors();
    };
bool operator==( const QSGGradient&, const QSGGradient& );
bool operator!=( const QSGGradient&, const QSGGradient& );
QString toQString( const QSGGradient& arrow );
QSGGradient toQSGGradient( const QString& string );


//-------------------------------------------------------------//
++ src/widgets/qssegment.h

    QSPt2f m_prev;
    QSPt2f m_prev_prev;
    QSGLine curr_line;
    void get_stair( const QSPt2f& pos, QSPt2f pts[3] );
};

#endif

Return to bug 205223

Line Link Here

(-)file_not_specified_in_diff (-16 / +53 lines)
0	-- src/dialogs/ksexportpicturedlg.cpp	0	++ src/dialogs/ksexportpicturedlg.cpp
Lines 36-41 Link Here
36	#include <qfile.h>	36	#include <qfile.h>
37	#include <qpainter.h>	37	#include <qpainter.h>
38	#include <cstdio> // tmpfile	38	#include <cstdio> // tmpfile
		39	#include <cstdlib>
39		40
40	QString KSExportPictureDlg::m_file_name;	41	QString KSExportPictureDlg::m_file_name;
41	int KSExportPictureDlg::m_file_format = 0;	42	int KSExportPictureDlg::m_file_format = 0;
42	-- src/dialogs/kswizarddlgs.h	43	++ src/dialogs/kswizarddlgs.h
Lines 31-37 Link Here
31	{	31	{
32	Q_OBJECT	32	Q_OBJECT
33	public:	33	public:
34	KSWizardDlgSurface( QWidget parent, KSWorkbook workbook, KSSheet sheet, QSAxes parent, bool surface = true );	34	KSWizardDlgSurface( QWidget parent, KSWorkbook workbook, KSSheet sheet, QSAxes parentx, bool surface = true );
35	~KSWizardDlgSurface();	35	~KSWizardDlgSurface();
36		36
37	public slots:	37	public slots:
38	-- src/formula/mpformula.h	38	++ src/formula/mpformula.h
Lines 42-47 Link Here
42	* MPSymbol QSFormula::parse( const QString& formula, MPError& error, FactoryList locals )	42	* MPSymbol QSFormula::parse( const QString& formula, MPError& error, FactoryList locals )
43	* @author Kamil	43	* @author Kamil
44	*/	44	*/
		45	int yyparse( void *formula_ptr );
45	class MPFormula {	46	class MPFormula {
46	friend int yylex( MPParserSymbol symbol_value, void location_info_ptr, void *formula_ptr );	47	friend int yylex( MPParserSymbol symbol_value, void location_info_ptr, void *formula_ptr );
47	friend void yyerr( const char message, void location_info_ptr, void *formula_ptr );	48	friend void yyerr( const char message, void location_info_ptr, void *formula_ptr );
48	-- src/formula/mpparser.cpp	49	++ src/formula/mpparser.cpp
Lines 26-31 Link Here
26	#include"mpsymbols.h"	26	#include"mpsymbols.h"
27	#include <cmath>	27	#include <cmath>
28	#include <cstdio>	28	#include <cstdio>
		29	#include <cstdlib>
29		30
30	void yyerr( const char message, void location_info_ptr, void *formula_ptr );	31	void yyerr( const char message, void location_info_ptr, void *formula_ptr );
31	int yylex( YYSTYPE symbol_value, void location_info_ptr, void *formula_ptr );	32	int yylex( YYSTYPE symbol_value, void location_info_ptr, void *formula_ptr );
32	-- src/formula/mpsymbol.cpp	33	++ src/formula/mpsymbol.cpp
Lines 17-22 Link Here
17		17
18	#include"mpsymbol.h"	18	#include"mpsymbol.h"
19	#include <string>	19	#include <string>
		20	#include <cstring>
		21	#include <cstdlib>
20		22
21	//--------------------------------------------------------------------------//	23	//--------------------------------------------------------------------------//
22		24
23	-- src/ksmatrixeditor.cpp	25	++ src/ksmatrixeditor.cpp
Lines 35-41 Link Here
35	#include <qmessagebox.h>	35	#include <qmessagebox.h>
36	#include <qpainter.h>	36	#include <qpainter.h>
37	#include <qcursor.h>	37	#include <qcursor.h>
38		38	#include <cstdlib>
		39	#include <climits>
39		40
40	//--------------------------------------------------------------------//	41	//--------------------------------------------------------------------//
41	//--------------------------------------------------------------------//	42	//--------------------------------------------------------------------//
42	-- src/kssocketio.cpp	43	++ src/kssocketio.cpp
Lines 16-21 Link Here
16	***************************************************************************/	16	***************************************************************************/
17		17
18	#include <cassert>	18	#include <cassert>
		19	#include <cstdlib>
19	#include <cstdio> // P_tmpdir	20	#include <cstdio> // P_tmpdir
20	#include <unistd.h> // unlink	21	#include <unistd.h> // unlink
21	#include <fcntl.h>	22	#include <fcntl.h>
22	-- src/widgets/qsaxis.cpp	23	++ src/widgets/qsaxis.cpp
Lines 19-25 Link Here
19	#include"qsaxis.h"	19	#include"qsaxis.h"
20	#include <qregexp.h>	20	#include <qregexp.h>
21	#include <cassert>	21	#include <cassert>
22	#include <algo.h> // this is needed for is_sorted	22	#include <ext/algorithm> // this is needed for __gnu_cxx::is_sorted
		23	using namespace __gnu_cxx;
		24
23		25
24	//-------------------------------------------------------------//	26	//-------------------------------------------------------------//
25	//-------------------------------------------------------------//	27	//-------------------------------------------------------------//
26	-- src/widgets/qsctool.cpp	28	++ src/widgets/qsctool.cpp
Lines 19-24 Link Here
19	#include"qsdrvqt.h"	19	#include"qsdrvqt.h"
20	#include"qsplotview.h"	20	#include"qsplotview.h"
21	#include <qpainter.h>	21	#include <qpainter.h>
		22	#include <cstdlib>
22		23
23	QSTool::QSTool( QObject *parent )	24	QSTool::QSTool( QObject *parent )
24	: QObject( parent )	25	: QObject( parent )
25	-- src/widgets/qsgattr.h	26	++ src/widgets/qsgattr.h
Lines 62-67 Link Here
62	friend QString toQString( const QSGColor& a );	62	friend QString toQString( const QSGColor& a );
63	friend QSGColor toQSGColor( const QString& s );	63	friend QSGColor toQSGColor( const QString& s );
64	};	64	};
		65	bool operator==( const QSGColor&, const QSGColor& );
		66	bool operator!=( const QSGColor&, const QSGColor& );
		67	QString toQString( const QSGColor& a );
		68	QSGColor toQSGColor( const QString& s );
65		69
66	//-------------------------------------------------------------//	70	//-------------------------------------------------------------//
67		71
Lines 87-92 Link Here
87	friend QString toQString( const QSGFont& font );	91	friend QString toQString( const QSGFont& font );
88	friend QSGFont toQSGFont( const QString& string );	92	friend QSGFont toQSGFont( const QString& string );
89	};	93	};
		94	bool operator==( const QSGFont&, const QSGFont& );
		95	bool operator!=( const QSGFont&, const QSGFont& );
		96	QString toQString( const QSGFont& font );
		97	QSGFont toQSGFont( const QString& string );
90		98
91	//-------------------------------------------------------------//	99	//-------------------------------------------------------------//
92		100
Lines 120-126 Link Here
120	friend QString toQString( const QSGLine& line );	128	friend QString toQString( const QSGLine& line );
121	friend QSGLine toQSGLine( const QString& string );	129	friend QSGLine toQSGLine( const QString& string );
122	};	130	};
123		131	bool operator==( const QSGLine&, const QSGLine& );
		132	bool operator!=( const QSGLine&, const QSGLine& );
		133	QString toQString( const QSGLine& line );
		134	QSGLine toQSGLine( const QString& string );
124		135
125		136
126	//-------------------------------------------------------------//	137	//-------------------------------------------------------------//
Lines 159-164 Link Here
159	friend QString toQString( const QSGFill& fill );	170	friend QString toQString( const QSGFill& fill );
160	friend QSGFill toQSGFill( const QString& string );	171	friend QSGFill toQSGFill( const QString& string );
161	};	172	};
		173	bool operator==( const QSGFill&, const QSGFill& );
		174	bool operator!=( const QSGFill&, const QSGFill& );
		175	QString toQString( const QSGFill& fill );
		176	QSGFill toQSGFill( const QString& string );
162		177
163		178
164		179
Lines 202-207 Link Here
202	friend QString toQString( const QSGPoint& point );	217	friend QString toQString( const QSGPoint& point );
203	friend QSGPoint toQSGPoint( const QString& string );	218	friend QSGPoint toQSGPoint( const QString& string );
204	};	219	};
		220	bool operator==( const QSGPoint&, const QSGPoint& );
		221	bool operator!=( const QSGPoint&, const QSGPoint& );
		222	QString toQString( const QSGPoint& point );
		223	QSGPoint toQSGPoint( const QString& string );
205		224
206	//-------------------------------------------------------------//	225	//-------------------------------------------------------------//
207		226
Lines 243-248 Link Here
243	friend QString toQString( const QSGArrow& arrow );	262	friend QString toQString( const QSGArrow& arrow );
244	friend QSGArrow toQSGArrow( const QString& string );	263	friend QSGArrow toQSGArrow( const QString& string );
245	};	264	};
		265	bool operator==( const QSGArrow&, const QSGArrow& );
		266	bool operator!=( const QSGArrow&, const QSGArrow& );
		267	QString toQString( const QSGArrow& arrow );
		268	QSGArrow toQSGArrow( const QString& string );
246		269
247	//-------------------------------------------------------------//	270	//-------------------------------------------------------------//
248		271
Lines 287-292 Link Here
287	bool m_all_colors;	310	bool m_all_colors;
288	void set_default_colors();	311	void set_default_colors();
289	};	312	};
		313	bool operator==( const QSGGradient&, const QSGGradient& );
		314	bool operator!=( const QSGGradient&, const QSGGradient& );
		315	QString toQString( const QSGGradient& arrow );
		316	QSGGradient toQSGGradient( const QString& string );
290		317
291		318
292	//-------------------------------------------------------------//	319	//-------------------------------------------------------------//
293	-- src/widgets/qssegment.h	320	++ src/widgets/qssegment.h
Lines 205-211 Link Here
205	QSPt2f m_prev;	205	QSPt2f m_prev;
206	QSPt2f m_prev_prev;	206	QSPt2f m_prev_prev;
207	QSGLine curr_line;	207	QSGLine curr_line;
208	void get_stair( const QSPt2f& pos, QSPt2f pos[3] );	208	void get_stair( const QSPt2f& pos, QSPt2f pts[3] );
209	};	209	};
210		210
211	#endif	211	#endif