|
Line
Link Here
|
| 0 |
-- src/inifile.cpp |
0 |
++ src/inifile.cpp |
|
Lines 26-31
Link Here
|
| 26 |
#include <cerrno> |
26 |
#include <cerrno> |
| 27 |
#include <cstring> |
27 |
#include <cstring> |
| 28 |
#include <cstdio> |
28 |
#include <cstdio> |
|
|
29 |
#include <cstdlib> |
| 29 |
#include <glib/gi18n.h> |
30 |
#include <glib/gi18n.h> |
| 30 |
#include <glib/gstdio.h> |
31 |
#include <glib/gstdio.h> |
| 31 |
|
32 |
|
| 32 |
-- src/lib/common.hpp |
33 |
++ src/lib/common.hpp |
|
Lines 4-9
Link Here
|
| 4 |
#include <glib.h> |
4 |
#include <glib.h> |
| 5 |
#include <list> |
5 |
#include <list> |
| 6 |
#include <string> |
6 |
#include <string> |
|
|
7 |
#include <cstring> |
| 8 |
#include <cstdlib> |
| 7 |
|
9 |
|
| 8 |
//this structure contain all information about dictionary |
10 |
//this structure contain all information about dictionary |
| 9 |
struct DictInfo { |
11 |
struct DictInfo { |
| 10 |
-- src/lib/data.hpp |
12 |
++ src/lib/data.hpp |
|
Lines 4-9
Link Here
|
| 4 |
#include <glib.h> |
4 |
#include <glib.h> |
| 5 |
#include <vector> |
5 |
#include <vector> |
| 6 |
#include <string> |
6 |
#include <string> |
|
|
7 |
#include <cstring> |
| 7 |
#include <memory> |
8 |
#include <memory> |
| 8 |
|
9 |
|
| 9 |
#include "dictziplib.hpp" |
10 |
#include "dictziplib.hpp" |
| 10 |
-- src/lib/pluginmanager.cpp |
11 |
++ src/lib/pluginmanager.cpp |
|
Lines 1-6
Link Here
|
| 1 |
#include "pluginmanager.h" |
1 |
#include "pluginmanager.h" |
| 2 |
#include "file.hpp" |
2 |
#include "file.hpp" |
| 3 |
#include <string> |
3 |
#include <string> |
|
|
4 |
#include <cstring> |
| 4 |
|
5 |
|
| 5 |
StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_): |
6 |
StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_): |
| 6 |
plugin_filename(filename), module(module_), configure_func(configure_func_) |
7 |
plugin_filename(filename), module(module_), configure_func(configure_func_) |
| 7 |
-- src/lib/sockets.hpp |
8 |
++ src/lib/sockets.hpp |
|
Lines 3-8
Link Here
|
| 3 |
|
3 |
|
| 4 |
#include <glib.h> |
4 |
#include <glib.h> |
| 5 |
#include <string> |
5 |
#include <string> |
|
|
6 |
#include <cstring> |
| 7 |
#include <cstdlib> |
| 6 |
#include <map> |
8 |
#include <map> |
| 7 |
#ifndef _WIN32 |
9 |
#ifndef _WIN32 |
| 8 |
# include <netdb.h> |
10 |
# include <netdb.h> |
| 9 |
-- src/sigc++/macros/signal.h.m4 |
11 |
++ src/sigc++/macros/signal.h.m4 |
|
Lines 483-489
Link Here
|
| 483 |
//Compilers, such as older versions of SUN Forte C++, that do not allow this also often |
483 |
//Compilers, such as older versions of SUN Forte C++, that do not allow this also often |
| 484 |
//do not allow a typedef to have the same name as a class in the typedef's definition. |
484 |
//do not allow a typedef to have the same name as a class in the typedef's definition. |
| 485 |
//For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. |
485 |
//For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. |
| 486 |
#define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 |
486 |
//#define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 |
| 487 |
#endif |
487 |
#endif |
| 488 |
|
488 |
|
| 489 |
namespace sigc { |
489 |
namespace sigc { |
| 490 |
-- src/sigc++/signal.h |
490 |
++ src/sigc++/signal.h |
|
Lines 18-24
Link Here
|
| 18 |
//Compilers, such as older versions of SUN Forte C++, that do not allow this also often |
18 |
//Compilers, such as older versions of SUN Forte C++, that do not allow this also often |
| 19 |
//do not allow a typedef to have the same name as a class in the typedef's definition. |
19 |
//do not allow a typedef to have the same name as a class in the typedef's definition. |
| 20 |
//For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. |
20 |
//For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. |
| 21 |
#define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 |
21 |
//#define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 |
| 22 |
#endif |
22 |
#endif |
| 23 |
|
23 |
|
| 24 |
namespace sigc { |
24 |
namespace sigc { |
| 25 |
-- src/utils.h |
25 |
++ src/utils.h |
|
Lines 3-8
Link Here
|
| 3 |
|
3 |
|
| 4 |
#include <glib.h> |
4 |
#include <glib.h> |
| 5 |
#include <string> |
5 |
#include <string> |
|
|
6 |
#include <cstring> |
| 6 |
#include <vector> |
7 |
#include <vector> |
| 7 |
#include <gdk-pixbuf/gdk-pixbuf.h> |
8 |
#include <gdk-pixbuf/gdk-pixbuf.h> |
| 8 |
|
9 |
|
| 9 |
-- src/x11_iskeyspressed.hpp |
10 |
++ src/x11_iskeyspressed.hpp |
|
Lines 4-9
Link Here
|
| 4 |
#include <gdk/gdkx.h> |
4 |
#include <gdk/gdkx.h> |
| 5 |
#include <X11/keysym.h> |
5 |
#include <X11/keysym.h> |
| 6 |
#include <gtk/gtk.h> |
6 |
#include <gtk/gtk.h> |
|
|
7 |
#include <memory> |
| 7 |
|
8 |
|
| 8 |
#include "iskeyspressed.hpp" |
9 |
#include "iskeyspressed.hpp" |
| 9 |
|
10 |
|
| 10 |
-- stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp |
11 |
++ stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp |
|
Lines 1-6
Link Here
|
| 1 |
#include "stardict_dictdotcn.h" |
1 |
#include "stardict_dictdotcn.h" |
| 2 |
#include <glib/gi18n.h> |
2 |
#include <glib/gi18n.h> |
| 3 |
#include <string> |
3 |
#include <string> |
|
|
4 |
#include <cstring> |
| 4 |
#include <list> |
5 |
#include <list> |
| 5 |
|
6 |
|
| 6 |
#ifdef _WIN32 |
7 |
#ifdef _WIN32 |
| 7 |
-- stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp |
8 |
++ stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp |
|
Lines 1-5
Link Here
|
| 1 |
#include "stardict_html_parsedata.h" |
1 |
#include "stardict_html_parsedata.h" |
| 2 |
#include <glib/gi18n.h> |
2 |
#include <glib/gi18n.h> |
|
|
3 |
#include <cstring> |
| 4 |
#include <cstdlib> |
| 3 |
|
5 |
|
| 4 |
#ifdef _WIN32 |
6 |
#ifdef _WIN32 |
| 5 |
#include <windows.h> |
7 |
#include <windows.h> |
| 6 |
-- stardict-plugins/stardict-man-plugin/stardict_man.cpp |
8 |
++ stardict-plugins/stardict-man-plugin/stardict_man.cpp |
|
Lines 1-6
Link Here
|
| 1 |
#include "stardict_man.h" |
1 |
#include "stardict_man.h" |
| 2 |
#include <glib/gi18n.h> |
2 |
#include <glib/gi18n.h> |
| 3 |
#include <string> |
3 |
#include <string> |
|
|
4 |
#include <cstring> |
| 4 |
|
5 |
|
| 5 |
static const StarDictPluginSystemInfo *plugin_info = NULL; |
6 |
static const StarDictPluginSystemInfo *plugin_info = NULL; |
| 6 |
static bool need_prefix; |
7 |
static bool need_prefix; |
| 7 |
-- stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp |
8 |
++ stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp |
|
Lines 1-5
Link Here
|
| 1 |
#include "stardict_powerword_parsedata.h" |
1 |
#include "stardict_powerword_parsedata.h" |
| 2 |
#include <glib/gi18n.h> |
2 |
#include <glib/gi18n.h> |
|
|
3 |
#include <cstring> |
| 3 |
|
4 |
|
| 4 |
#ifdef _WIN32 |
5 |
#ifdef _WIN32 |
| 5 |
#include <windows.h> |
6 |
#include <windows.h> |
| 6 |
-- stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp |
7 |
++ stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp |
|
Lines 2-7
Link Here
|
| 2 |
#include <glib/gi18n.h> |
2 |
#include <glib/gi18n.h> |
| 3 |
#include <glib/gstdio.h> |
3 |
#include <glib/gstdio.h> |
| 4 |
#include <string> |
4 |
#include <string> |
|
|
5 |
#include <cstring> |
| 6 |
#include <cstdlib> |
| 5 |
|
7 |
|
| 6 |
#ifdef _WIN32 |
8 |
#ifdef _WIN32 |
| 7 |
#include <windows.h> |
9 |
#include <windows.h> |
| 8 |
-- stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp |
10 |
++ stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp |
|
Lines 1-6
Link Here
|
| 1 |
#include "stardict_wiki2xml.h" |
1 |
#include "stardict_wiki2xml.h" |
| 2 |
#include "WIKI2XML.h" |
2 |
#include "WIKI2XML.h" |
| 3 |
#include <glib.h> |
3 |
#include <glib.h> |
|
|
4 |
#include <cstring> |
| 4 |
|
5 |
|
| 5 |
std::string wiki2xml(std::string &str) |
6 |
std::string wiki2xml(std::string &str) |
| 6 |
{ |
7 |
{ |
| 7 |
-- stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp |
8 |
++ stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp |
|
Lines 1-6
Link Here
|
| 1 |
#include "stardict_wiki_parsedata.h" |
1 |
#include "stardict_wiki_parsedata.h" |
| 2 |
#include "stardict_wiki2xml.h" |
2 |
#include "stardict_wiki2xml.h" |
| 3 |
#include <glib/gi18n.h> |
3 |
#include <glib/gi18n.h> |
|
|
4 |
#include <cstring> |
| 4 |
|
5 |
|
| 5 |
#ifdef _WIN32 |
6 |
#ifdef _WIN32 |
| 6 |
#include <windows.h> |
7 |
#include <windows.h> |
| 7 |
-- stardict-plugins/stardict-wordnet-plugin/court_widget.h |
8 |
++ stardict-plugins/stardict-wordnet-plugin/court_widget.h |
|
Lines 3-8
Link Here
|
| 3 |
|
3 |
|
| 4 |
#include <gtk/gtk.h> |
4 |
#include <gtk/gtk.h> |
| 5 |
#include <string> |
5 |
#include <string> |
|
|
6 |
#include <cstring> |
| 6 |
#include <vector> |
7 |
#include <vector> |
| 7 |
|
8 |
|
| 8 |
#include "partic.hpp" |
9 |
#include "partic.hpp" |
| 9 |
-- stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp |
10 |
++ stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp |
|
Lines 1-5
Link Here
|
| 1 |
#include "stardict_wordnet_parsedata.h" |
1 |
#include "stardict_wordnet_parsedata.h" |
| 2 |
#include <glib/gi18n.h> |
2 |
#include <glib/gi18n.h> |
|
|
3 |
#include <cstring> |
| 3 |
|
4 |
|
| 4 |
#ifdef _WIN32 |
5 |
#ifdef _WIN32 |
| 5 |
#include <windows.h> |
6 |
#include <windows.h> |
| 6 |
-- stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp |
7 |
++ stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp |
|
Lines 1-5
Link Here
|
| 1 |
#include "stardict_xdxf_parsedata.h" |
1 |
#include "stardict_xdxf_parsedata.h" |
| 2 |
#include <glib/gi18n.h> |
2 |
#include <glib/gi18n.h> |
|
|
3 |
#include <cstring> |
| 3 |
|
4 |
|
| 4 |
#ifdef _WIN32 |
5 |
#ifdef _WIN32 |
| 5 |
#include <windows.h> |
6 |
#include <windows.h> |
| 6 |
-- tests/t_config_file.cpp |
7 |
++ tests/t_config_file.cpp |
|
Lines 8-13
Link Here
|
| 8 |
#include <cstring> |
8 |
#include <cstring> |
| 9 |
#include <iterator> |
9 |
#include <iterator> |
| 10 |
#include <iostream> |
10 |
#include <iostream> |
|
|
11 |
#include <memory> |
| 11 |
#include <gtk/gtk.h> |
12 |
#include <gtk/gtk.h> |
| 12 |
|
13 |
|
| 13 |
#include "config_file.hpp" |
14 |
#include "config_file.hpp" |
| 14 |
-- tests/t_xml.cpp |
15 |
++ tests/t_xml.cpp |
|
Lines 5-10
Link Here
|
| 5 |
#include <glib.h> |
5 |
#include <glib.h> |
| 6 |
#include <cstdlib> |
6 |
#include <cstdlib> |
| 7 |
#include <string> |
7 |
#include <string> |
|
|
8 |
#include <cstring> |
| 8 |
|
9 |
|
| 9 |
|
10 |
|
| 10 |
static void xml_decode(const char *str, std::string& decoded) |
11 |
static void xml_decode(const char *str, std::string& decoded) |
