rev |
line source |
lufeng369@7378
|
1 diff -Naur stardict-3.0.1.orig/src/gconf_file.cpp stardict-3.0.1/src/gconf_file.cpp
|
lufeng369@7378
|
2 --- stardict-3.0.1.orig/src/gconf_file.cpp 2007-07-10 08:16:04.000000000 +0100
|
lufeng369@7378
|
3 +++ stardict-3.0.1/src/gconf_file.cpp 2008-04-11 18:18:43.000000000 +0100
|
lufeng369@7378
|
4 @@ -22,6 +22,8 @@
|
lufeng369@7378
|
5 # include "config.h"
|
lufeng369@7378
|
6 #endif
|
lufeng369@7378
|
7
|
lufeng369@7378
|
8 +#include <memory>
|
lufeng369@7378
|
9 +
|
lufeng369@7378
|
10 #include <glib/gi18n.h>
|
lufeng369@7378
|
11
|
lufeng369@7378
|
12 #include "gconf_file.hpp"
|
lufeng369@7378
|
13 diff -Naur stardict-3.0.1.orig/src/inifile.cpp stardict-3.0.1/src/inifile.cpp
|
lufeng369@7378
|
14 --- stardict-3.0.1.orig/src/inifile.cpp 2007-08-01 10:43:00.000000000 +0100
|
lufeng369@7378
|
15 +++ stardict-3.0.1/src/inifile.cpp 2008-04-11 18:18:43.000000000 +0100
|
lufeng369@7378
|
16 @@ -25,6 +25,7 @@
|
lufeng369@7378
|
17 #include <vector>
|
lufeng369@7378
|
18 #include <cerrno>
|
lufeng369@7378
|
19 #include <cstring>
|
lufeng369@7378
|
20 +#include <cstdlib>
|
lufeng369@7378
|
21 #include <cstdio>
|
lufeng369@7378
|
22 #include <glib/gi18n.h>
|
lufeng369@7378
|
23 #include <glib/gstdio.h>
|
lufeng369@7378
|
24 diff -Naur stardict-3.0.1.orig/src/pangoview.cpp stardict-3.0.1/src/pangoview.cpp
|
lufeng369@7378
|
25 --- stardict-3.0.1.orig/src/pangoview.cpp 2007-09-25 08:11:48.000000000 +0100
|
lufeng369@7378
|
26 +++ stardict-3.0.1/src/pangoview.cpp 2008-04-11 18:18:43.000000000 +0100
|
lufeng369@7378
|
27 @@ -22,6 +22,8 @@
|
lufeng369@7378
|
28 # include "config.h"
|
lufeng369@7378
|
29 #endif
|
lufeng369@7378
|
30
|
lufeng369@7378
|
31 +#include <cstring>
|
lufeng369@7378
|
32 +
|
lufeng369@7378
|
33 #include "gtktextviewpango.h"
|
lufeng369@7378
|
34 #include "utils.h"
|
lufeng369@7378
|
35 #include "skin.h"//for SkinCursor definition
|
lufeng369@7378
|
36 diff -Naur stardict-3.0.1.orig/src/prefsdlg.cpp stardict-3.0.1/src/prefsdlg.cpp
|
lufeng369@7378
|
37 --- stardict-3.0.1.orig/src/prefsdlg.cpp 2007-10-30 08:14:07.000000000 +0000
|
lufeng369@7378
|
38 +++ stardict-3.0.1/src/prefsdlg.cpp 2008-04-11 18:18:43.000000000 +0100
|
lufeng369@7378
|
39 @@ -21,6 +21,8 @@
|
lufeng369@7378
|
40 # include "config.h"
|
lufeng369@7378
|
41 #endif
|
lufeng369@7378
|
42
|
lufeng369@7378
|
43 +#include <cstdlib>
|
lufeng369@7378
|
44 +
|
lufeng369@7378
|
45 #include <glib/gi18n.h>
|
lufeng369@7378
|
46 #include <glib/gstdio.h>
|
lufeng369@7378
|
47
|
lufeng369@7378
|
48 diff -Naur stardict-3.0.1.orig/src/readword.cpp stardict-3.0.1/src/readword.cpp
|
lufeng369@7378
|
49 --- stardict-3.0.1.orig/src/readword.cpp 2007-07-10 08:16:04.000000000 +0100
|
lufeng369@7378
|
50 +++ stardict-3.0.1/src/readword.cpp 2008-04-11 17:53:43.000000000 +0100
|
lufeng369@7378
|
51 @@ -3,6 +3,7 @@
|
lufeng369@7378
|
52 #endif
|
lufeng369@7378
|
53
|
lufeng369@7378
|
54 #include <cstring>
|
lufeng369@7378
|
55 +#include <cstdlib>
|
lufeng369@7378
|
56 #include <string>
|
lufeng369@7378
|
57
|
lufeng369@7378
|
58 #include <glib/gi18n.h>
|
lufeng369@7378
|
59 diff -Naur stardict-3.0.1.orig/src/sigc++/signal.h stardict-3.0.1/src/sigc++/signal.h
|
lufeng369@7378
|
60 --- stardict-3.0.1.orig/src/sigc++/signal.h 2007-07-10 08:16:01.000000000 +0100
|
lufeng369@7378
|
61 +++ stardict-3.0.1/src/sigc++/signal.h 2008-04-11 17:50:11.000000000 +0100
|
lufeng369@7378
|
62 @@ -18,7 +18,7 @@
|
lufeng369@7378
|
63 //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
|
lufeng369@7378
|
64 //do not allow a typedef to have the same name as a class in the typedef's definition.
|
lufeng369@7378
|
65 //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
|
lufeng369@7378
|
66 - #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
|
lufeng369@7378
|
67 +// #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
|
lufeng369@7378
|
68 #endif
|
lufeng369@7378
|
69
|
lufeng369@7378
|
70 namespace sigc {
|
lufeng369@7378
|
71 diff -Naur stardict-3.0.1.orig/src/utils.cpp stardict-3.0.1/src/utils.cpp
|
lufeng369@7378
|
72 --- stardict-3.0.1.orig/src/utils.cpp 2007-10-22 03:25:02.000000000 +0100
|
lufeng369@7378
|
73 +++ stardict-3.0.1/src/utils.cpp 2008-04-11 18:18:43.000000000 +0100
|
lufeng369@7378
|
74 @@ -22,6 +22,8 @@
|
lufeng369@7378
|
75 # include "config.h"
|
lufeng369@7378
|
76 #endif
|
lufeng369@7378
|
77
|
lufeng369@7378
|
78 +#include <cstring>
|
lufeng369@7378
|
79 +
|
lufeng369@7378
|
80 #include <glib.h>
|
lufeng369@7378
|
81 #include <glib/gi18n.h>
|
lufeng369@7378
|
82 #include <cstdlib>
|
lufeng369@7378
|
83 diff -Naur stardict-3.0.1.orig/src/x11_iskeyspressed.hpp stardict-3.0.1/src/x11_iskeyspressed.hpp
|
lufeng369@7378
|
84 --- stardict-3.0.1.orig/src/x11_iskeyspressed.hpp 2007-07-10 08:16:04.000000000 +0100
|
lufeng369@7378
|
85 +++ stardict-3.0.1/src/x11_iskeyspressed.hpp 2008-04-11 17:57:08.000000000 +0100
|
lufeng369@7378
|
86 @@ -1,6 +1,8 @@
|
lufeng369@7378
|
87 #ifndef _X11_ISKEYSPRESSED_HPP_
|
lufeng369@7378
|
88 #define _X11_ISKEYSPRESSED_HPP_
|
lufeng369@7378
|
89
|
lufeng369@7378
|
90 +#include <memory>
|
lufeng369@7378
|
91 +
|
lufeng369@7378
|
92 #include <gdk/gdkx.h>
|
lufeng369@7378
|
93 #include <X11/keysym.h>
|
lufeng369@7378
|
94 #include <gtk/gtk.h>
|
lufeng369@7378
|
95
|
lufeng369@7378
|
96 #ifdef _WIN32
|
lufeng369@7378
|
97 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
|
lufeng369@7378
|
98 --- stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2007-09-19 09:27:18.000000000 +0100
|
lufeng369@7378
|
99 +++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-04-11 18:02:55.000000000 +0100
|
lufeng369@7378
|
100 @@ -1,4 +1,5 @@
|
lufeng369@7378
|
101 #include "stardict_espeak.h"
|
lufeng369@7378
|
102 +#include <cstring>
|
lufeng369@7378
|
103 #include <espeak/speak_lib.h>
|
lufeng369@7378
|
104 #include <glib/gi18n.h>
|
lufeng369@7378
|
105
|
lufeng369@7378
|
106 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
|
lufeng369@7378
|
107 --- stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2007-09-13 08:51:55.000000000 +0100
|
lufeng369@7378
|
108 +++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-04-11 17:59:50.000000000 +0100
|
lufeng369@7378
|
109 @@ -1,4 +1,6 @@
|
lufeng369@7378
|
110 #include "stardict_html_parsedata.h"
|
lufeng369@7378
|
111 +#include <cstring>
|
lufeng369@7378
|
112 +#include <cstdlib>
|
lufeng369@7378
|
113 #include <glib/gi18n.h>
|
lufeng369@7378
|
114
|
lufeng369@7378
|
115 #ifdef _WIN32
|
lufeng369@7378
|
116
|
lufeng369@7378
|
117 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
|
lufeng369@7378
|
118 --- stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2007-09-19 09:29:21.000000000 +0100
|
lufeng369@7378
|
119 +++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-04-11 18:02:38.000000000 +0100
|
lufeng369@7378
|
120 @@ -1,4 +1,5 @@
|
lufeng369@7378
|
121 #include "stardict_spell.h"
|
lufeng369@7378
|
122 +#include <cstring>
|
lufeng369@7378
|
123 #include <glib.h>
|
lufeng369@7378
|
124 #include <glib/gi18n.h>
|
lufeng369@7378
|
125 #include <enchant.h>
|
lufeng369@7378
|
126
|
lufeng369@7378
|
127 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
|
lufeng369@7378
|
128 --- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2007-10-18 02:36:22.000000000 +0100
|
lufeng369@7378
|
129 +++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-04-11 18:01:10.000000000 +0100
|
lufeng369@7378
|
130 @@ -1,4 +1,5 @@
|
lufeng369@7378
|
131 #include "court_widget.h"
|
lufeng369@7378
|
132 +#include <cstring>
|
lufeng369@7378
|
133 #include <math.h>
|
lufeng369@7378
|
134 #include <list>
|
lufeng369@7378
|
135
|
lufeng369@7378
|
136 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
|
lufeng369@7378
|
137 --- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2007-10-15 04:32:04.000000000 +0100
|
lufeng369@7378
|
138 +++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-04-11 18:00:35.000000000 +0100
|
lufeng369@7378
|
139 @@ -1,5 +1,6 @@
|
lufeng369@7378
|
140 #include "stardict_wordnet.h"
|
lufeng369@7378
|
141 #include "court_widget.h"
|
lufeng369@7378
|
142 +#include <cstring>
|
lufeng369@7378
|
143 #include <glib/gi18n.h>
|
lufeng369@7378
|
144
|
lufeng369@7378
|
145 #ifdef _WIN32
|
lufeng369@7378
|
146
|
lufeng369@7378
|
147 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
|
lufeng369@7378
|
148 --- stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2007-08-31 07:41:54.000000000 +0100
|
lufeng369@7378
|
149 +++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-04-11 18:00:12.000000000 +0100
|
lufeng369@7378
|
150 @@ -1,4 +1,5 @@
|
lufeng369@7378
|
151 #include "stardict_xdxf_parsedata.h"
|
lufeng369@7378
|
152 +#include <cstring>
|
lufeng369@7378
|
153 #include <glib/gi18n.h>
|
lufeng369@7378
|
154
|
lufeng369@7378
|
155 #ifdef _WIN32
|
lufeng369@7378
|
156 diff -Naur stardict-3.0.1.orig/tests/t_config_file.cpp stardict-3.0.1/tests/t_config_file.cpp
|
lufeng369@7378
|
157 --- stardict-3.0.1.orig/tests/t_config_file.cpp 2007-07-10 08:16:04.000000000 +0100
|
lufeng369@7378
|
158 +++ stardict-3.0.1/tests/t_config_file.cpp 2008-04-11 18:04:13.000000000 +0100
|
lufeng369@7378
|
159 @@ -8,6 +8,7 @@
|
lufeng369@7378
|
160 #include <cstring>
|
lufeng369@7378
|
161 #include <iterator>
|
lufeng369@7378
|
162 #include <iostream>
|
lufeng369@7378
|
163 +#include <memory>
|
lufeng369@7378
|
164 #include <gtk/gtk.h>
|
lufeng369@7378
|
165
|
lufeng369@7378
|
166 #include "config_file.hpp"
|
lufeng369@7378
|
167 diff -Naur stardict-3.0.1.orig/tests/t_xml.cpp stardict-3.0.1/tests/t_xml.cpp
|
lufeng369@7378
|
168 --- stardict-3.0.1.orig/tests/t_xml.cpp 2007-07-10 08:16:04.000000000 +0100
|
lufeng369@7378
|
169 +++ stardict-3.0.1/tests/t_xml.cpp 2008-04-11 18:04:58.000000000 +0100
|
lufeng369@7378
|
170 @@ -5,6 +5,7 @@
|
lufeng369@7378
|
171 #include <glib.h>
|
lufeng369@7378
|
172 #include <cstdlib>
|
lufeng369@7378
|
173 #include <string>
|
lufeng369@7378
|
174 +#include <cstring>
|
lufeng369@7378
|
175
|
lufeng369@7378
|
176
|
lufeng369@7378
|
177 static void xml_decode(const char *str, std::string& decoded)
|