Attachment #149765 for bug #217758

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

Lines 17-22 Link Here

(-)celestia-1.5.0-upstream/src/buildstardb.cpp (+1 lines)
17	#include <assert.h>	17	#include <assert.h>
18	#include <unistd.h>	18	#include <unistd.h>
19	#include "celengine/stardb.h"	19	#include "celengine/stardb.h"
		20	#include <libintl.h>
20		21
21	using namespace std;	22	using namespace std;
22		23

Lines 8-13 Link Here

(-)celestia-1.5.0-upstream/src/celengine/asterism.cpp (+1 lines)
8	// of the License, or (at your option) any later version.	8	// of the License, or (at your option) any later version.
9		9
10	#include <algorithm>	10	#include <algorithm>
		11	#include <libintl.h>
11		12
12	#ifndef _WIN32	13	#ifndef _WIN32
13	#ifndef TARGET_OS_MAC	14	#ifndef TARGET_OS_MAC




#include <cmath>
#include <iomanip>
#include <cstdio>
#include <cstring>
#include <time.h>
#include <celutil/basictypes.h>
#include <celmath/mathlib.h>
#include "celestia.h"
#include "astro.h"
#include <celutil/util.h>
#include <libintl.h>

using namespace std;


Lines 14-19 Link Here

(-)celestia-1.5.0-upstream/src/celengine/body.cpp (+1 lines)
14	#include <celmath/mathlib.h>	14	#include <celmath/mathlib.h>
15	#include <celutil/util.h>	15	#include <celutil/util.h>
16	#include <celutil/utf8.h>	16	#include <celutil/utf8.h>
		17	#include <libintl.h>
17	#include "mesh.h"	18	#include "mesh.h"
18	#include "meshmanager.h"	19	#include "meshmanager.h"
19	#include "body.h"	20	#include "body.h"

Lines 30-35 Link Here

(-)celestia-1.5.0-upstream/src/celengine/cmdparser.cpp (+1 lines)
30	#include "astro.h"	30	#include "astro.h"
31	#include "cmdparser.h"	31	#include "cmdparser.h"
32	#include "glcontext.h"	32	#include "glcontext.h"
		33	#include <libintl.h>
33		34
34	using namespace std;	35	using namespace std;
35		36

Lines 10-15 Link Here

(-)celestia-1.5.0-upstream/src/celengine/console.cpp (+1 lines)
10	#include <cstdarg>	10	#include <cstdarg>
11	#include <cstdio>	11	#include <cstdio>
12	#include <cassert>	12	#include <cassert>
		13	#include <cstring>
13	#include "celutil/utf8.h"	14	#include "celutil/utf8.h"
14	#include "gl.h"	15	#include "gl.h"
15	#include "vecgl.h"	16	#include "vecgl.h"

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celengine/dds.cpp (+1 lines)
15	#include <celengine/gl.h>	15	#include <celengine/gl.h>
16	#include <celengine/glext.h>	16	#include <celengine/glext.h>
17	#include <celengine/image.h>	17	#include <celengine/image.h>
		18	#include <libintl.h>
18		19
19	using namespace std;	20	using namespace std;
20		21

Lines 32-37 Link Here

(-)celestia-1.5.0-upstream/src/celengine/dsodb.cpp (+1 lines)
32	#include <celengine/galaxy.h>	32	#include <celengine/galaxy.h>
33	#include <celengine/opencluster.h>	33	#include <celengine/opencluster.h>
34	#include <celengine/nebula.h>	34	#include <celengine/nebula.h>
		35	#include <libintl.h>
35		36
36	using namespace std;	37	using namespace std;
37		38

Lines 13-18 Link Here

(-)celestia-1.5.0-upstream/src/celengine/fragmentprog.cpp (+1 lines)
13	#include "gl.h"	13	#include "gl.h"
14	#include "glext.h"	14	#include "glext.h"
15	#include "fragmentprog.h"	15	#include "fragmentprog.h"
		16	#include <libintl.h>
16		17
17	using namespace std;	18	using namespace std;
18		19

Lines 23-28 Link Here

(-)celestia-1.5.0-upstream/src/celengine/galaxy.cpp (+2 lines)
23	#include "vecgl.h"	23	#include "vecgl.h"
24	#include "render.h"	24	#include "render.h"
25	#include "texture.h"	25	#include "texture.h"
		26	#include <libintl.h>
		27	#include <string.h>
26		28
27	using namespace std;	29	using namespace std;
28		30

Lines 12-17 Link Here

(-)celestia-1.5.0-upstream/src/celengine/glcontext.cpp (+1 lines)
12	#include "gl.h"	12	#include "gl.h"
13	#include "glext.h"	13	#include "glext.h"
14	#include "glcontext.h"	14	#include "glcontext.h"
		15	#include <libintl.h>
15		16
16	using namespace std;	17	using namespace std;
17		18

Lines 8-13 Link Here

(-)celestia-1.5.0-upstream/src/celengine/glext.cpp (+2 lines)
8	// of the License, or (at your option) any later version.	8	// of the License, or (at your option) any later version.
9		9
10	#include <string.h>	10	#include <string.h>
		11	#include <cstring>
11	#include "gl.h"	12	#include "gl.h"
12		13
13	#ifndef _WIN32	14	#ifndef _WIN32
Lines 19-24 Link Here
19	#endif /* ! _WIN32 */	20	#endif /* ! _WIN32 */
20		21
21	#include "glext.h"	22	#include "glext.h"
		23	#include <libintl.h>
22		24
23	// ARB_texture_compression	25	// ARB_texture_compression
24	glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB;	26	glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB;

Lines 66-71 Link Here

(-)celestia-1.5.0-upstream/src/celengine/image.cpp (+1 lines)
66	#include <iostream>	66	#include <iostream>
67	#include <algorithm>	67	#include <algorithm>
68	#include <cmath>	68	#include <cmath>
		69	#include <libintl.h>
69		70
70	using namespace std;	71	using namespace std;
71		72

Lines 11-16 Link Here

(-)celestia-1.5.0-upstream/src/celengine/location.cpp (+1 lines)
11	#include <celengine/location.h>	11	#include <celengine/location.h>
12	#include <celengine/body.h>	12	#include <celengine/body.h>
13	#include <celutil/util.h>	13	#include <celutil/util.h>
		14	#include <libintl.h>
14		15
15	using namespace std;	16	using namespace std;
16		17

Lines 17-22 Link Here

(-)celestia-1.5.0-upstream/src/celengine/lodspheremesh.cpp (+1 lines)
17	#include "glext.h"	17	#include "glext.h"
18	#include "vecgl.h"	18	#include "vecgl.h"
19	#include "lodspheremesh.h"	19	#include "lodspheremesh.h"
		20	#include <libintl.h>
20		21
21	using namespace std;	22	using namespace std;
22		23

Lines 9-14 Link Here

(-)celestia-1.5.0-upstream/src/celengine/marker.cpp (+1 lines)
9		9
10	#include "marker.h"	10	#include "marker.h"
11	#include "gl.h"	11	#include "gl.h"
		12	#include <libintl.h>
12		13
13		14
14	using namespace std;	15	using namespace std;

Lines 14-19 Link Here

(-)celestia-1.5.0-upstream/src/celengine/mesh.cpp (+1 lines)
14	#include <cassert>	14	#include <cassert>
15	#include <iostream>	15	#include <iostream>
16	#include <algorithm>	16	#include <algorithm>
		17	#include <libintl.h>
17		18
18	using namespace std;	19	using namespace std;
19		20

Lines 26-31 Link Here

(-)celestia-1.5.0-upstream/src/celengine/meshmanager.cpp (+1 lines)
26	#include "spheremesh.h"	26	#include "spheremesh.h"
27	#include "texmanager.h"	27	#include "texmanager.h"
28	#include "meshmanager.h"	28	#include "meshmanager.h"
		29	#include <libintl.h>
29		30
30	using namespace std;	31	using namespace std;
31		32

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celengine/modelfile.cpp (+2 lines)
15	#include <cassert>	15	#include <cassert>
16	#include <cmath>	16	#include <cmath>
17	#include <cstdio>	17	#include <cstdio>
		18	#include <libintl.h>
		19	#include <string.h>
18		20
19	using namespace std;	21	using namespace std;
20		22

Lines 21-26 Link Here

(-)celestia-1.5.0-upstream/src/celengine/nebula.cpp (+1 lines)
21	#include "glext.h"	21	#include "glext.h"
22	#include "vecgl.h"	22	#include "vecgl.h"
23	#include "render.h"	23	#include "render.h"
		24	#include <libintl.h>
24		25
25	using namespace std;	26	using namespace std;
26		27

Lines 19-24 Link Here

(-)celestia-1.5.0-upstream/src/celengine/opencluster.cpp (+1 lines)
19	#include "gl.h"	19	#include "gl.h"
20	#include "vecgl.h"	20	#include "vecgl.h"
21	#include "render.h"	21	#include "render.h"
		22	#include <libintl.h>
22		23
23	using namespace std;	24	using namespace std;
24		25

Lines 9-14 Link Here

(-)celestia-1.5.0-upstream/src/celengine/overlay.cpp (+1 lines)
9		9
10	#include <cstdarg>	10	#include <cstdarg>
11	#include <cstdio>	11	#include <cstdio>
		12	#include <cstring>
12	#include <celutil/utf8.h>	13	#include <celutil/utf8.h>
13	#include "gl.h"	14	#include "gl.h"
14	#include "vecgl.h"	15	#include "vecgl.h"

Lines 21-26 Link Here

(-)celestia-1.5.0-upstream/src/celengine/parseobject.cpp (+1 lines)
21	#include "trajmanager.h"	21	#include "trajmanager.h"
22	#include "rotationmanager.h"	22	#include "rotationmanager.h"
23	#include "universe.h"	23	#include "universe.h"
		24	#include <libintl.h>
24		25
25	using namespace std;	26	using namespace std;
26		27

Lines 11-16 Link Here

(-)celestia-1.5.0-upstream/src/celengine/render.cpp (+1 lines)
11	#include <cstdio>	11	#include <cstdio>
12	#include <cstring>	12	#include <cstring>
13	#include <cassert>	13	#include <cassert>
		14	#include <libintl.h>
14		15
15	#ifndef _WIN32	16	#ifndef _WIN32
16	#ifndef TARGET_OS_MAC	17	#ifndef TARGET_OS_MAC

Lines 14-19 Link Here

(-)celestia-1.5.0-upstream/src/celengine/rotationmanager.cpp (+1 lines)
14	#include <celutil/debug.h>	14	#include <celutil/debug.h>
15	#include "samporient.h"	15	#include "samporient.h"
16	#include "rotationmanager.h"	16	#include "rotationmanager.h"
		17	#include <libintl.h>
17		18
18	using namespace std;	19	using namespace std;
19		20

Lines 8-13 Link Here

(-)celestia-1.5.0-upstream/src/celengine/selection.cpp (+1 lines)
8	// of the License, or (at your option) any later version.	8	// of the License, or (at your option) any later version.
9		9
10	#include <cstdio>	10	#include <cstdio>
		11	#include <libintl.h>
11	#include "astro.h"	12	#include "astro.h"
12	#include "selection.h"	13	#include "selection.h"
13		14

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celengine/shadermanager.cpp (+1 lines)
15	#include <iomanip>	15	#include <iomanip>
16	#include <cstdio>	16	#include <cstdio>
17	#include <cassert>	17	#include <cassert>
		18	#include <libintl.h>
18		19
19	using namespace std;	20	using namespace std;
20		21

Lines 11-16 Link Here

(-)celestia-1.5.0-upstream/src/celengine/simulation.cpp (+1 lines)
11	// of the License, or (at your option) any later version.	11	// of the License, or (at your option) any later version.
12		12
13	#include <algorithm>	13	#include <algorithm>
		14	#include <libintl.h>
14	#include "simulation.h"	15	#include "simulation.h"
15		16
16	using namespace std;	17	using namespace std;

Lines 30-35 Link Here

(-)celestia-1.5.0-upstream/src/celengine/solarsys.cpp (+1 lines)
30	#include "universe.h"	30	#include "universe.h"
31	#include "multitexture.h"	31	#include "multitexture.h"
32	#include "parseobject.h"	32	#include "parseobject.h"
		33	#include <libintl.h>
33		34
34	using namespace std;	35	using namespace std;
35		36

Lines 8-13 Link Here

(-)celestia-1.5.0-upstream/src/celengine/solarsysxml.cpp (+3 lines)
8	// of the License, or (at your option) any later version.	8	// of the License, or (at your option) any later version.
9		9
10	#include <cassert>	10	#include <cassert>
		11	#include <cstring>
		12	#include <string.h>
11		13
12	#include <libxml/parser.h>	14	#include <libxml/parser.h>
13	#include <libxml/parserInternals.h>	15	#include <libxml/parserInternals.h>
Lines 20-25 Link Here
20	#include "texmanager.h"	22	#include "texmanager.h"
21	#include "meshmanager.h"	23	#include "meshmanager.h"
22	#include "solarsysxml.h"	24	#include "solarsysxml.h"
		25	#include <libintl.h>
23		26
24	using namespace std;	27	using namespace std;
25		28

Lines 11-16 Link Here

(-)celestia-1.5.0-upstream/src/celengine/spiceinterface.cpp (+1 lines)
11		11
12	#include "SpiceUsr.h"	12	#include "SpiceUsr.h"
13	#include "spiceinterface.h"	13	#include "spiceinterface.h"
		14	#include <libintl.h>
14		15
15		16
16	bool	17	bool

Lines 14-19 Link Here

(-)celestia-1.5.0-upstream/src/celengine/spiceorbit.cpp (+1 lines)
14	#include "SpiceUsr.h"	14	#include "SpiceUsr.h"
15	#include "astro.h"	15	#include "astro.h"
16	#include "spiceorbit.h"	16	#include "spiceorbit.h"
		17	#include <libintl.h>
17		18
18	using namespace std;	19	using namespace std;
19		20

Lines 10-15 Link Here

(-)celestia-1.5.0-upstream/src/celengine/stardb.cpp (+2 lines)
10	#include <cmath>	10	#include <cmath>
11	#include <cstdlib>	11	#include <cstdlib>
12	#include <cstdio>	12	#include <cstdio>
		13	#include <cstring>
13	#include <cassert>	14	#include <cassert>
14	#include <algorithm>	15	#include <algorithm>
15	#include <celmath/mathlib.h>	16	#include <celmath/mathlib.h>
Lines 24-29 Link Here
24	#include "multitexture.h"	25	#include "multitexture.h"
25	#include "meshmanager.h"	26	#include "meshmanager.h"
26	#include <celutil/debug.h>	27	#include <celutil/debug.h>
		28	#include <libintl.h>
27		29
28	using namespace std;	30	using namespace std;
29		31

Lines 13-18 Link Here

(-)celestia-1.5.0-upstream/src/celengine/texmanager.cpp (+1 lines)
13	#include <fstream>	13	#include <fstream>
14	#include "multitexture.h"	14	#include "multitexture.h"
15	#include "texmanager.h"	15	#include "texmanager.h"
		16	#include <libintl.h>
16		17
17	using namespace std;	18	using namespace std;
18		19

Lines 28-33 Link Here

(-)celestia-1.5.0-upstream/src/celengine/texture.cpp (+1 lines)
28	#include <cstdlib>	28	#include <cstdlib>
29	#include <cstdio>	29	#include <cstdio>
30	#include <cassert>	30	#include <cassert>
		31	#include <libintl.h>
31		32
32	#ifndef _WIN32	33	#ifndef _WIN32
33	#ifndef TARGET_OS_MAC	34	#ifndef TARGET_OS_MAC

Lines 12-17 Link Here

(-)celestia-1.5.0-upstream/src/celengine/tokenizer.cpp (+1 lines)
12	#include <iomanip>	12	#include <iomanip>
13	#include <celutil/utf8.h>	13	#include <celutil/utf8.h>
14	#include "tokenizer.h"	14	#include "tokenizer.h"
		15	#include <libintl.h>
15		16
16		17
17	static bool issep(char c)	18	static bool issep(char c)

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celengine/trajmanager.cpp (+1 lines)
15	#include <celutil/debug.h>	15	#include <celutil/debug.h>
16	#include "samporbit.h"	16	#include "samporbit.h"
17	#include "trajmanager.h"	17	#include "trajmanager.h"
		18	#include <libintl.h>
18		19
19	using namespace std;	20	using namespace std;
20		21

Lines 13-18 Link Here

(-)celestia-1.5.0-upstream/src/celengine/universe.cpp (+1 lines)
13	#include <celmath/intersect.h>	13	#include <celmath/intersect.h>
14	#include <celutil/utf8.h>	14	#include <celutil/utf8.h>
15	#include <cassert>	15	#include <cassert>
		16	#include <libintl.h>
16	#include "astro.h"	17	#include "astro.h"
17	#include "3dsmesh.h"	18	#include "3dsmesh.h"
18	#include "meshmanager.h"	19	#include "meshmanager.h"

Lines 14-19 Link Here

(-)celestia-1.5.0-upstream/src/celengine/vertexprog.cpp (+1 lines)
14	#include "gl.h"	14	#include "gl.h"
15	#include "glext.h"	15	#include "glext.h"
16	#include "vertexprog.h"	16	#include "vertexprog.h"
		17	#include <libintl.h>
17		18
18	using namespace std;	19	using namespace std;
19		20

Lines 19-24 Link Here

(-)celestia-1.5.0-upstream/src/celengine/virtualtex.cpp (+1 lines)
19	#include "virtualtex.h"	19	#include "virtualtex.h"
20	#include "gl.h"	20	#include "gl.h"
21	#include "parser.h"	21	#include "parser.h"
		22	#include <libintl.h>
22		23
23	using namespace std;	24	using namespace std;
24		25

Lines 43-48 Link Here

(-)celestia-1.5.0-upstream/src/celestia/celestiacore.cpp (+1 lines)
43	#include <celutil/debug.h>	43	#include <celutil/debug.h>
44	#include <celutil/utf8.h>	44	#include <celutil/utf8.h>
45	#include "url.h"	45	#include "url.h"
		46	#include <libintl.h>
46		47
47	#ifdef CELX	48	#ifdef CELX
48	#include <celengine/scriptobject.h>	49	#include <celengine/scriptobject.h>

Lines 11-17 Link Here

(-)celestia-1.5.0-upstream/src/celestia/celx.cpp (+2 lines)
11		11
12	#include <cassert>	12	#include <cassert>
13	#include <cstring>	13	#include <cstring>
		14	#include <string.h>
14	#include <cstdio>	15	#include <cstdio>
		16	#include <libintl.h>
15	#include <map>	17	#include <map>
16	#include <celengine/astro.h>	18	#include <celengine/astro.h>
17	#include <celengine/celestia.h>	19	#include <celengine/celestia.h>

Lines 16-21 Link Here

(-)celestia-1.5.0-upstream/src/celestia/configfile.cpp (+1 lines)
16	#include <celengine/celestia.h>	16	#include <celengine/celestia.h>
17	#include <celengine/texmanager.h>	17	#include <celengine/texmanager.h>
18	#include "configfile.h"	18	#include "configfile.h"
		19	#include <libintl.h>
19		20
20	using namespace std;	21	using namespace std;
21		22

Lines 14-19 Link Here

(-)celestia-1.5.0-upstream/src/celestia/destination.cpp (+1 lines)
14	#include <celengine/astro.h>	14	#include <celengine/astro.h>
15	#include <celengine/parser.h>	15	#include <celengine/parser.h>
16	#include "destination.h"	16	#include "destination.h"
		17	#include <libintl.h>
17		18
18	using namespace std;	19	using namespace std;
19		20

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celestia/eclipsefinder.cpp (+1 lines)
15	#include <algorithm>	15	#include <algorithm>
16	#include <set>	16	#include <set>
17	#include <cassert>	17	#include <cassert>
		18	#include <cstring>
18	#include "eclipsefinder.h"	19	#include "eclipsefinder.h"
19	#include "celmath/mathlib.h"	20	#include "celmath/mathlib.h"
20	#include "celmath/ray.h"	21	#include "celmath/ray.h"

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celestia/glutmain.cpp (+1 lines)
15	#include <cstdlib>	15	#include <cstdlib>
16	#include <cctype>	16	#include <cctype>
17	#include <cstring>	17	#include <cstring>
		18	#include <libintl.h>
18	#include <time.h>	19	#include <time.h>
19	#include <unistd.h>	20	#include <unistd.h>
20	#include <celengine/gl.h>	21	#include <celengine/gl.h>

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/actions.cpp (+1 lines)
15	#endif /* HAVE_CONFIG_H */	15	#endif /* HAVE_CONFIG_H */
16		16
17	#include <cstring>	17	#include <cstring>
		18	#include <libintl.h>
18	#include <fstream>	19	#include <fstream>
19	#include <gtk/gtk.h>	20	#include <gtk/gtk.h>
20		21

Lines 20-25 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/common.cpp (+1 lines)
20	#include <celestia/celestiacore.h>	20	#include <celestia/celestiacore.h>
21		21
22	#include "common.h"	22	#include "common.h"
		23	#include <libintl.h>
23		24
24		25
25	/* Returns the offset of the timezone at date */	26	/* Returns the offset of the timezone at date */

Lines 18-23 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/dialog-eclipse.cpp (+1 lines)
18		18
19	#include "dialog-eclipse.h"	19	#include "dialog-eclipse.h"
20	#include "common.h"	20	#include "common.h"
		21	#include <libintl.h>
21		22
22		23
23	/* Definitions: Callbacks */	24	/* Definitions: Callbacks */

Lines 18-23 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/dialog-goto.cpp (+1 lines)
18		18
19	#include "dialog-goto.h"	19	#include "dialog-goto.h"
20	#include "common.h"	20	#include "common.h"
		21	#include <libintl.h>
21		22
22		23
23	/* Declarations: Callbacks */	24	/* Declarations: Callbacks */

Lines 17-22 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/dialog-options.cpp (+1 lines)
17	#include "dialog-options.h"	17	#include "dialog-options.h"
18	#include "common.h"	18	#include "common.h"
19	#include "ui.h"	19	#include "ui.h"
		20	#include <libintl.h>
20		21
21		22
22	/* Definitions: Callbacks */	23	/* Definitions: Callbacks */

Lines 22-27 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/dialog-solar.cpp (+1 lines)
22	#include "dialog-solar.h"	22	#include "dialog-solar.h"
23	#include "actions.h"	23	#include "actions.h"
24	#include "common.h"	24	#include "common.h"
		25	#include <libintl.h>
25		26
26		27
27	/* Declarations: Callbacks */	28	/* Declarations: Callbacks */

Lines 25-30 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/dialog-star.cpp (+1 lines)
25	#include "dialog-star.h"	25	#include "dialog-star.h"
26	#include "actions.h"	26	#include "actions.h"
27	#include "common.h"	27	#include "common.h"
		28	#include <libintl.h>
28		29
29		30
30	/* Declarations: Callbacks */	31	/* Declarations: Callbacks */

Lines 18-23 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/dialog-time.cpp (+1 lines)
18		18
19	#include "dialog-time.h"	19	#include "dialog-time.h"
20	#include "common.h"	20	#include "common.h"
		21	#include <libintl.h>
21		22
22		23
23	/* Declarations: Callbacks */	24	/* Declarations: Callbacks */

Lines 18-23 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/dialog-tour.cpp (+1 lines)
18		18
19	#include "dialog-tour.h"	19	#include "dialog-tour.h"
20	#include "common.h"	20	#include "common.h"
		21	#include <libintl.h>
21		22
22		23
23	/* Declarations: Callbacks */	24	/* Declarations: Callbacks */

Lines 19-24 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/main.cpp (+1 lines)
19	#include <cstdlib>	19	#include <cstdlib>
20	#include <cctype>	20	#include <cctype>
21	#include <cstring>	21	#include <cstring>
		22	#include <libintl.h>
22	#include <time.h>	23	#include <time.h>
23		24
24	#ifdef WIN32	25	#ifdef WIN32

Lines 20-25 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/menu-context.cpp (+1 lines)
20	#include "menu-context.h"	20	#include "menu-context.h"
21	#include "actions.h"	21	#include "actions.h"
22	#include "common.h"	22	#include "common.h"
		23	#include <libintl.h>
23		24
24		25
25	/* Definitions: Callbacks */	26	/* Definitions: Callbacks */

Lines 11-16 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/settings-file.cpp (+1 lines)
11	*/	11	*/
12		12
13	#include <gtk/gtk.h>	13	#include <gtk/gtk.h>
		14	#include <libintl.h>
14		15
15	#include <celengine/body.h>	16	#include <celengine/body.h>
16	#include <celengine/galaxy.h>	17	#include <celengine/galaxy.h>

Lines 12-17 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/settings-gconf.cpp (+1 lines)
12		12
13	#include <gtk/gtk.h>	13	#include <gtk/gtk.h>
14	#include <gconf/gconf-client.h>	14	#include <gconf/gconf-client.h>
		15	#include <libintl.h>
15		16
16	#include <celengine/body.h>	17	#include <celengine/body.h>
17	#include <celengine/galaxy.h>	18	#include <celengine/galaxy.h>

Lines 22-27 Link Here

(-)celestia-1.5.0-upstream/src/celestia/gtk/splash.cpp (+1 lines)
22		22
23	#include "splash.h"	23	#include "splash.h"
24	#include "common.h"	24	#include "common.h"
		25	#include <libintl.h>
25		26
26		27
27	/* Declarations */	28	/* Declarations */

Lines 16-21 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/celestialbrowser.cpp (+1 lines)
16	#include "cellistviewitem.h"	16	#include "cellistviewitem.h"
17	#include "selectionpopup.h"	17	#include "selectionpopup.h"
18	#include "celutil/utf8.h"	18	#include "celutil/utf8.h"
		19	#include <libintl.h>
19		20
20	/*	21	/*
21	* Constructs a CelestialBrowser which is a child of 'parent', with the	22	* Constructs a CelestialBrowser which is a child of 'parent', with the

Lines 22-27 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/celsplashscreen.cpp (+1 lines)
22	#include <kglobalsettings.h>	22	#include <kglobalsettings.h>
23	#include <celsplashscreen.h>	23	#include <celsplashscreen.h>
24	#include <X11/Xlib.h>	24	#include <X11/Xlib.h>
		25	#include <libintl.h>
25		26
26	CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent):	27	CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent):
27	QWidget(0, 0, WStyle_Customize \| WX11BypassWM),	28	QWidget(0, 0, WStyle_Customize \| WX11BypassWM),

Lines 11-16 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/eclipsefinderdlg.cpp (+1 lines)
11	#include "celestiacore.h"	11	#include "celestiacore.h"
12	#include "celengine/astro.h"	12	#include "celengine/astro.h"
13	#include "eclipsefinder.h"	13	#include "eclipsefinder.h"
		14	#include <libintl.h>
14		15
15	/*	16	/*
16	* Constructs a EclipseFinder which is a child of 'parent', with the	17	* Constructs a EclipseFinder which is a child of 'parent', with the

Lines 19-24 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmanager.cpp (+1 lines)
19	#include <qdir.h>	19	#include <qdir.h>
20	#include <kstandarddirs.h>	20	#include <kstandarddirs.h>
21	#include "kcelbookmarkmanager.h"	21	#include "kcelbookmarkmanager.h"
		22	#include <libintl.h>
22		23
23	KBookmarkManager* KCelBookmarkManager::self() {	24	KBookmarkManager* KCelBookmarkManager::self() {
24	if ( !s_bookmarkManager )	25	if ( !s_bookmarkManager )

Lines 45-50 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmenu.cpp (+1 lines)
45	#include <kpopupmenu.h>	45	#include <kpopupmenu.h>
46	#include <kstdaccel.h>	46	#include <kstdaccel.h>
47	#include <kstdaction.h>	47	#include <kstdaction.h>
		48	#include <libintl.h>
48		49
49	template class QPtrList<KCelBookmarkMenu>;	50	template class QPtrList<KCelBookmarkMenu>;
50		51

Lines 87-92 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/kdeapp.cpp (+1 lines)
87	#endif	87	#endif
88		88
89	#include "celengine/glext.h"	89	#include "celengine/glext.h"
		90	#include <libintl.h>
90		91
91	#define MENUMAXSIZE 100	92	#define MENUMAXSIZE 100
92		93

Lines 48-53 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/kdeglwidget.cpp (+1 lines)
48		48
49	#include <math.h>	49	#include <math.h>
50	#include <vector>	50	#include <vector>
		51	#include <libintl.h>
51		52
52	KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core)	53	KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core)
53	: QGLWidget( parent, name )	54	: QGLWidget( parent, name )

Lines 20-25 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/kdemain.cpp (+1 lines)
20	#include <klocale.h>	20	#include <klocale.h>
21		21
22	#include "kdeuniquecelestia.h"	22	#include "kdeuniquecelestia.h"
		23	#include <libintl.h>
23		24
24	static const char *description =	25	static const char *description =
25	I18N_NOOP("Celestia");	26	I18N_NOOP("Celestia");

Lines 40-45 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/kdepreferencesdialog.cpp (+1 lines)
40	#include "celengine/render.h"	40	#include "celengine/render.h"
41	#include "celengine/glcontext.h"	41	#include "celengine/glcontext.h"
42	#include "celengine/astro.h"	42	#include "celengine/astro.h"
		43	#include <libintl.h>
43		44
44	static uint32 FilterOtherLocations = ~(Location::City \|	45	static uint32 FilterOtherLocations = ~(Location::City \|
45	Location::Observatory \|	46	Location::Observatory \|

Lines 21-26 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/kdeuniquecelestia.cpp (+1 lines)
21	#include <string>	21	#include <string>
22	#include <vector>	22	#include <vector>
23	#include <klocale.h>	23	#include <klocale.h>
		24	#include <libintl.h>
24		25
25	KdeUniqueCelestia::KdeUniqueCelestia() {	26	KdeUniqueCelestia::KdeUniqueCelestia() {
26		27

Lines 29-34 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/selectionpopup.cpp (+1 lines)
29	#include <krun.h>	29	#include <krun.h>
30		30
31	#include "celutil/utf8.h"	31	#include "celutil/utf8.h"
		32	#include <libintl.h>
32		33
33	SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel):	34	SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel):
34	KPopupMenu(parent),	35	KPopupMenu(parent),

Lines 36-41 Link Here

(-)celestia-1.5.0-upstream/src/celestia/kde/videocapturedlg.cpp (+1 lines)
36	#include <kstatusbar.h>	36	#include <kstatusbar.h>
37	#include <kapp.h>	37	#include <kapp.h>
38	#include "kdeapp.h"	38	#include "kdeapp.h"
		39	#include <libintl.h>
39		40
40	VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir):	41	VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir):
41	accepted(false)	42	accepted(false)




#include <celutil/util.h>
#include "../celengine/gl.h"
#include <string>
#include <cstring>
#include "theora/theora.h"

using namespace std;

#include "oggtheoracapture.h"
#include <libintl.h>

//  {"video-rate-target",required_argument,NULL,'V'},
//  {"video-quality",required_argument,NULL,'v'},

Lines 13-18 Link Here

(-)celestia-1.5.0-upstream/src/celestia/scriptmenu.cpp (+1 lines)
13	#include "celutil/directory.h"	13	#include "celutil/directory.h"
14	#include "celutil/filetype.h"	14	#include "celutil/filetype.h"
15	#include <fstream>	15	#include <fstream>
		16	#include <libintl.h>
16		17
17	using namespace std;	18	using namespace std;
18		19




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

#include <string>
#include <string.h>
#include <stdio.h>
#include "celestiacore.h"
#include "celengine/astro.h"
#include "url.h"
#include <libintl.h>

static const unsigned int CurrentCelestiaURLVersion = 2;


Lines 14-20 Link Here

(-)celestia-1.5.0-upstream/src/celestia/wglext.cpp (+3 lines)
14	#include "wglext.h"	14	#include "wglext.h"
15	#include <windows.h>	15	#include <windows.h>
16	#include <cstdio>	16	#include <cstdio>
		17	#include <cstring>
		18	#include <string.h>
17	#include <vector>	19	#include <vector>
		20	#include <libintl.h>
18		21
19	using namespace std;	22	using namespace std;
20		23

Lines 13-18 Link Here

(-)celestia-1.5.0-upstream/src/celestia/winbookmarks.cpp (+1 lines)
13	#include "res/resource.h"	13	#include "res/resource.h"
14	#include <celutil/winutil.h>	14	#include <celutil/winutil.h>
15	#include <iostream>	15	#include <iostream>
		16	#include <string.h>
16		17
17	using namespace std;	18	using namespace std;
18		19





#include <windows.h>
#include <commctrl.h>
#include <cstring>
#include "celutil/basictypes.h"
#include "celengine/astro.h"
#include "celutil/util.h"
#include "celutil/winutil.h"
#include <libintl.h>


// DatePicker is a Win32 control for setting the date. It replaces the

Lines 10-15 Link Here

(-)celestia-1.5.0-upstream/src/celestia/wineclipses.cpp (+2 lines)
10		10
11	#include <string>	11	#include <string>
12	#include <sstream>	12	#include <sstream>
		13	#include <string.h>
13	#include <algorithm>	14	#include <algorithm>
14	#include <set>	15	#include <set>
15	#include <cassert>	16	#include <cassert>
Lines 23-28 Link Here
23	#include "celmath/distance.h"	24	#include "celmath/distance.h"
24	#include "celutil/util.h"	25	#include "celutil/util.h"
25	#include "celutil/winutil.h"	26	#include "celutil/winutil.h"
		27	#include <libintl.h>
26		28
27	using namespace std;	29	using namespace std;
28		30

Lines 9-14 Link Here

(-)celestia-1.5.0-upstream/src/celestia/winhyperlinks.cpp (+1 lines)
9	// as published by the Free Software Foundation; either version 2	9	// as published by the Free Software Foundation; either version 2
10	// of the License, or (at your option) any later version.	10	// of the License, or (at your option) any later version.
11		11
		12	#include <cstring>
12	#include "winhyperlinks.h"	13	#include "winhyperlinks.h"
13	#include "res/resource.h"	14	#include "res/resource.h"
14		15

Lines 23-28 Link Here

(-)celestia-1.5.0-upstream/src/celestia/winmain.cpp (+2 lines)
23	#include <windows.h>	23	#include <windows.h>
24	#include <commctrl.h>	24	#include <commctrl.h>
25	#include <mmsystem.h>	25	#include <mmsystem.h>
		26	#include <string.h>
26		27
27	#include <celmath/vecmath.h>	28	#include <celmath/vecmath.h>
28	#include <celmath/quaternion.h>	29	#include <celmath/quaternion.h>
Lines 59-64 Link Here
59	#include "wglext.h"	60	#include "wglext.h"
60		61
61	#include <locale.h>	62	#include <locale.h>
		63	#include <libintl.h>
62		64
63	using namespace std;	65	using namespace std;
64		66

Lines 15-20 Link Here

(-)celestia-1.5.0-upstream/src/celestia/winsplash.cpp (+1 lines)
15	#include <commctrl.h>	15	#include <commctrl.h>
16	#include "res/resource.h"	16	#include "res/resource.h"
17	#include <iostream>	17	#include <iostream>
		18	#include <libintl.h>
18		19
19	using namespace std;	20	using namespace std;
20		21




#include <windows.h>
#include <commctrl.h>
#include <cstring>
#include <string.h>
#include "winstarbrowser.h"
#include "celutil/winutil.h"

#include "res/resource.h"
#include <libintl.h>

extern void SetMouseCursor(LPCTSTR lpCursor);


Lines 18-23 Link Here

(-)celestia-1.5.0-upstream/src/celestia/wintime.cpp (+1 lines)
18	#include <celengine/astro.h>	18	#include <celengine/astro.h>
19	#include "celutil/util.h"	19	#include "celutil/util.h"
20	#include "celutil/winutil.h"	20	#include "celutil/winutil.h"
		21	#include <libintl.h>
21		22
22		23
23		24

Lines 16-22 Link Here

(-)celestia-1.5.0-upstream/src/celmath/quaternion.h (-1 lines)
16	#include <celmath/mathlib.h>	16	#include <celmath/mathlib.h>
17	#include <celmath/vecmath.h>	17	#include <celmath/vecmath.h>
18		18
19
20	template<class T> class Quaternion	19	template<class T> class Quaternion
21	{	20	{
22	public:	21	public:

Lines 10-15 Link Here

(-)celestia-1.5.0-upstream/src/celutil/bigfix.cpp (+1 lines)
10	#include <math.h>	10	#include <math.h>
11	#include <stdio.h>	11	#include <stdio.h>
12	#include "bigfix.h"	12	#include "bigfix.h"
		13	#include <libintl.h>
13		14
14		15
15	/* Constructors */	16	/* Constructors */

Lines 9-14 Link Here

(-)celestia-1.5.0-upstream/src/celutil/color.cpp (+1 lines)
9		9
10	#include <cstdio>	10	#include <cstdio>
11	#include <cstring>	11	#include <cstring>
		12	#include <string.h>
12	#include <cctype>	13	#include <cctype>
13	#include "color.h"	14	#include "color.h"
14		15

Lines 9-14 Link Here

(-)celestia-1.5.0-upstream/src/celutil/directory.cpp (+1 lines)
9		9
10	#include <iostream>	10	#include <iostream>
11	#include "directory.h"	11	#include "directory.h"
		12	#include <libintl.h>
12		13
13	using namespace std;	14	using namespace std;
14		15

Lines 11-16 Link Here

(-)celestia-1.5.0-upstream/src/celutil/filetype.cpp (+1 lines)
11	#include <cstdlib>	11	#include <cstdlib>
12	#include "util.h"	12	#include "util.h"
13	#include "filetype.h"	13	#include "filetype.h"
		14	#include <libintl.h>
14		15
15	using namespace std;	16	using namespace std;
16		17

Lines 10-15 Link Here

(-)celestia-1.5.0-upstream/src/celutil/formatnum.cpp (+2 lines)
10	#include <cmath>	10	#include <cmath>
11	#include <cstdio>	11	#include <cstdio>
12	#include <string>	12	#include <string>
		13	#include <cstring>
		14	#include <limits.h>
13	#include "formatnum.h"	15	#include "formatnum.h"
14		16
15	// HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf	17	// HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf

Lines 9-15 Link Here

(-)celestia-1.5.0-upstream/src/celutil/utf8.cpp (+2 lines)
9		9
10	#include "utf8.h"	10	#include "utf8.h"
11	#include <cctype>	11	#include <cctype>
		12	#include <cstring>
12	#include "util.h"	13	#include "util.h"
		14	#include <libintl.h>
13		15
14	unsigned int WGL4_Normalization_00[256] = {	16	unsigned int WGL4_Normalization_00[256] = {
15	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,	17	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,

Lines 12-17 Link Here

(-)celestia-1.5.0-upstream/src/celutil/util.cpp (+1 lines)
12	#include "util.h"	12	#include "util.h"
13	#include <sys/types.h>	13	#include <sys/types.h>
14	#include <sys/stat.h>	14	#include <sys/stat.h>
		15	#include <libintl.h>
15		16
16	using namespace std;	17	using namespace std;
17		18

Lines 22-32 Link Here

(-)celestia-1.5.0-upstream/src/celutil/util.h (-2 / +2 lines)
22	switch(0){case 0: case pred:;}	22	switch(0){case 0: case pred:;}
23		23
24	#ifndef min	24	#ifndef min
25	#define min(a, b) ((a) < (b) ? (a) : (b))	25	template <typename T1, typename T2> bool min(T1 a, T2 b){ return a<(T1)b; }
26	#endif	26	#endif
27		27
28	#ifndef max	28	#ifndef max
29	#define max(a, b) ((a) < (b) ? (b) : (a))	29	template <typename T1, typename T2> bool max(T1 a, T2 b){ return a<(T1)b; }
30	#endif	30	#endif
31		31
32	#ifdef _WIN32	32	#ifdef _WIN32

Lines 10-15 Link Here

(-)celestia-1.5.0-upstream/src/celutil/windirectory.cpp (+1 lines)
10	#include <iostream>	10	#include <iostream>
11	#include <windows.h>	11	#include <windows.h>
12	#include "directory.h"	12	#include "directory.h"
		13	#include <libintl.h>
13		14
14	using namespace std;	15	using namespace std;
15		16

Lines 10-15 Link Here

(-)celestia-1.5.0-upstream/src/packdb.cpp (+1 lines)
10	#include <stdlib.h>	10	#include <stdlib.h>
11	#include <stdio.h>	11	#include <stdio.h>
12	#include <string.h>	12	#include <string.h>
		13	#include <libintl.h>
13		14
14	#define SPECTRAL_O 0	15	#define SPECTRAL_O 0
15	#define SPECTRAL_B 1	16	#define SPECTRAL_B 1

Lines 11-17 Link Here

(-)celestia-1.5.0-upstream/src/tools/atmosphere/scattersim.cpp (+2 lines)
11	#include <iostream>	11	#include <iostream>
12	#include <fstream>	12	#include <fstream>
13	#include <string>	13	#include <string>
		14	#include <string.h>
14	#include <cstdlib>	15	#include <cstdlib>
		16	#include <libintl.h>
15	#include <cmath>	17	#include <cmath>
16	#include <algorithm>	18	#include <algorithm>
17	#include <map>	19	#include <map>

Lines 16-21 Link Here

(-)celestia-1.5.0-upstream/src/tools/buildstardb.cpp (+1 lines)
16	#include <cstdio>	16	#include <cstdio>
17	#include <assert.h>	17	#include <assert.h>
18	#include "stardb.h"	18	#include "stardb.h"
		19	#include <libintl.h>
19		20
20	using namespace std;	21	using namespace std;
21		22

Lines 18-23 Link Here

(-)celestia-1.5.0-upstream/src/tools/cmod/cmodfix.cpp (+1 lines)
18	#include <cassert>	18	#include <cassert>
19	#include <cmath>	19	#include <cmath>
20	#include <cstdio>	20	#include <cstdio>
		21	#include <string.h>
21	#include <algorithm>	22	#include <algorithm>
22	#include <vector>	23	#include <vector>
23	#ifdef TRISTRIP	24	#ifdef TRISTRIP

Lines 3-8 Link Here

(-)celestia-1.5.0-upstream/src/tools/cmod/xtocmod.cpp (+1 lines)
3	#include <iomanip>	3	#include <iomanip>
4	#include <algorithm>	4	#include <algorithm>
5	#include <cstdio>	5	#include <cstdio>
		6	#include <string.h>
6	#include <cassert>	7	#include <cassert>
7	#include <cstring>	8	#include <cstring>
8	#include <d3dx9.h>	9	#include <d3dx9.h>

Lines 14-19 Link Here

(-)celestia-1.5.0-upstream/src/tools/stardb/makestardb.cpp (+1 lines)
14	#include <iomanip>	14	#include <iomanip>
15	#include <cctype>	15	#include <cctype>
16	#include <cassert>	16	#include <cassert>
		17	#include <string.h>
17	#include <celutil/basictypes.h>	18	#include <celutil/basictypes.h>
18	#include <celutil/bytes.h>	19	#include <celutil/bytes.h>
19	#include <celengine/astro.h>	20	#include <celengine/astro.h>

Lines 13-18 Link Here

(-)celestia-1.5.0-upstream/src/tools/stardb/startextdump.cpp (+1 lines)
13	#include <iostream>	13	#include <iostream>
14	#include <fstream>	14	#include <fstream>
15	#include <iomanip>	15	#include <iomanip>
		16	#include <string.h>
16	#include <celutil/basictypes.h>	17	#include <celutil/basictypes.h>
17	#include <celutil/bytes.h>	18	#include <celutil/bytes.h>
18	#include <celengine/astro.h>	19	#include <celengine/astro.h>

Lines 60-69 Link Here

(-)celestia-1.5.0/src/celestia/oggtheoracapture.cpp.old (+1 lines)
60	#endif	60	#endif
61		61
62	#include <cstdlib>	62	#include <cstdlib>
63	#include <cstdio>	63	#include <cstdio>
64	#include <cmath>	64	#include <cmath>
		65	#include <ctime>
65	#include <celutil/debug.h>	66	#include <celutil/debug.h>
66	#include <celutil/util.h>	67	#include <celutil/util.h>
67	#include "../celengine/gl.h"	68	#include "../celengine/gl.h"
68	#include <string>	69	#include <string>
69	#include <cstring>	70	#include <cstring>

Return to bug 217758

Lines 16-25 Link Here

(-)celestia-1.5.0-upstream/src/celestia/url.cpp (+2 lines)
16	***************************************************************************/	16	***************************************************************************/
17		17
18	#include <string>	18	#include <string>
		19	#include <string.h>
19	#include <stdio.h>	20	#include <stdio.h>
20	#include "celestiacore.h"	21	#include "celestiacore.h"
21	#include "celengine/astro.h"	22	#include "celengine/astro.h"
22	#include "url.h"	23	#include "url.h"
		24	#include <libintl.h>
23		25
24	static const unsigned int CurrentCelestiaURLVersion = 2;	26	static const unsigned int CurrentCelestiaURLVersion = 2;
25		27