diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 14:35:51 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 14:35:51 +0000 |
| commit | 7af884d886e2428d5b28e9cf7d81c97d7e378123 (patch) | |
| tree | 64fe5f9f02f7d338baa54c3a380e43a66ae45f8f /quanta/parsers | |
| parent | af2166652dfcfacffa91a7e1466e3abed19862ce (diff) | |
| download | tdewebdev-7af884d886e2428d5b28e9cf7d81c97d7e378123.tar.gz tdewebdev-7af884d886e2428d5b28e9cf7d81c97d7e378123.zip | |
[kdewebdev/quanta] fix deprecation warnings; make compatible with QT_NO_ASCII_CAST flag
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1214823 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/parsers')
| -rw-r--r-- | quanta/parsers/parser.cpp | 2 | ||||
| -rw-r--r-- | quanta/parsers/qtag.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index 1225aaa3..707d97b0 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -1422,7 +1422,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) encoding = encodingIf->encoding(); if (encoding.isEmpty()) encoding = "utf8"; //final fallback - str.setCodec(TQTextCodec::codecForName(encoding)); + str.setCodec(TQTextCodec::codecForName(encoding.ascii())); content = str.read(); file.close(); if (dtd->specialAreas.count()) diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h index 89aa1e46..c7839c23 100644 --- a/quanta/parsers/qtag.h +++ b/quanta/parsers/qtag.h @@ -37,7 +37,7 @@ class QTag; class Node; //an attribute of a tag looks like: -typedef struct Attribute{ +struct Attribute { TQString name; TQString type; //"input", "check", "list" TQStringList values; //the possible values it can have @@ -87,7 +87,7 @@ enum DTDFamily{Unknown = 0, Xml, Script}; #define MAX_STRUCTGROUPSCOUNT 10 //an internal representation of a DTD -typedef struct DTDStruct +struct DTDStruct { TQString name; ///< DTD name TQString nickName; ///< DTD nickname |