summaryrefslogtreecommitdiffstats
path: root/kode/kxml_compiler
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /kode/kxml_compiler
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kode/kxml_compiler')
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp2
-rw-r--r--kode/kxml_compiler/parser.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index e2e529e22..a4f8178b3 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -83,7 +83,7 @@ int main( int argc, char **argv )
TQString dtdFilename = args->url( 0 ).path();
TQString baseName = args->url( 0 ).fileName();
- int pos = baseName.findRev( '.' );
+ int pos = baseName.tqfindRev( '.' );
if ( pos > 0 ) baseName = baseName.left( pos );
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 0d5ddf154..3a0c7c3f7 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -229,7 +229,7 @@ void Parser::doIndent( int cols )
void Parser::dumpPattern( Pattern pattern )
{
- std::cout << pattern.asString().utf8();
+ std::cout << pattern.asString().utf8().data();
}
void Parser::dumpReferences( const Reference::List &references, int indent )
@@ -238,7 +238,7 @@ void Parser::dumpReferences( const Reference::List &references, int indent )
for( it = references.begin(); it != references.end(); ++it ) {
Reference *r = *it;
doIndent( indent );
- std::cout << "REFERENCE " << r->name.utf8();
+ std::cout << "REFERENCE " << r->name.utf8().data();
dumpPattern( r->pattern );
std::cout << std::endl;
}
@@ -250,7 +250,7 @@ void Parser::dumpAttributes( const Attribute::List &attributes, int indent )
for( it = attributes.begin(); it != attributes.end(); ++it ) {
Attribute *a = *it;
doIndent( indent );
- std::cout << "ATTRIBUTE " << a->name.utf8();
+ std::cout << "ATTRIBUTE " << a->name.utf8().data();
dumpPattern( a->pattern );
std::cout << std::endl;
}
@@ -268,7 +268,7 @@ void Parser::dumpElements( const Element::List &elements, int indent )
void Parser::dumpElement( Element *e, int indent )
{
doIndent( indent );
- std::cout << "ELEMENT " << e->name.utf8();
+ std::cout << "ELEMENT " << e->name.utf8().data();
dumpPattern( e->pattern );
std::cout << std::endl;
@@ -284,7 +284,7 @@ void Parser::dumpElement( Element *e, int indent )
void Parser::dumpTree( Element *s )
{
- std::cout << "START " << s->name.utf8() << std::endl;
+ std::cout << "START " << s->name.utf8().data() << std::endl;
dumpElements( s->elements, 2 );
dumpReferences( s->references, 2 );
}