Patched for compilation with gcc4.3. Thanks to Ian Abbott for the patch.
This commit is contained in:
parent
62efcae940
commit
89100a8cc1
|
@ -17,6 +17,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include "globalreplacedialog.h"
|
#include "globalreplacedialog.h"
|
||||||
#include "wrapregex.h"
|
#include "wrapregex.h"
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
#include "housestyle.h"
|
#include "housestyle.h"
|
||||||
#include "readfile.h"
|
#include "readfile.h"
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <memory>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
#include "wrapregex.h"
|
#include "wrapregex.h"
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <climits>
|
#include <climits>
|
||||||
|
#include <cstring>
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
#include <mem.h>
|
#include <mem.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
#include <cstring>
|
||||||
#include "wrapregex.h"
|
#include "wrapregex.h"
|
||||||
#include "contexthandler.h"
|
#include "contexthandler.h"
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct DtdData : public ParserData
|
struct DtdData : public ParserData
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
|
#include <cstring>
|
||||||
#include "xmlassociatexsd.h"
|
#include "xmlassociatexsd.h"
|
||||||
#include "xmlparseschemans.h"
|
#include "xmlparseschemans.h"
|
||||||
#include "readfile.h"
|
#include "readfile.h"
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct AssociateXsdData : public ParserData
|
struct AssociateXsdData : public ParserData
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
|
#include <cstring>
|
||||||
#include "xmlassociatexsl.h"
|
#include "xmlassociatexsl.h"
|
||||||
|
|
||||||
XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) :
|
XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) :
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct XslData : public ParserData
|
struct XslData : public ParserData
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#define ABOUT_COPYRIGHT _("Copyright © 2005-2008 Gerald Schmidt <gnschmidt@users.sourceforge.net>")
|
#define ABOUT_COPYRIGHT _("Copyright © 2005-2008 Gerald Schmidt <gnschmidt@users.sourceforge.net>")
|
||||||
#define ABOUT_DESCRIPTION _("\nXML Copy Editor is free software released under the GNU\nGeneral Public License.\n\nMany thanks are due to Tim van Niekerk, Matt Smigielski,\nDavid Scholl, Jan Merka, Marcus Bingenheimer, Roberto\nRosselli Del Turco, Ken Zalewski, C.J. Meidlinger,\nThomas Zajic, Viliam Búr, David Håsäther, François\nBadier, Thomas Wenzel, Roger Sperberg, SHiNE CsyFeK,\nHSU PICHAN, YANG SHUFUN, CHENG PAULIAN,\nCHUANG KUO-PING, Justin Dearing, Serhij Dubyk,\nAntonio Angelo, Jose Luis Rivero and Siarhei Kuchuk.")
|
#define ABOUT_DESCRIPTION _("\nXML Copy Editor is free software released under the GNU\nGeneral Public License.\n\nMany thanks are due to Tim van Niekerk, Matt Smigielski,\nDavid Scholl, Jan Merka, Marcus Bingenheimer, Roberto\nRosselli Del Turco, Ken Zalewski, C.J. Meidlinger,\nThomas Zajic, Viliam Búr, David Håsäther, François\nBadier, Thomas Wenzel, Roger Sperberg, SHiNE CsyFeK,\nHSU PICHAN, YANG SHUFUN, CHENG PAULIAN,\nCHUANG KUO-PING, Justin Dearing, Serhij Dubyk,\nAntonio Angelo, Jose Luis Rivero, Siarhei Kuchuk\nand Ian Abbott.")
|
||||||
#define ABOUT_LICENSE _T(\
|
#define ABOUT_LICENSE _T(\
|
||||||
"This program is free software; you can redistribute it\n"\
|
"This program is free software; you can redistribute it\n"\
|
||||||
"and/or modify it under the terms of the GNU General Public\n"\
|
"and/or modify it under the terms of the GNU General Public\n"\
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
#include "xmlencodinghandler.h"
|
#include "xmlencodinghandler.h"
|
||||||
|
|
||||||
bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 )
|
bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 )
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct EncodingData : public ParserData
|
struct EncodingData : public ParserData
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <set>
|
#include <set>
|
||||||
|
#include <cstring>
|
||||||
#include "xmlfilterreader.h"
|
#include "xmlfilterreader.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <set>
|
#include <set>
|
||||||
|
#include <memory>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct ParseSchemaNsData : public ParserData
|
struct ParseSchemaNsData : public ParserData
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <set>
|
#include <set>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
#include "parserdata.h"
|
#include "parserdata.h"
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
#include <cstring>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include "xmlschemalocator.h"
|
#include "xmlschemalocator.h"
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct SchemaLocatorData
|
struct SchemaLocatorData
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include <memory>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct UtfData : public ParserData
|
struct UtfData : public ParserData
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#define XML_WORD_COUNT_H
|
#define XML_WORD_COUNT_H
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct WordCountData : public ParserData
|
struct WordCountData : public ParserData
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
#include <cstring>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include "xsllocator.h"
|
#include "xsllocator.h"
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <memory>
|
||||||
#include "wrapexpat.h"
|
#include "wrapexpat.h"
|
||||||
|
|
||||||
struct XslLocatorData : public ParserData
|
struct XslLocatorData : public ParserData
|
||||||
|
|
Loading…
Reference in New Issue