summaryrefslogtreecommitdiffstats
path: root/kode
diff options
context:
space:
mode:
Diffstat (limited to 'kode')
-rw-r--r--kode/automakefile.cpp6
-rw-r--r--kode/automakefile.h2
-rw-r--r--kode/class.cpp8
-rw-r--r--kode/class.h6
-rw-r--r--kode/code.cpp2
-rw-r--r--kode/file.cpp4
-rw-r--r--kode/function.h2
-rw-r--r--kode/kodemain.cpp38
-rw-r--r--kode/kwsdl/compiler.h3
-rw-r--r--kode/kwsdl/converter.cpp58
-rw-r--r--kode/kwsdl/converter.h2
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp14
-rw-r--r--kode/kwsdl/kung/binaryinputfield.h10
-rw-r--r--kode/kwsdl/kung/boolinputfield.cpp8
-rw-r--r--kode/kwsdl/kung/boolinputfield.h5
-rw-r--r--kode/kwsdl/kung/complexbaseinputfield.cpp10
-rw-r--r--kode/kwsdl/kung/complexbaseinputfield.h4
-rw-r--r--kode/kwsdl/kung/dateinputfield.cpp12
-rw-r--r--kode/kwsdl/kung/dateinputfield.h5
-rw-r--r--kode/kwsdl/kung/dispatcher.h3
-rw-r--r--kode/kwsdl/kung/doubleinputfield.cpp8
-rw-r--r--kode/kwsdl/kung/doubleinputfield.h5
-rw-r--r--kode/kwsdl/kung/enuminputfield.cpp8
-rw-r--r--kode/kwsdl/kung/enuminputfield.h5
-rw-r--r--kode/kwsdl/kung/inputdialog.cpp4
-rw-r--r--kode/kwsdl/kung/inputdialog.h2
-rw-r--r--kode/kwsdl/kung/inputfield.h7
-rw-r--r--kode/kwsdl/kung/integerinputfield.cpp8
-rw-r--r--kode/kwsdl/kung/integerinputfield.h5
-rw-r--r--kode/kwsdl/kung/listinputfield.cpp14
-rw-r--r--kode/kwsdl/kung/listinputfield.h10
-rw-r--r--kode/kwsdl/kung/loader.h3
-rw-r--r--kode/kwsdl/kung/outputdialog.cpp4
-rw-r--r--kode/kwsdl/kung/outputdialog.h2
-rw-r--r--kode/kwsdl/kung/pageinputfield.cpp10
-rw-r--r--kode/kwsdl/kung/pageinputfield.h5
-rw-r--r--kode/kwsdl/kung/simplebaseinputfield.cpp8
-rw-r--r--kode/kwsdl/kung/simplebaseinputfield.h4
-rw-r--r--kode/kwsdl/kung/stringinputfield.cpp8
-rw-r--r--kode/kwsdl/kung/stringinputfield.h5
-rw-r--r--kode/kwsdl/kung/timeinputfield.cpp12
-rw-r--r--kode/kwsdl/kung/timeinputfield.h5
-rw-r--r--kode/kwsdl/kung/transport.h3
-rw-r--r--kode/kwsdl/parser.cpp24
-rw-r--r--kode/kwsdl/schema/fileprovider.h3
-rw-r--r--kode/kwsdl/schema/parser.cpp2
-rw-r--r--kode/kwsdl/schema/qualifiedname.cpp2
-rw-r--r--kode/kwsdl/schema/qualifiedname.h4
-rw-r--r--kode/kwsdl/schema/typestable.cpp2
-rw-r--r--kode/kwsdl/schema/xsdtype.h2
-rw-r--r--kode/kwsdl/tests/google/directorycategory.cpp4
-rw-r--r--kode/kwsdl/tests/google/directorycategory.h4
-rw-r--r--kode/kwsdl/tests/google/directorycategoryarray.cpp4
-rw-r--r--kode/kwsdl/tests/google/directorycategoryarray.h4
-rw-r--r--kode/kwsdl/tests/google/googlesearch.cc4
-rw-r--r--kode/kwsdl/tests/google/googlesearch.hh7
-rw-r--r--kode/kwsdl/tests/google/googlesearchresult.cpp4
-rw-r--r--kode/kwsdl/tests/google/googlesearchresult.h4
-rw-r--r--kode/kwsdl/tests/google/googlesearchservice.cpp4
-rw-r--r--kode/kwsdl/tests/google/googlesearchservice.h7
-rw-r--r--kode/kwsdl/tests/google/resultelement.cpp4
-rw-r--r--kode/kwsdl/tests/google/resultelement.h4
-rw-r--r--kode/kwsdl/tests/google/resultelementarray.cpp4
-rw-r--r--kode/kwsdl/tests/google/resultelementarray.h4
-rw-r--r--kode/kwsdl/tests/google/serializer.cpp104
-rw-r--r--kode/kwsdl/tests/google/serializer.h48
-rw-r--r--kode/kwsdl/tests/google/transport.cpp4
-rw-r--r--kode/kwsdl/tests/google/transport.h7
-rw-r--r--kode/kwsdl/typemapper.cpp38
-rw-r--r--kode/kxml_compiler/creator.cpp14
-rw-r--r--kode/kxml_compiler/parser.cpp4
-rw-r--r--kode/license.cpp14
-rw-r--r--kode/license.h4
-rw-r--r--kode/printer.cpp20
-rw-r--r--kode/printer.h2
75 files changed, 364 insertions, 343 deletions
diff --git a/kode/automakefile.cpp b/kode/automakefile.cpp
index 2be52ae38..8d14540c5 100644
--- a/kode/automakefile.cpp
+++ b/kode/automakefile.cpp
@@ -35,7 +35,7 @@ AutoMakefile::AutoMakefile()
void AutoMakefile::addTarget( const Target &t )
{
mTargets.append( t );
- if ( mTargetTypes.find( t.type() ) == mTargetTypes.end() ) {
+ if ( mTargetTypes.tqfind( t.type() ) == mTargetTypes.end() ) {
mTargetTypes.append( t.type() );
}
}
@@ -47,10 +47,10 @@ void AutoMakefile::addEntry( const TQString &variable, const TQString &value )
return;
}
- TQStringList::ConstIterator it = mEntries.find( variable );
+ TQStringList::ConstIterator it = mEntries.tqfind( variable );
if ( it == mEntries.end() ) {
mEntries.append( variable );
- TQMap<TQString,TQString>::Iterator it = mValues.find( variable );
+ TQMap<TQString,TQString>::Iterator it = mValues.tqfind( variable );
if ( it == mValues.end() ) {
mValues.insert( variable, value );
} else {
diff --git a/kode/automakefile.h b/kode/automakefile.h
index ec0dce7e5..5f22a7570 100644
--- a/kode/automakefile.h
+++ b/kode/automakefile.h
@@ -75,7 +75,7 @@ class KDE_EXPORT AutoMakefile
Target::List targets() const { return mTargets; }
void addEntry( const TQString &variable,
- const TQString &value = TQString::null );
+ const TQString &value = TQString() );
void newLine();
diff --git a/kode/class.cpp b/kode/class.cpp
index 48c0e22f9..ef26ff73d 100644
--- a/kode/class.cpp
+++ b/kode/class.cpp
@@ -78,12 +78,12 @@ void Class::setNameSpace( const TQString &nameSpace )
void Class::addInclude( const TQString &include,
const TQString &forwardDeclaration )
{
- if ( mIncludes.find( include ) == mIncludes.end() ) {
+ if ( mIncludes.tqfind( include ) == mIncludes.end() ) {
mIncludes.append( include );
}
if( !forwardDeclaration.isEmpty() &&
- mForwardDeclarations.find( forwardDeclaration ) ==
+ mForwardDeclarations.tqfind( forwardDeclaration ) ==
mForwardDeclarations.end() ) {
mForwardDeclarations.append( forwardDeclaration );
}
@@ -94,7 +94,7 @@ void Class::addHeaderInclude( const TQString &include )
if ( include.isEmpty() )
return;
- if ( mHeaderIncludes.find( include ) == mHeaderIncludes.end() ) {
+ if ( mHeaderIncludes.tqfind( include ) == mHeaderIncludes.end() ) {
mHeaderIncludes.append( include );
}
}
@@ -159,7 +159,7 @@ bool Class::hasFunction( const TQString &functionName ) const
return false;
}
-bool Class::isQObject() const
+bool Class::isTQObject() const
{
Function::List::ConstIterator it;
for( it = mFunctions.begin(); it != mFunctions.end(); ++it ) {
diff --git a/kode/class.h b/kode/class.h
index 21edc015f..ac7570ef6 100644
--- a/kode/class.h
+++ b/kode/class.h
@@ -40,7 +40,7 @@ class KDE_EXPORT Class
typedef TQValueList<Class> List;
Class();
- Class( const TQString &name, const TQString &nameSpace = TQString::null );
+ Class( const TQString &name, const TQString &nameSpace = TQString() );
Class( const Class & );
Class &operator=( const Class &c );
@@ -48,7 +48,7 @@ class KDE_EXPORT Class
bool isValid() const;
void addInclude( const TQString &file,
- const TQString &forwardDeclaration = TQString::null );
+ const TQString &forwardDeclaration = TQString() );
void addHeaderInclude( const TQString &file );
void addHeaderIncludes( const TQStringList &files );
void addBaseClass( const Class & );
@@ -75,7 +75,7 @@ class KDE_EXPORT Class
bool hasFunction( const TQString &name ) const;
- bool isQObject() const;
+ bool isTQObject() const;
private:
// WARNING: If you add member variables, you have to adjust the copy
diff --git a/kode/code.cpp b/kode/code.cpp
index da8976931..0b28e546f 100644
--- a/kode/code.cpp
+++ b/kode/code.cpp
@@ -41,7 +41,7 @@ Code::Code( int indent )
void Code::clear()
{
mIndent = 0;
- mText = TQString::null;
+ mText = TQString();
}
bool Code::isEmpty() const
diff --git a/kode/file.cpp b/kode/file.cpp
index 51c19131f..b71109ec1 100644
--- a/kode/file.cpp
+++ b/kode/file.cpp
@@ -47,7 +47,7 @@ TQString File::filename() const
return className.lower();
}
- return TQString::null;
+ return TQString();
}
void File::setNameSpace( const TQString &n )
@@ -78,7 +78,7 @@ void File::addInclude( const TQString &i )
TQString include = i;
if( !include.endsWith( ".h" ) ) include.append( ".h" );
- if ( mIncludes.find( include ) == mIncludes.end() ) {
+ if ( mIncludes.tqfind( include ) == mIncludes.end() ) {
mIncludes.append( include );
}
}
diff --git a/kode/function.h b/kode/function.h
index 47f0dd756..ad1fea45c 100644
--- a/kode/function.h
+++ b/kode/function.h
@@ -38,7 +38,7 @@ class KDE_EXPORT Function
enum AccessSpecifier { Public = 1, Protected = 2, Private = 4, Signal = 8, Slot = 16 };
Function();
- Function( const TQString &name, const TQString &returnType = TQString::null,
+ Function( const TQString &name, const TQString &returnType = TQString(),
int access = Public, bool isStatic = false );
void setConst( bool isConst );
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 6542c2881..5d01cefa6 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -66,7 +66,7 @@ static const KCmdLineOptions options[] =
{ "filename <name>", I18N_NOOP("Name of file"), 0 },
{ "namespace <name>", I18N_NOOP("Namespace"), 0 },
{ "warning", I18N_NOOP("Create warning about code generation"), 0 },
- { "qt-exception", I18N_NOOP("Add Qt exception to GPL"), 0 },
+ { "qt-exception", I18N_NOOP("Add TQt exception to GPL"), 0 },
{ "singleton", I18N_NOOP("Create a singleton class"), 0 },
{ "protocol", I18N_NOOP("kioslave protocol"), 0 },
{ "+[filename]", I18N_NOOP("Source code file name"), 0 },
@@ -167,17 +167,17 @@ int addProperty( KCmdLineArgs *args )
// out += line + "\n";
switch( state ) {
case FindClass:
-// if ( line.find( TQRegExp( className ) ) >= 0 ) {
- if ( line.find( TQRegExp( "^\\s*class\\s+" + className ) ) >= 0 ) {
+// if ( line.tqfind( TQRegExp( className ) ) >= 0 ) {
+ if ( line.tqfind( TQRegExp( "^\\s*class\\s+" + className ) ) >= 0 ) {
kdDebug() << " FOUND CLASS" << endl;
state = FindConstructor;
}
break;
case FindConstructor:
- if ( line.find( TQRegExp( "^\\s*" + className + "\\s*\\(" ) ) >= 0 ) {
+ if ( line.tqfind( TQRegExp( "^\\s*" + className + "\\s*\\(" ) ) >= 0 ) {
kdDebug() << " FOUND CONSTRUCTOR" << endl;
out += readAhead;
- readAhead = TQString::null;
+ readAhead = TQString();
state = FindProperties;
}
break;
@@ -190,7 +190,7 @@ int addProperty( KCmdLineArgs *args )
kdDebug() << "Function: " << function << endl;
if ( function == className || function == "~" + className ) {
out += readAhead;
- readAhead = TQString::null;
+ readAhead = TQString();
} else {
if ( function.startsWith( "set" ) ) {
mutator = function.mid( 3 );
@@ -200,7 +200,7 @@ int addProperty( KCmdLineArgs *args )
accessor = function;
kdDebug() << "ACCESSOR: " << accessor << endl;
out += readAhead;
- readAhead = TQString::null;
+ readAhead = TQString();
} else {
kdDebug() << "CREATE PROPERTY" << endl;
out += readAheadPrevious;
@@ -212,13 +212,13 @@ int addProperty( KCmdLineArgs *args )
}
}
}
- } else if ( line.find( TQRegExp( "\\s*protected" ) ) >= 0 ) {
+ } else if ( line.tqfind( TQRegExp( "\\s*protected" ) ) >= 0 ) {
state = FindPrivate;
- } else if ( line.find( TQRegExp( "\\s*private" ) ) >= 0 ) {
+ } else if ( line.tqfind( TQRegExp( "\\s*private" ) ) >= 0 ) {
if ( accessor.isEmpty() ) {
addPropertyFunctions( out, type, name );
out += readAhead;
- readAhead = TQString::null;
+ readAhead = TQString();
addPropertyVariable( out, type, name );
state = Finish;
} else {
@@ -227,7 +227,7 @@ int addProperty( KCmdLineArgs *args )
addPropertyFunctions( out, type, name );
out += "\n";
out += line + "\n";
- readAhead = TQString::null;
+ readAhead = TQString();
}
state = FindVariables;
}
@@ -235,10 +235,10 @@ int addProperty( KCmdLineArgs *args )
}
break;
case FindPrivate:
- if ( line.find( TQRegExp( "\\s*private" ) ) >= 0 ) {
+ if ( line.tqfind( TQRegExp( "\\s*private" ) ) >= 0 ) {
if ( accessor.isEmpty() ) {
out += readAhead;
- readAhead = TQString::null;
+ readAhead = TQString();
addPropertyVariable( out, type, name );
state = Finish;
} else {
@@ -248,9 +248,9 @@ int addProperty( KCmdLineArgs *args )
break;
case FindVariables:
{
- if ( line.find( "m" + accessor.lower(), 0, false ) >= 0 ) {
+ if ( line.tqfind( "m" + accessor.lower(), 0, false ) >= 0 ) {
out += readAhead;
- readAhead = TQString::null;
+ readAhead = TQString();
addPropertyVariable( out, type, name );
state = Finish;
}
@@ -372,9 +372,9 @@ int create( KCmdLineArgs *args )
authorEmail = a.preferredEmail();
} else {
KABC::Addressee::List as =
- KABC::StdAddressBook::self()->tqfindByEmail( authorEmail );
+ KABC::StdAddressBook::self()->findByEmail( authorEmail );
if ( as.isEmpty() ) {
- kdDebug() << "Unable to find '" << authorEmail << "' in address book."
+ kdDebug() << "Unable to tqfind '" << authorEmail << "' in address book."
<< endl;
} else {
a = as.first();
@@ -390,7 +390,7 @@ int create( KCmdLineArgs *args )
KODE::License l;
if ( args->isSet( "gpl" ) ) l = KODE::License( KODE::License::GPL );
if ( args->isSet( "lgpl" ) ) l = KODE::License( KODE::License::LGPL );
- l.setQtException( args->isSet( "qt-exception" ) );
+ l.setTQtException( args->isSet( "qt-exception" ) );
file.setLicense( l );
file.setNameSpace( args->getOption( "namespace" ) );
@@ -587,7 +587,7 @@ int create( KCmdLineArgs *args )
TQFileInfo fi( protocolFilename );
protocolFilename = fi.absFilePath();
- KSaveFile::backupFile( protocolFilename, TQString::null, ".backup" );
+ KSaveFile::backupFile( protocolFilename, TQString(), ".backup" );
TQFile::remove( protocolFilename );
diff --git a/kode/kwsdl/compiler.h b/kode/kwsdl/compiler.h
index 1bb27e1b8..be773610c 100644
--- a/kode/kwsdl/compiler.h
+++ b/kode/kwsdl/compiler.h
@@ -29,9 +29,10 @@
namespace KWSDL {
-class Compiler : public QObject
+class Compiler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Compiler();
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index 3f97efe1d..173ca7fb3 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -37,7 +37,7 @@ static TQString escapeEnum( const TQString &str )
Converter::Converter()
{
- mQObject = KODE::Class( "TQObject" );
+ mTQObject = KODE::Class( TQOBJECT_OBJECT_NAME_STRING );
}
void Converter::setWSDL( const WSDL &wsdl )
@@ -218,13 +218,13 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
KODE::Function marshal( "marshal", "void" );
marshal.setStatic( true );
marshal.addArgument( "TQDomDocument &doc" );
- marshal.addArgument( "TQDomElement &parent" );
+ marshal.addArgument( "TQDomElement &tqparent" );
marshal.addArgument( "const TQString &name" );
marshal.addArgument( "const " + typeName + "* value" );
KODE::Function demarshal( "demarshal", "void" );
demarshal.setStatic( true );
- demarshal.addArgument( "const TQDomElement &parent" );
+ demarshal.addArgument( "const TQDomElement &tqparent" );
demarshal.addArgument( typeName + "* value" );
KODE::Code marshalCode, demarshalCode, code;
@@ -249,7 +249,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
escapedEnums.append( escapeEnum( enums[ i ] ) );
// marshal value
- KODE::Function marshalValue( "marshalValue", "TQString" );
+ KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
marshalValue.setStatic( true );
marshalValue.addArgument( "const " + typeName + "* value" );
code += "switch ( value->type() ) {";
@@ -275,7 +275,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
// marshal
marshalCode += "TQDomElement root = doc.createElement( name );";
marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + type->name() + "\" );";
- marshalCode += "parent.appendChild( root );";
+ marshalCode += "tqparent.appendChild( root );";
marshalCode += "root.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );";
// demarshal value
@@ -294,28 +294,28 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
demarshalValue.setBody( code );
// demarshal
- demarshalCode += "Serializer::demarshalValue( parent.text(), value );";
+ demarshalCode += "Serializer::demarshalValue( tqparent.text(), value );";
mSerializer.addFunction( marshalValue );
mSerializer.addFunction( demarshalValue );
} else if ( type->baseType() != Schema::XSDType::INVALID ) {
marshalCode += "if ( value->value() ) {";
marshalCode.indent();
- marshalCode += "Serializer::marshal( doc, parent, name, value->value() );";
+ marshalCode += "Serializer::marshal( doc, tqparent, name, value->value() );";
marshalCode.unindent();
marshalCode += "}";
- demarshalCode += "const TQString text = parent.text();";
+ demarshalCode += "const TQString text = tqparent.text();";
demarshalCode.newLine();
demarshalCode += "if ( !text.isEmpty() ) {";
demarshalCode.indent();
demarshalCode += baseType + "* data = new " + baseType + ";";
- demarshalCode += "Serializer::demarshal( parent, value );";
+ demarshalCode += "Serializer::demarshal( tqparent, value );";
demarshalCode += "value->setValue( data );";
demarshalCode.unindent();
demarshalCode += "}";
- KODE::Function marshalValue( "marshalValue", "TQString" );
+ KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
marshalValue.setStatic( true );
marshalValue.addArgument( "const " + typeName + "* value" );
marshalValue.setBody( "return Serializer::marshalValue( value->value() );" );
@@ -352,12 +352,12 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
marshalCode += "}";
marshalCode.newLine();
marshalCode += "TQDomElement element = doc.createElement( name );";
- marshalCode += "parent.appendChild( element );";
+ marshalCode += "tqparent.appendChild( element );";
marshalCode += "element.appendChild( doc.createTextNode( list.join( \" \" ) ) );";
marshalCode.unindent();
marshalCode += "}";
- demarshalCode += "const TQStringList list = TQStringList::split( \" \", parent.text(), false );";
+ demarshalCode += "const TQStringList list = TQStringList::split( \" \", tqparent.text(), false );";
demarshalCode += "if ( !list.isEmpty() ) {";
demarshalCode.indent();
demarshalCode += "TQPtrList<" + listType + ">* entries = new TQPtrList<" + listType + ">;";
@@ -511,13 +511,13 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
KODE::Function marshal( "marshal", "void" );
marshal.setStatic( true );
marshal.addArgument( "TQDomDocument &doc" );
- marshal.addArgument( "TQDomElement &parent" );
+ marshal.addArgument( "TQDomElement &tqparent" );
marshal.addArgument( "const TQString &name" );
marshal.addArgument( "const " + typeName + "* value" );
KODE::Function demarshal( "demarshal", "void" );
demarshal.setStatic( true );
- demarshal.addArgument( "const TQDomElement &parent" );
+ demarshal.addArgument( "const TQDomElement &tqparent" );
demarshal.addArgument( typeName + "* value" );
KODE::Code marshalCode, demarshalCode, demarshalFinalCode;
@@ -535,9 +535,9 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
marshalCode += "TQDomElement root = doc.createElement( name );";
marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + typeName + "\" );";
- marshalCode += "parent.appendChild( root );";
+ marshalCode += "tqparent.appendChild( root );";
- demarshalCode += "TQDomNode node = parent.firstChild();";
+ demarshalCode += "TQDomNode node = tqparent.firstChild();";
demarshalCode += "while ( !node.isNull() ) {";
demarshalCode.indent();
demarshalCode += "TQDomElement element = node.toElement();";
@@ -568,7 +568,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
marshalCode += "element.setAttribute( \"xmlns:ns1\", \"http://schemas.xmlsoap.org/soap/encoding/\" );";
marshalCode += "element.setAttribute( \"xsi:type\", \"ns1:Array\" );";
marshalCode += "element.setAttribute( \"ns1:arrayType\", \"ns1:" + typeName + "[\" + TQString::number( list->count() ) + \"]\" );";
- marshalCode += "parent.appendChild( element );";
+ marshalCode += "tqparent.appendChild( element );";
marshalCode.newLine();
marshalCode += "TQPtrListIterator<" + typeName + "> it( *list );";
marshalCode += "while ( it.current() != 0 ) {";
@@ -629,7 +629,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
marshalCode += "if ( value->" + mNameMapper.escape( lowerName ) + "() )";
marshalCode.indent();
- marshalCode += "parent.setAttribute( \"" + (*attrIt).name() + "\","
+ marshalCode += "tqparent.setAttribute( \"" + (*attrIt).name() + "\","
"Serializer::marshalValue( value->" + mNameMapper.escape( lowerName ) + "() ) );";
marshalCode.newLine();
@@ -660,7 +660,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type )
void Converter::convertService( const Service &service )
{
KODE::Class newClass( service.name() );
- newClass.addBaseClass( mQObject );
+ newClass.addBaseClass( mTQObject );
newClass.addHeaderInclude( "tqobject.h" );
newClass.addHeaderInclude( "tqstring.h" );
newClass.addHeaderInclude( "transport.h" );
@@ -839,7 +839,7 @@ void Converter::createUtilClasses()
of typing and is easier to maintain at the end ;)
*/
TypeEntry types[] = {
- { "TQString", "xsd:string", "*value", "str" },
+ { TQSTRING_OBJECT_NAME_STRING, "xsd:string", "*value", "str" },
{ "bool", "xsd:boolean", "(*value ? \"true\" : \"false\")", "(str.lower() == \"true\" ? true : false)" },
{ "float", "xsd:TODO", "TQString::number( *value )", "str.toFloat()" },
{ "int", "xsd:int", "TQString::number( *value )", "str.toInt()" },
@@ -848,9 +848,9 @@ void Converter::createUtilClasses()
{ "char", "xsd:byte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
{ "unsigned char", "xsd:unsignedByte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
{ "short", "xsd:short", "TQString::number( *value )", "str.toShort()" },
- { "TQByteArray", "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
- { "TQDateTime", "xsd:dateTime", "value->toString( Qt::ISODate )", "TQDateTime::fromString( str, Qt::ISODate )" },
- { "TQDate", "xsd:date", "value->toString( Qt::ISODate )", "TQDate::fromString( str, Qt::ISODate )" }
+ { TQBYTEARRAY_OBJECT_NAME_STRING, "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
+ { "TQDateTime", "xsd:dateTime", "value->toString( TQt::ISODate )", "TQDateTime::fromString( str, TQt::ISODate )" },
+ { "TQDate", "xsd:date", "value->toString( TQt::ISODate )", "TQDate::fromString( str, TQt::ISODate )" }
};
for ( uint i = 0; i < sizeof( types ) / sizeof( TypeEntry ); ++i ) {
@@ -859,7 +859,7 @@ void Converter::createUtilClasses()
TypeEntry entry = types[ i ];
- marshal = KODE::Function( "marshalValue", "TQString" );
+ marshal = KODE::Function( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
marshal.setStatic( true );
marshal.addArgument( "const " + entry.type + "* value" );
@@ -879,7 +879,7 @@ void Converter::createUtilClasses()
marshal = KODE::Function( "marshal", "void" );
marshal.setStatic( true );
marshal.addArgument( "TQDomDocument &doc" );
- marshal.addArgument( "TQDomElement &parent" );
+ marshal.addArgument( "TQDomElement &tqparent" );
marshal.addArgument( "const TQString &name" );
marshal.addArgument( "const " + entry.type + "* value" );
@@ -887,7 +887,7 @@ void Converter::createUtilClasses()
code += "TQDomElement element = doc.createElement( name );";
code += "element.setAttribute( \"xsi:type\", \"" + entry.xsdType + "\" );";
code += "element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );";
- code += "parent.appendChild( element );";
+ code += "tqparent.appendChild( element );";
marshal.setBody( code );
mSerializer.addFunction( marshal );
@@ -905,16 +905,16 @@ void Converter::createUtilClasses()
void Converter::createTransportClass()
{
KODE::Class transport( "Transport" );
- transport.addBaseClass( mQObject );
+ transport.addBaseClass( mTQObject );
transport.addHeaderInclude( "tqobject.h" );
transport.addHeaderInclude( "kio/job.h" );
transport.addInclude( "kdebug.h" );
- KODE::MemberVariable url( "url", "TQString" );
+ KODE::MemberVariable url( "url", TQSTRING_OBJECT_NAME_STRING );
transport.addMemberVariable( url );
- KODE::MemberVariable slotDataVar( "data", "TQByteArray" );
+ KODE::MemberVariable slotDataVar( "data", TQBYTEARRAY_OBJECT_NAME_STRING );
transport.addMemberVariable( slotDataVar );
// ctor
diff --git a/kode/kwsdl/converter.h b/kode/kwsdl/converter.h
index 45d530a3a..1bbf4eb7e 100644
--- a/kode/kwsdl/converter.h
+++ b/kode/kwsdl/converter.h
@@ -67,7 +67,7 @@ class Converter
KODE::Class::List mClasses;
KODE::Class mSerializer;
- KODE::Class mQObject;
+ KODE::Class mTQObject;
NameMapper mNameMapper;
TypeMapper mTypeMapper;
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index 56643b3d2..f517c7af8 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -55,14 +55,14 @@ void BinaryInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:" + mTypeName );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void BinaryInputField::setData( const TQString &data )
@@ -76,9 +76,9 @@ TQString BinaryInputField::data() const
return TQString::fromUtf8( data.data(), data.size() );
}
-TQWidget *BinaryInputField::createWidget( TQWidget *parent )
+TQWidget *BinaryInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new BinaryWidget( parent );
+ mInputWidget = new BinaryWidget( tqparent );
if ( !mValue.isEmpty() )
mInputWidget->setData( mValue );
@@ -94,8 +94,8 @@ void BinaryInputField::valueChanged( const TQByteArray &value )
}
-BinaryWidget::BinaryWidget( TQWidget *parent )
- : TQWidget( parent, "BinaryWidget" ),
+BinaryWidget::BinaryWidget( TQWidget *tqparent )
+ : TQWidget( tqparent, "BinaryWidget" ),
mMainWidget( 0 )
{
mLayout = new TQGridLayout( this, 3, 2, 11, 6 );
@@ -123,7 +123,7 @@ void BinaryWidget::setData( const TQByteArray &data )
mimetype = result->mimeType();
if ( !mimetype.isEmpty() ) {
- KParts::ReadOnlyPart *part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, this, 0, this, 0 );
+ KParts::ReadOnlyPart *part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
if ( part ) {
KTempFile file;
file.file()->writeBlock( data );
diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h
index e38938016..ad586f5d9 100644
--- a/kode/kwsdl/kung/binaryinputfield.h
+++ b/kode/kwsdl/kung/binaryinputfield.h
@@ -33,17 +33,18 @@ class TQPushButton;
class BinaryInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
BinaryInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void valueChanged( const TQByteArray &value );
@@ -55,12 +56,13 @@ class BinaryInputField : public SimpleInputField
TQString mTypeName;
};
-class BinaryWidget : public QWidget
+class BinaryWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- BinaryWidget( TQWidget *parent );
+ BinaryWidget( TQWidget *tqparent );
void setData( const TQByteArray &data );
diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp
index e3eb3eef1..c05df02b1 100644
--- a/kode/kwsdl/kung/boolinputfield.cpp
+++ b/kode/kwsdl/kung/boolinputfield.cpp
@@ -39,14 +39,14 @@ void BoolInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:boolean" );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void BoolInputField::setData( const TQString &data )
@@ -59,9 +59,9 @@ TQString BoolInputField::data() const
return ( mValue ? "true" : "false" );
}
-TQWidget *BoolInputField::createWidget( TQWidget *parent )
+TQWidget *BoolInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new TQCheckBox( parent );
+ mInputWidget = new TQCheckBox( tqparent );
mInputWidget->setChecked( mValue );
diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h
index 6ec98c86a..c48ca96be 100644
--- a/kode/kwsdl/kung/boolinputfield.h
+++ b/kode/kwsdl/kung/boolinputfield.h
@@ -31,17 +31,18 @@ class TQCheckBox;
class BoolInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
BoolInputField( const TQString &name, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void inputChanged( bool );
diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp
index 1c43bd952..30662690b 100644
--- a/kode/kwsdl/kung/complexbaseinputfield.cpp
+++ b/kode/kwsdl/kung/complexbaseinputfield.cpp
@@ -99,7 +99,7 @@ void ComplexBaseInputField::setXMLData( const TQDomElement &element )
}
}
-void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
@@ -125,7 +125,7 @@ void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &pare
}
}
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void ComplexBaseInputField::setData( const TQString& )
@@ -137,10 +137,10 @@ TQString ComplexBaseInputField::data() const
return TQString();
}
-TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent )
+TQWidget *ComplexBaseInputField::createWidget( TQWidget *tqparent )
{
- TQGroupBox *inputWidget = new TQGroupBox( mName, parent );
- inputWidget->setColumnLayout( 0, Qt::Horizontal );
+ TQGroupBox *inputWidget = new TQGroupBox( mName, tqparent );
+ inputWidget->setColumnLayout( 0, TQt::Horizontal );
TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 );
InputField::List::Iterator it;
diff --git a/kode/kwsdl/kung/complexbaseinputfield.h b/kode/kwsdl/kung/complexbaseinputfield.h
index 9fc47dbc7..f47c6d044 100644
--- a/kode/kwsdl/kung/complexbaseinputfield.h
+++ b/kode/kwsdl/kung/complexbaseinputfield.h
@@ -30,12 +30,12 @@ class ComplexBaseInputField : public ComplexInputField
ComplexBaseInputField( const TQString &name, const Schema::ComplexType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
};
#endif
diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp
index 8d5c329cc..ffb9af7a1 100644
--- a/kode/kwsdl/kung/dateinputfield.cpp
+++ b/kode/kwsdl/kung/dateinputfield.cpp
@@ -39,29 +39,29 @@ void DateInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void DateInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void DateInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:date" );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void DateInputField::setData( const TQString &data )
{
- mValue = TQDate::fromString( data, Qt::ISODate );
+ mValue = TQDate::fromString( data, TQt::ISODate );
}
TQString DateInputField::data() const
{
- return mValue.toString( Qt::ISODate );
+ return mValue.toString( TQt::ISODate );
}
-TQWidget *DateInputField::createWidget( TQWidget *parent )
+TQWidget *DateInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new KDatePicker( parent );
+ mInputWidget = new KDatePicker( tqparent );
mInputWidget->setDate( mValue );
diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h
index 28efe5e33..8dcd0f89f 100644
--- a/kode/kwsdl/kung/dateinputfield.h
+++ b/kode/kwsdl/kung/dateinputfield.h
@@ -32,17 +32,18 @@ class KDatePicker;
class DateInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
DateInputField( const TQString &name, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void inputChanged( TQDate );
diff --git a/kode/kwsdl/kung/dispatcher.h b/kode/kwsdl/kung/dispatcher.h
index c770fe777..5b57f2c94 100644
--- a/kode/kwsdl/kung/dispatcher.h
+++ b/kode/kwsdl/kung/dispatcher.h
@@ -29,9 +29,10 @@
class ConversationManager;
class Transport;
-class Dispatcher : public QObject
+class Dispatcher : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Dispatcher();
diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp
index 78f73bcd6..d1ffdd277 100644
--- a/kode/kwsdl/kung/doubleinputfield.cpp
+++ b/kode/kwsdl/kung/doubleinputfield.cpp
@@ -41,14 +41,14 @@ void DoubleInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:" + mTypeName );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void DoubleInputField::setData( const TQString &data )
@@ -61,9 +61,9 @@ TQString DoubleInputField::data() const
return TQString::number( mValue );
}
-TQWidget *DoubleInputField::createWidget( TQWidget *parent )
+TQWidget *DoubleInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new KDoubleSpinBox( parent );
+ mInputWidget = new KDoubleSpinBox( tqparent );
if ( mType ) {
if ( mType->facetType() & Schema::SimpleType::MININC )
diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h
index 61299a5cc..78f72cd6c 100644
--- a/kode/kwsdl/kung/doubleinputfield.h
+++ b/kode/kwsdl/kung/doubleinputfield.h
@@ -31,17 +31,18 @@ class KDoubleSpinBox;
class DoubleInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
DoubleInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void inputChanged( double );
diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp
index f290803b6..5d3fcf087 100644
--- a/kode/kwsdl/kung/enuminputfield.cpp
+++ b/kode/kwsdl/kung/enuminputfield.cpp
@@ -43,14 +43,14 @@ void EnumInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:string" );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void EnumInputField::setData( const TQString &data )
@@ -63,9 +63,9 @@ TQString EnumInputField::data() const
return mValue;
}
-TQWidget *EnumInputField::createWidget( TQWidget *parent )
+TQWidget *EnumInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new KComboBox( parent );
+ mInputWidget = new KComboBox( tqparent );
mInputWidget->insertStringList( mEnums );
mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) );
diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h
index 14e360332..91d2b19fb 100644
--- a/kode/kwsdl/kung/enuminputfield.h
+++ b/kode/kwsdl/kung/enuminputfield.h
@@ -31,17 +31,18 @@ class KComboBox;
class EnumInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
EnumInputField( const TQString &name, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void inputChanged( int );
diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp
index 17aa601b0..dc1a711c8 100644
--- a/kode/kwsdl/kung/inputdialog.cpp
+++ b/kode/kwsdl/kung/inputdialog.cpp
@@ -23,8 +23,8 @@
#include "inputdialog.h"
-InputDialog::InputDialog( TQWidget *page, TQWidget *parent )
- : KDialogBase( Swallow, "", Ok | Cancel, Ok, parent, "", true, true )
+InputDialog::InputDialog( TQWidget *page, TQWidget *tqparent )
+ : KDialogBase( Swallow, "", Ok | Cancel, Ok, tqparent, "", true, true )
{
setMainWidget( page );
diff --git a/kode/kwsdl/kung/inputdialog.h b/kode/kwsdl/kung/inputdialog.h
index b592545b7..fbefe4d1a 100644
--- a/kode/kwsdl/kung/inputdialog.h
+++ b/kode/kwsdl/kung/inputdialog.h
@@ -27,7 +27,7 @@
class InputDialog : public KDialogBase
{
public:
- InputDialog( TQWidget *page, TQWidget *parent );
+ InputDialog( TQWidget *page, TQWidget *tqparent );
};
#endif
diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h
index 58b2d23bd..100cc4bb4 100644
--- a/kode/kwsdl/kung/inputfield.h
+++ b/kode/kwsdl/kung/inputfield.h
@@ -37,9 +37,10 @@ class ComplexType;
/**
Abstract base class for all kinds of input fields.
*/
-class InputField : public QObject
+class InputField : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef TQValueList<InputField*> List;
@@ -67,7 +68,7 @@ class InputField : public QObject
/**
Returns the xml value of this field.
*/
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent ) = 0;
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ) = 0;
/**
Sets the plain data of this field as string.
@@ -83,7 +84,7 @@ class InputField : public QObject
Returns a pointer to a new created input widget which can be used to
to modify the value.
*/
- virtual TQWidget *createWidget( TQWidget *parent ) = 0;
+ virtual TQWidget *createWidget( TQWidget *tqparent ) = 0;
/**
Add a child field.
diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp
index 022ec0d84..9db5c40a8 100644
--- a/kode/kwsdl/kung/integerinputfield.cpp
+++ b/kode/kwsdl/kung/integerinputfield.cpp
@@ -43,14 +43,14 @@ void IntegerInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:" + mTypeName );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void IntegerInputField::setData( const TQString &data )
@@ -63,9 +63,9 @@ TQString IntegerInputField::data() const
return TQString::number( mValue );
}
-TQWidget *IntegerInputField::createWidget( TQWidget *parent )
+TQWidget *IntegerInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new KIntSpinBox( parent );
+ mInputWidget = new KIntSpinBox( tqparent );
// basic restrictions
if ( mTypeName == "byte" ) {
diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h
index 2cda162c6..bf6e61ed6 100644
--- a/kode/kwsdl/kung/integerinputfield.h
+++ b/kode/kwsdl/kung/integerinputfield.h
@@ -31,17 +31,18 @@ class KIntSpinBox;
class IntegerInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
IntegerInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void inputChanged( int );
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 7a5eeb713..a43f27b11 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -62,11 +62,11 @@ void ListInputField::setXMLData( const TQDomElement &element )
}
}
-void ListInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void ListInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
InputField::List::Iterator it;
for ( it = mFields.begin(); it != mFields.end(); ++it ) {
- (*it)->xmlData( document, parent );
+ (*it)->xmlData( document, tqparent );
}
}
@@ -79,17 +79,17 @@ TQString ListInputField::data() const
return TQString();
}
-TQWidget *ListInputField::createWidget( TQWidget *parent )
+TQWidget *ListInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new ListWidget( this, name(), mTypeName, parent );
+ mInputWidget = new ListWidget( this, name(), mTypeName, tqparent );
return mInputWidget;
}
-ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent )
- : TQWidget( parent ),
- mParentField( parentField ), mName( name ), mType( type )
+ListWidget::ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent )
+ : TQWidget( tqparent ),
+ mParentField( tqparentField ), mName( name ), mType( type )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h
index acf1e1c38..d36e091ce 100644
--- a/kode/kwsdl/kung/listinputfield.h
+++ b/kode/kwsdl/kung/listinputfield.h
@@ -33,29 +33,31 @@ class TQPushButton;
class ListInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
ListInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private:
ListWidget *mInputWidget;
TQString mTypeName;
};
-class ListWidget : public QWidget
+class ListWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent );
+ ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent );
void update();
diff --git a/kode/kwsdl/kung/loader.h b/kode/kwsdl/kung/loader.h
index 7762e292a..d48d935cc 100644
--- a/kode/kwsdl/kung/loader.h
+++ b/kode/kwsdl/kung/loader.h
@@ -26,9 +26,10 @@
class Dispatcher;
-class Loader : public QObject
+class Loader : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Loader();
diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp
index 6cdb7e579..bef2cd2fb 100644
--- a/kode/kwsdl/kung/outputdialog.cpp
+++ b/kode/kwsdl/kung/outputdialog.cpp
@@ -23,8 +23,8 @@
#include "outputdialog.h"
-OutputDialog::OutputDialog( TQWidget *page, TQWidget *parent )
- : KDialogBase( Swallow, "", Ok, Ok, parent, "", true, true )
+OutputDialog::OutputDialog( TQWidget *page, TQWidget *tqparent )
+ : KDialogBase( Swallow, "", Ok, Ok, tqparent, "", true, true )
{
setMainWidget( page );
}
diff --git a/kode/kwsdl/kung/outputdialog.h b/kode/kwsdl/kung/outputdialog.h
index a3c558789..bab043201 100644
--- a/kode/kwsdl/kung/outputdialog.h
+++ b/kode/kwsdl/kung/outputdialog.h
@@ -27,7 +27,7 @@
class OutputDialog : public KDialogBase
{
public:
- OutputDialog( TQWidget *page, TQWidget *parent );
+ OutputDialog( TQWidget *page, TQWidget *tqparent );
};
#endif
diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp
index 04f66ffa0..d7e5639b6 100644
--- a/kode/kwsdl/kung/pageinputfield.cpp
+++ b/kode/kwsdl/kung/pageinputfield.cpp
@@ -65,7 +65,7 @@ void PageInputField::setXMLData( const TQDomElement &element )
}
}
-void PageInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void PageInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( "ns1:" + mName );
@@ -73,7 +73,7 @@ void PageInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
for ( it = mFields.begin(); it != mFields.end(); ++it )
(*it)->xmlData( document, element );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void PageInputField::setData( const TQString& )
@@ -85,16 +85,16 @@ TQString PageInputField::data() const
return TQString();
}
-TQWidget *PageInputField::createWidget( TQWidget *parent )
+TQWidget *PageInputField::createWidget( TQWidget *tqparent )
{
- TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" );
+ TQWidget *mInputWidget = new TQWidget( tqparent, "PageInputWidget" );
TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 );
InputField::List::Iterator it;
int row = 0;
for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) {
TQLabel *label = new TQLabel( (*it)->name(), mInputWidget );
- label->tqsetAlignment( Qt::AlignTop );
+ label->tqsetAlignment( TQt::AlignTop );
tqlayout->addWidget( label, row, 0 );
tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 );
}
diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h
index 152d337ed..05321c31e 100644
--- a/kode/kwsdl/kung/pageinputfield.h
+++ b/kode/kwsdl/kung/pageinputfield.h
@@ -31,17 +31,18 @@
class PageInputField : public InputField
{
Q_OBJECT
+ TQ_OBJECT
public:
PageInputField( const TQString &name, const KWSDL::Message &message );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private:
TQWidget *mInputWidget;
diff --git a/kode/kwsdl/kung/simplebaseinputfield.cpp b/kode/kwsdl/kung/simplebaseinputfield.cpp
index 0198723cf..bd2aa90ea 100644
--- a/kode/kwsdl/kung/simplebaseinputfield.cpp
+++ b/kode/kwsdl/kung/simplebaseinputfield.cpp
@@ -59,14 +59,14 @@ void SimpleBaseInputField::setXMLData( const TQDomElement &element )
}
}
-void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
if ( mType->subType() == Schema::SimpleType::TypeRestriction ) {
InputField *field = mFields.first();
if ( !field ) {
qDebug( "SimpleBaseInputField: No child found" );
} else {
- field->xmlData( document, parent );
+ field->xmlData( document, tqparent );
}
} else {
qDebug( "SimpleBaseInputField: Unsupported subtype" );
@@ -103,7 +103,7 @@ TQString SimpleBaseInputField::data() const
return TQString();
}
-TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent )
+TQWidget *SimpleBaseInputField::createWidget( TQWidget *tqparent )
{
if ( mType->subType() == Schema::SimpleType::TypeRestriction ) {
InputField *field = mFields.first();
@@ -111,7 +111,7 @@ TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent )
qDebug( "SimpleBaseInputField: No child found" );
return 0;
} else {
- return field->createWidget( parent );
+ return field->createWidget( tqparent );
}
} else {
qDebug( "SimpleBaseInputField: Unsupported subtype" );
diff --git a/kode/kwsdl/kung/simplebaseinputfield.h b/kode/kwsdl/kung/simplebaseinputfield.h
index dab7e906c..aa52bc080 100644
--- a/kode/kwsdl/kung/simplebaseinputfield.h
+++ b/kode/kwsdl/kung/simplebaseinputfield.h
@@ -30,12 +30,12 @@ class SimpleBaseInputField : public SimpleInputField
SimpleBaseInputField( const TQString &name, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
};
#endif
diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp
index 390c5bc1b..6f1bc4f70 100644
--- a/kode/kwsdl/kung/stringinputfield.cpp
+++ b/kode/kwsdl/kung/stringinputfield.cpp
@@ -42,14 +42,14 @@ void StringInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void StringInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void StringInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:" + mTypeName );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void StringInputField::setData( const TQString &data )
@@ -62,9 +62,9 @@ TQString StringInputField::data() const
return mValue;
}
-TQWidget *StringInputField::createWidget( TQWidget *parent )
+TQWidget *StringInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new TQLineEdit( parent );
+ mInputWidget = new TQLineEdit( tqparent );
if ( mType ) {
if ( mType->facetType() & Schema::SimpleType::LENGTH ) // TODO: using TQValidator here?
diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h
index f8e8d5468..cd53a9b18 100644
--- a/kode/kwsdl/kung/stringinputfield.h
+++ b/kode/kwsdl/kung/stringinputfield.h
@@ -31,17 +31,18 @@ class TQLineEdit;
class StringInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
StringInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void inputChanged( const TQString& );
diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp
index 9da18a0cc..29b89fcab 100644
--- a/kode/kwsdl/kung/timeinputfield.cpp
+++ b/kode/kwsdl/kung/timeinputfield.cpp
@@ -39,29 +39,29 @@ void TimeInputField::setXMLData( const TQDomElement &element )
setData( element.text() );
}
-void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &parent )
+void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent )
{
TQDomElement element = document.createElement( mName );
element.setAttribute( "xsi:type", "xsd:time" );
TQDomText text = document.createTextNode( data() );
element.appendChild( text );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void TimeInputField::setData( const TQString &data )
{
- mValue = TQTime::fromString( data, Qt::ISODate );
+ mValue = TQTime::fromString( data, TQt::ISODate );
}
TQString TimeInputField::data() const
{
- return mValue.toString( Qt::ISODate );
+ return mValue.toString( TQt::ISODate );
}
-TQWidget *TimeInputField::createWidget( TQWidget *parent )
+TQWidget *TimeInputField::createWidget( TQWidget *tqparent )
{
- mInputWidget = new KTimeWidget( parent );
+ mInputWidget = new KTimeWidget( tqparent );
mInputWidget->setTime( mValue );
diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h
index c363151de..f3b14c9d8 100644
--- a/kode/kwsdl/kung/timeinputfield.h
+++ b/kode/kwsdl/kung/timeinputfield.h
@@ -32,17 +32,18 @@ class KTimeWidget;
class TimeInputField : public SimpleInputField
{
Q_OBJECT
+ TQ_OBJECT
public:
TimeInputField( const TQString &name, const Schema::SimpleType *type );
virtual void setXMLData( const TQDomElement &element );
- virtual void xmlData( TQDomDocument &document, TQDomElement &parent );
+ virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent );
virtual void setData( const TQString &data );
virtual TQString data() const;
- virtual TQWidget *createWidget( TQWidget *parent );
+ virtual TQWidget *createWidget( TQWidget *tqparent );
private slots:
void inputChanged( const TQTime& );
diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h
index 240755d18..6e6bec1cf 100644
--- a/kode/kwsdl/kung/transport.h
+++ b/kode/kwsdl/kung/transport.h
@@ -23,9 +23,10 @@
#include <tqobject.h>
#include <kio/job.h>
-class Transport : public QObject
+class Transport : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Transport( const TQString &url );
diff --git a/kode/kwsdl/parser.cpp b/kode/kwsdl/parser.cpp
index 49f77eca4..b8512490b 100644
--- a/kode/kwsdl/parser.cpp
+++ b/kode/kwsdl/parser.cpp
@@ -27,7 +27,7 @@ using namespace KWSDL;
static TQString sns( const TQString &str )
{
- int pos = str.find( ':' );
+ int pos = str.tqfind( ':' );
if ( pos != -1 )
return str.mid( pos + 1 );
else
@@ -94,9 +94,9 @@ void Parser::parse( const TQDomElement &root )
}
}
-void Parser::parseTypes( const TQDomElement &parent )
+void Parser::parseTypes( const TQDomElement &tqparent )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -108,9 +108,9 @@ void Parser::parseTypes( const TQDomElement &parent )
}
}
-void Parser::parseMessage( const TQDomElement &parent, Message &message )
+void Parser::parseMessage( const TQDomElement &tqparent, Message &message )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -130,9 +130,9 @@ void Parser::parseMessage( const TQDomElement &parent, Message &message )
}
}
-void Parser::parsePortType( const TQDomElement &parent, Port &port )
+void Parser::parsePortType( const TQDomElement &tqparent, Port &port )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -161,11 +161,11 @@ void Parser::parsePortType( const TQDomElement &parent, Port &port )
}
}
-void Parser::parseBinding( const TQDomElement &parent )
+void Parser::parseBinding( const TQDomElement &tqparent )
{
- Binding binding( sns( parent.attribute( "name" ) ), sns( parent.attribute( "type" ) ) );
+ Binding binding( sns( tqparent.attribute( "name" ) ), sns( tqparent.attribute( "type" ) ) );
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -216,9 +216,9 @@ void Parser::parseBinding( const TQDomElement &parent )
mBindings.append( binding );
}
-void Parser::parseService( const TQDomElement &parent )
+void Parser::parseService( const TQDomElement &tqparent )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h
index c665c3dac..1c2ef7384 100644
--- a/kode/kwsdl/schema/fileprovider.h
+++ b/kode/kwsdl/schema/fileprovider.h
@@ -30,9 +30,10 @@ class Job;
namespace Schema {
-class FileProvider : QObject
+class FileProvider : TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
FileProvider();
diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp
index ba62b0c33..4571f5cc6 100644
--- a/kode/kwsdl/schema/parser.cpp
+++ b/kode/kwsdl/schema/parser.cpp
@@ -446,7 +446,7 @@ void Parser::addElement( const TQDomElement &element, ComplexType *cType )
&& ct->elementName( 0 ) == "any" ) {
// if the complex type is <any> then we dont need a type for it.
- // make the parent's type as XSDType::ANY
+ // make the tqparent's type as XSDType::ANY
delete ct;
type_id = XSDType::ANY;
} else {
diff --git a/kode/kwsdl/schema/qualifiedname.cpp b/kode/kwsdl/schema/qualifiedname.cpp
index 350bca32f..41e6fd849 100644
--- a/kode/kwsdl/schema/qualifiedname.cpp
+++ b/kode/kwsdl/schema/qualifiedname.cpp
@@ -65,7 +65,7 @@ bool QualifiedName::operator==( const QualifiedName &qn ) const
void QualifiedName::parse( const TQString &str )
{
- int pos = str.find( ':' );
+ int pos = str.tqfind( ':' );
if ( pos != -1 ) {
mPrefix = str.left( pos );
mLocalName = str.mid( pos + 1 );
diff --git a/kode/kwsdl/schema/qualifiedname.h b/kode/kwsdl/schema/qualifiedname.h
index f879836cd..b4328911b 100644
--- a/kode/kwsdl/schema/qualifiedname.h
+++ b/kode/kwsdl/schema/qualifiedname.h
@@ -20,8 +20,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef SCHEMA_QUALIFIEDNAME_H
-#define SCHEMA_QUALIFIEDNAME_H
+#ifndef SCHEMA_TQUALIFIEDNAME_H
+#define SCHEMA_TQUALIFIEDNAME_H
#include <tqstring.h>
#include <tqvaluelist.h>
diff --git a/kode/kwsdl/schema/typestable.cpp b/kode/kwsdl/schema/typestable.cpp
index 91a85f516..a58aa7089 100644
--- a/kode/kwsdl/schema/typestable.cpp
+++ b/kode/kwsdl/schema/typestable.cpp
@@ -50,7 +50,7 @@ TypesTable::TypesTable()
mBasicTypes["dateTime"] = XSDType::DATETIME;
mBasicTypes["date"] = XSDType::DATE;
mBasicTypes["token"] = XSDType::TOKEN;
- mBasicTypes["QName"] = XSDType::QNAME;
+ mBasicTypes["TQName"] = XSDType::TQNAME;
mBasicTypes["NCName"] = XSDType::NCNAME;
mBasicTypes["NMTOKEN"] = XSDType::NMTOKEN;
mBasicTypes["NMTOKENS"] = XSDType::NMTOKENS;
diff --git a/kode/kwsdl/schema/xsdtype.h b/kode/kwsdl/schema/xsdtype.h
index b1077ebe5..ab54190f2 100644
--- a/kode/kwsdl/schema/xsdtype.h
+++ b/kode/kwsdl/schema/xsdtype.h
@@ -67,7 +67,7 @@ class XSDType
DATETIME,
DATE,
TOKEN,
- QNAME,
+ TQNAME,
NCNAME,
NMTOKEN,
NMTOKENS,
diff --git a/kode/kwsdl/tests/google/directorycategory.cpp b/kode/kwsdl/tests/google/directorycategory.cpp
index 6a61dab53..e4cc56054 100644
--- a/kode/kwsdl/tests/google/directorycategory.cpp
+++ b/kode/kwsdl/tests/google/directorycategory.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "directorycategory.h"
diff --git a/kode/kwsdl/tests/google/directorycategory.h b/kode/kwsdl/tests/google/directorycategory.h
index d7805e500..3230dfb16 100644
--- a/kode/kwsdl/tests/google/directorycategory.h
+++ b/kode/kwsdl/tests/google/directorycategory.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef DIRECTORYCATEGORY_H
#define DIRECTORYCATEGORY_H
diff --git a/kode/kwsdl/tests/google/directorycategoryarray.cpp b/kode/kwsdl/tests/google/directorycategoryarray.cpp
index b8305222c..b290fc3da 100644
--- a/kode/kwsdl/tests/google/directorycategoryarray.cpp
+++ b/kode/kwsdl/tests/google/directorycategoryarray.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "directorycategoryarray.h"
diff --git a/kode/kwsdl/tests/google/directorycategoryarray.h b/kode/kwsdl/tests/google/directorycategoryarray.h
index f4c279952..adce04e9d 100644
--- a/kode/kwsdl/tests/google/directorycategoryarray.h
+++ b/kode/kwsdl/tests/google/directorycategoryarray.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef DIRECTORYCATEGORYARRAY_H
#define DIRECTORYCATEGORYARRAY_H
diff --git a/kode/kwsdl/tests/google/googlesearch.cc b/kode/kwsdl/tests/google/googlesearch.cc
index 5e26c769a..d60c04172 100644
--- a/kode/kwsdl/tests/google/googlesearch.cc
+++ b/kode/kwsdl/tests/google/googlesearch.cc
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "googlesearch.hh"
diff --git a/kode/kwsdl/tests/google/googlesearch.hh b/kode/kwsdl/tests/google/googlesearch.hh
index a1c490bbf..b64006161 100644
--- a/kode/kwsdl/tests/google/googlesearch.hh
+++ b/kode/kwsdl/tests/google/googlesearch.hh
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef GOOGLESEARCH_H
@@ -28,9 +28,10 @@
#include <tqobject.h>
#include "googlesearchservice.h"
-class GoogleSearch : public QObject
+class GoogleSearch : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
GoogleSearch();
diff --git a/kode/kwsdl/tests/google/googlesearchresult.cpp b/kode/kwsdl/tests/google/googlesearchresult.cpp
index faa209ce6..451ff4e57 100644
--- a/kode/kwsdl/tests/google/googlesearchresult.cpp
+++ b/kode/kwsdl/tests/google/googlesearchresult.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "googlesearchresult.h"
diff --git a/kode/kwsdl/tests/google/googlesearchresult.h b/kode/kwsdl/tests/google/googlesearchresult.h
index 537bb1bc1..251053b35 100644
--- a/kode/kwsdl/tests/google/googlesearchresult.h
+++ b/kode/kwsdl/tests/google/googlesearchresult.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef GOOGLESEARCHRESULT_H
#define GOOGLESEARCHRESULT_H
diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp
index a45aec9e4..e609249ee 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.cpp
+++ b/kode/kwsdl/tests/google/googlesearchservice.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "googlesearchservice.h"
diff --git a/kode/kwsdl/tests/google/googlesearchservice.h b/kode/kwsdl/tests/google/googlesearchservice.h
index 6efd65239..7e79fdba1 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.h
+++ b/kode/kwsdl/tests/google/googlesearchservice.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef GOOGLESEARCHSERVICE_H
#define GOOGLESEARCHSERVICE_H
@@ -30,9 +30,10 @@
#include <tqcstring.h>
#include <googlesearchresult.h>
-class GoogleSearchService : public QObject
+class GoogleSearchService : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
void doGetCachedPage( TQString* key, TQString* url );
diff --git a/kode/kwsdl/tests/google/resultelement.cpp b/kode/kwsdl/tests/google/resultelement.cpp
index c340f8b04..f4e78a01f 100644
--- a/kode/kwsdl/tests/google/resultelement.cpp
+++ b/kode/kwsdl/tests/google/resultelement.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "resultelement.h"
diff --git a/kode/kwsdl/tests/google/resultelement.h b/kode/kwsdl/tests/google/resultelement.h
index bf13486c8..b66ae7166 100644
--- a/kode/kwsdl/tests/google/resultelement.h
+++ b/kode/kwsdl/tests/google/resultelement.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef RESULTELEMENT_H
#define RESULTELEMENT_H
diff --git a/kode/kwsdl/tests/google/resultelementarray.cpp b/kode/kwsdl/tests/google/resultelementarray.cpp
index 0ea65755f..210f57db4 100644
--- a/kode/kwsdl/tests/google/resultelementarray.cpp
+++ b/kode/kwsdl/tests/google/resultelementarray.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "resultelementarray.h"
diff --git a/kode/kwsdl/tests/google/resultelementarray.h b/kode/kwsdl/tests/google/resultelementarray.h
index 972171172..7303a2831 100644
--- a/kode/kwsdl/tests/google/resultelementarray.h
+++ b/kode/kwsdl/tests/google/resultelementarray.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef RESULTELEMENTARRAY_H
#define RESULTELEMENTARRAY_H
diff --git a/kode/kwsdl/tests/google/serializer.cpp b/kode/kwsdl/tests/google/serializer.cpp
index 4b0ea8ba3..281f3269a 100644
--- a/kode/kwsdl/tests/google/serializer.cpp
+++ b/kode/kwsdl/tests/google/serializer.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "serializer.h"
@@ -41,12 +41,12 @@ void Serializer::demarshalValue( const TQString &str, TQString *value )
*value = str;
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:string" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, TQString* value )
@@ -64,12 +64,12 @@ void Serializer::demarshalValue( const TQString &str, bool *value )
*value = (str.lower() == "true" ? true : false);
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:boolean" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, bool* value )
@@ -87,12 +87,12 @@ void Serializer::demarshalValue( const TQString &str, float *value )
*value = str.toFloat();
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:TODO" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, float* value )
@@ -110,12 +110,12 @@ void Serializer::demarshalValue( const TQString &str, int *value )
*value = str.toInt();
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:int" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, int* value )
@@ -133,12 +133,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned int *value )
*value = str.toUInt();
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:unsignedByte" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, unsigned int* value )
@@ -156,12 +156,12 @@ void Serializer::demarshalValue( const TQString &str, double *value )
*value = str.toDouble();
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:double" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, double* value )
@@ -179,12 +179,12 @@ void Serializer::demarshalValue( const TQString &str, char *value )
*value = str[ 0 ].latin1();
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:byte" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, char* value )
@@ -202,12 +202,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned char *value )
*value = str[ 0 ].latin1();
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:unsignedByte" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, unsigned char* value )
@@ -225,12 +225,12 @@ void Serializer::demarshalValue( const TQString &str, short *value )
*value = str.toShort();
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:short" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, short* value )
@@ -248,12 +248,12 @@ void Serializer::demarshalValue( const TQString &str, TQByteArray *value )
*value = KCodecs::base64Decode( str.utf8() );
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:base64Binary" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, TQByteArray* value )
@@ -263,20 +263,20 @@ void Serializer::demarshal( const TQDomElement &element, TQByteArray* value )
TQString Serializer::marshalValue( const TQDateTime* value )
{
- return value->toString( Qt::ISODate );
+ return value->toString( TQt::ISODate );
}
void Serializer::demarshalValue( const TQString &str, TQDateTime *value )
{
- *value = TQDateTime::fromString( str, Qt::ISODate );
+ *value = TQDateTime::fromString( str, TQt::ISODate );
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:dateTime" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, TQDateTime* value )
@@ -286,20 +286,20 @@ void Serializer::demarshal( const TQDomElement &element, TQDateTime* value )
TQString Serializer::marshalValue( const TQDate* value )
{
- return value->toString( Qt::ISODate );
+ return value->toString( TQt::ISODate );
}
void Serializer::demarshalValue( const TQString &str, TQDate *value )
{
- *value = TQDate::fromString( str, Qt::ISODate );
+ *value = TQDate::fromString( str, TQt::ISODate );
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value )
{
TQDomElement element = doc.createElement( name );
element.setAttribute( "xsi:type", "xsd:date" );
element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
void Serializer::demarshal( const TQDomElement &element, TQDate* value )
@@ -307,11 +307,11 @@ void Serializer::demarshal( const TQDomElement &element, TQDate* value )
Serializer::demarshalValue( element.text(), value );
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value )
{
TQDomElement root = doc.createElement( name );
root.setAttribute( "xsi:type", "ns1:ResultElementArray" );
- parent.appendChild( root );
+ tqparent.appendChild( root );
if ( value->items() ) {
const TQPtrList<ResultElement>* list = value->items();
@@ -319,7 +319,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" );
element.setAttribute( "xsi:type", "ns1:Array" );
element.setAttribute( "ns1:arrayType", "ns1:ResultElement[" + TQString::number( list->count() ) + "]" );
- parent.appendChild( element );
+ tqparent.appendChild( element );
TQPtrListIterator<ResultElement> it( *list );
while ( it.current() != 0 ) {
@@ -329,11 +329,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
}
}
-void Serializer::demarshal( const TQDomElement &parent, ResultElementArray* value )
+void Serializer::demarshal( const TQDomElement &tqparent, ResultElementArray* value )
{
TQPtrList<ResultElement>* itemsList = new TQPtrList<ResultElement>();
itemsList->setAutoDelete( true );
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -349,11 +349,11 @@ void Serializer::demarshal( const TQDomElement &parent, ResultElementArray* valu
value->setItems( itemsList );
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value )
{
TQDomElement root = doc.createElement( name );
root.setAttribute( "xsi:type", "ns1:DirectoryCategoryArray" );
- parent.appendChild( root );
+ tqparent.appendChild( root );
if ( value->items() ) {
const TQPtrList<DirectoryCategory>* list = value->items();
@@ -361,7 +361,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" );
element.setAttribute( "xsi:type", "ns1:Array" );
element.setAttribute( "ns1:arrayType", "ns1:DirectoryCategory[" + TQString::number( list->count() ) + "]" );
- parent.appendChild( element );
+ tqparent.appendChild( element );
TQPtrListIterator<DirectoryCategory> it( *list );
while ( it.current() != 0 ) {
@@ -371,11 +371,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
}
}
-void Serializer::demarshal( const TQDomElement &parent, DirectoryCategoryArray* value )
+void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value )
{
TQPtrList<DirectoryCategory>* itemsList = new TQPtrList<DirectoryCategory>();
itemsList->setAutoDelete( true );
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -391,11 +391,11 @@ void Serializer::demarshal( const TQDomElement &parent, DirectoryCategoryArray*
value->setItems( itemsList );
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value )
{
TQDomElement root = doc.createElement( name );
root.setAttribute( "xsi:type", "ns1:GoogleSearchResult" );
- parent.appendChild( root );
+ tqparent.appendChild( root );
if ( value->documentFiltering() ) {
Serializer::marshal( doc, root, "documentFiltering", value->documentFiltering() );
}
@@ -431,9 +431,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
}
}
-void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* value )
+void Serializer::demarshal( const TQDomElement &tqparent, GoogleSearchResult* value )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -498,11 +498,11 @@ void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* valu
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value )
{
TQDomElement root = doc.createElement( name );
root.setAttribute( "xsi:type", "ns1:DirectoryCategory" );
- parent.appendChild( root );
+ tqparent.appendChild( root );
if ( value->fullViewableName() ) {
Serializer::marshal( doc, root, "fullViewableName", value->fullViewableName() );
}
@@ -511,9 +511,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
}
}
-void Serializer::demarshal( const TQDomElement &parent, DirectoryCategory* value )
+void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategory* value )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
@@ -533,11 +533,11 @@ void Serializer::demarshal( const TQDomElement &parent, DirectoryCategory* value
}
-void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value )
+void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value )
{
TQDomElement root = doc.createElement( name );
root.setAttribute( "xsi:type", "ns1:ResultElement" );
- parent.appendChild( root );
+ tqparent.appendChild( root );
if ( value->summary() ) {
Serializer::marshal( doc, root, "summary", value->summary() );
}
@@ -567,9 +567,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQStri
}
}
-void Serializer::demarshal( const TQDomElement &parent, ResultElement* value )
+void Serializer::demarshal( const TQDomElement &tqparent, ResultElement* value )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() ) {
TQDomElement element = node.toElement();
if ( !element.isNull() ) {
diff --git a/kode/kwsdl/tests/google/serializer.h b/kode/kwsdl/tests/google/serializer.h
index eb60d3f26..4b5ff1921 100644
--- a/kode/kwsdl/tests/google/serializer.h
+++ b/kode/kwsdl/tests/google/serializer.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef SERIALIZER_H
#define SERIALIZER_H
@@ -41,62 +41,62 @@ class Serializer
public:
static TQString marshalValue( const TQString* value );
static void demarshalValue( const TQString &str, TQString *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value );
static void demarshal( const TQDomElement &element, TQString* value );
static TQString marshalValue( const bool* value );
static void demarshalValue( const TQString &str, bool *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value );
static void demarshal( const TQDomElement &element, bool* value );
static TQString marshalValue( const float* value );
static void demarshalValue( const TQString &str, float *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value );
static void demarshal( const TQDomElement &element, float* value );
static TQString marshalValue( const int* value );
static void demarshalValue( const TQString &str, int *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value );
static void demarshal( const TQDomElement &element, int* value );
static TQString marshalValue( const unsigned int* value );
static void demarshalValue( const TQString &str, unsigned int *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value );
static void demarshal( const TQDomElement &element, unsigned int* value );
static TQString marshalValue( const double* value );
static void demarshalValue( const TQString &str, double *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value );
static void demarshal( const TQDomElement &element, double* value );
static TQString marshalValue( const char* value );
static void demarshalValue( const TQString &str, char *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value );
static void demarshal( const TQDomElement &element, char* value );
static TQString marshalValue( const unsigned char* value );
static void demarshalValue( const TQString &str, unsigned char *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value );
static void demarshal( const TQDomElement &element, unsigned char* value );
static TQString marshalValue( const short* value );
static void demarshalValue( const TQString &str, short *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value );
static void demarshal( const TQDomElement &element, short* value );
static TQString marshalValue( const TQByteArray* value );
static void demarshalValue( const TQString &str, TQByteArray *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value );
static void demarshal( const TQDomElement &element, TQByteArray* value );
static TQString marshalValue( const TQDateTime* value );
static void demarshalValue( const TQString &str, TQDateTime *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value );
static void demarshal( const TQDomElement &element, TQDateTime* value );
static TQString marshalValue( const TQDate* value );
static void demarshalValue( const TQString &str, TQDate *value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value );
static void demarshal( const TQDomElement &element, TQDate* value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value );
- static void demarshal( const TQDomElement &parent, ResultElementArray* value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value );
- static void demarshal( const TQDomElement &parent, DirectoryCategoryArray* value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value );
- static void demarshal( const TQDomElement &parent, GoogleSearchResult* value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value );
- static void demarshal( const TQDomElement &parent, DirectoryCategory* value );
- static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value );
- static void demarshal( const TQDomElement &parent, ResultElement* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value );
+ static void demarshal( const TQDomElement &tqparent, ResultElementArray* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value );
+ static void demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value );
+ static void demarshal( const TQDomElement &tqparent, GoogleSearchResult* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value );
+ static void demarshal( const TQDomElement &tqparent, DirectoryCategory* value );
+ static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value );
+ static void demarshal( const TQDomElement &tqparent, ResultElement* value );
};
diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp
index 5d7d92f2b..55d3c7a88 100644
--- a/kode/kwsdl/tests/google/transport.cpp
+++ b/kode/kwsdl/tests/google/transport.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "transport.h"
diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h
index f2386832f..54dbf6941 100644
--- a/kode/kwsdl/tests/google/transport.h
+++ b/kode/kwsdl/tests/google/transport.h
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef TRANSPORT_H
#define TRANSPORT_H
@@ -27,9 +27,10 @@
#include <tqobject.h>
#include <kio/job.h>
-class Transport : public QObject
+class Transport : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Transport( const TQString &url );
diff --git a/kode/kwsdl/typemapper.cpp b/kode/kwsdl/typemapper.cpp
index 88842ecea..024b4f42d 100644
--- a/kode/kwsdl/typemapper.cpp
+++ b/kode/kwsdl/typemapper.cpp
@@ -33,21 +33,21 @@ using namespace KWSDL;
TypeMapper::TypeMapper()
{
- mMap.insert( "any", TypeInfo( "any", "TQString", "tqstring.h" ) );
- mMap.insert( "anyURI", TypeInfo( "anyUri", "TQString", "tqstring.h" ) );
- mMap.insert( "base64Binary", TypeInfo( "base64Binary", "TQByteArray", "tqcstring.h" ) );
- mMap.insert( "binary", TypeInfo( "binary", "TQByteArray", "tqcstring.h" ) );
+ mMap.insert( "any", TypeInfo( "any", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
+ mMap.insert( "anyURI", TypeInfo( "anyUri", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
+ mMap.insert( "base64Binary", TypeInfo( "base64Binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) );
+ mMap.insert( "binary", TypeInfo( "binary", TQBYTEARRAY_OBJECT_NAME_STRING, "tqcstring.h" ) );
mMap.insert( "boolean", TypeInfo( "boolean", "bool", "" ) );
mMap.insert( "byte", TypeInfo( "byte", "char", "" ) );
mMap.insert( "date", TypeInfo( "date", "TQDate", "tqdatetime.h" ) );
mMap.insert( "dateTime", TypeInfo( "dateTime", "TQDateTime", "tqdatetime.h" ) );
mMap.insert( "decimal", TypeInfo( "decimal", "float", "" ) );
mMap.insert( "double", TypeInfo( "double", "double", "" ) );
- mMap.insert( "duration", TypeInfo( "duration", "TQString", "tqstring.h" ) ); // TODO: add duration class
+ mMap.insert( "duration", TypeInfo( "duration", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) ); // TODO: add duration class
mMap.insert( "int", TypeInfo( "int", "int", "" ) );
- mMap.insert( "language", TypeInfo( "language", "TQString", "tqstring.h" ) );
+ mMap.insert( "language", TypeInfo( "language", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
mMap.insert( "short", TypeInfo( "short", "short", "" ) );
- mMap.insert( "string", TypeInfo( "string", "TQString", "tqstring.h" ) );
+ mMap.insert( "string", TypeInfo( "string", TQSTRING_OBJECT_NAME_STRING, "tqstring.h" ) );
mMap.insert( "unsignedByte", TypeInfo( "unsignedByte", "unsigned char", "" ) );
mMap.insert( "unsignedInt", TypeInfo( "unsignedInt", "unsigned int", "" ) );
}
@@ -71,7 +71,7 @@ TQString TypeMapper::type( const Schema::Element *element ) const
TQString type;
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() )
type = it.data().type;
@@ -89,7 +89,7 @@ TQString TypeMapper::type( const Schema::Attribute *attribute ) const
TQString type;
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() )
type = it.data().type;
@@ -104,7 +104,7 @@ TQString TypeMapper::type( const Schema::Attribute *attribute ) const
TQString TypeMapper::type( const TQString &typeName ) const
{
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() )
return it.data().type;
@@ -147,7 +147,7 @@ TQStringList TypeMapper::header( const Schema::Element *element ) const
TQStringList headers;
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() )
headers.append( it.data().header );
@@ -167,10 +167,10 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Element *element
TQMap<TQString, TQString> headers;
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() ) {
- if ( it.data().type == "TQByteArray" )
+ if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
headers.insert( it.data().header, TQString() );
else
headers.insert( it.data().header, it.data().type );
@@ -193,7 +193,7 @@ TQStringList TypeMapper::header( const Schema::Attribute *attribute ) const
TQStringList headers;
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() )
headers.append( it.data().header );
@@ -210,10 +210,10 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib
TQMap<TQString, TQString> headers;
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() ) {
- if ( it.data().type == "TQByteArray" )
+ if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
headers.insert( it.data().header, TQString() );
else
headers.insert( it.data().header, it.data().type );
@@ -228,7 +228,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib
TQStringList TypeMapper::header( const TQString &typeName ) const
{
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() )
return it.data().header;
@@ -249,10 +249,10 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const TQString &typeName ) cons
TQMap<TQString, TQString> headers;
// check basic types
- TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName );
+ TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName );
if ( it != mMap.end() ) {
if ( !it.data().header.isEmpty() ) {
- if ( it.data().type == "TQByteArray" )
+ if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING )
headers.insert( it.data().header, TQString() );
else
headers.insert( it.data().header, it.data().type );
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index 25e91edce..66dccccbb 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -95,7 +95,7 @@ void Creator::createProperty( KODE::Class &c, const TQString &type,
void Creator::createElementFunctions( KODE::Class &c, Element *e )
{
if ( e->hasText ) {
- createProperty( c, "TQString", e->name );
+ createProperty( c, TQSTRING_OBJECT_NAME_STRING, e->name );
if ( mXmlParserType == XmlParserCustomExternal ) {
createTextElementParserCustom( c, e );
}
@@ -137,7 +137,7 @@ void Creator::createClass( Element *element )
{
TQString className = upperFirst( element->name );
- if ( mProcessedClasses.find( className ) != mProcessedClasses.end() ) {
+ if ( mProcessedClasses.tqfind( className ) != mProcessedClasses.end() ) {
return;
}
@@ -150,7 +150,7 @@ void Creator::createClass( Element *element )
itA != element->attributes.end(); ++itA ) {
Attribute *a = *itA;
- createProperty( c, "TQString", a->name );
+ createProperty( c, TQSTRING_OBJECT_NAME_STRING, a->name );
}
TQValueList<Element *>::ConstIterator itE;
@@ -176,7 +176,7 @@ void Creator::createClass( Element *element )
void Creator::createElementWriter( KODE::Class &c, Element *element )
{
- KODE::Function writer( "writeElement", "TQString" );
+ KODE::Function writer( "writeElement", TQSTRING_OBJECT_NAME_STRING );
KODE::Code code;
@@ -268,7 +268,7 @@ void Creator::createElementParser( KODE::Class &c, Element *e )
void Creator::createTextElementParserCustom( KODE::Class &, Element *e )
{
- KODE::Function parser( "parseElement" + upperFirst( e->name ), "TQString" );
+ KODE::Function parser( "parseElement" + upperFirst( e->name ), TQSTRING_OBJECT_NAME_STRING );
KODE::Code code;
@@ -637,7 +637,7 @@ void Creator::createListTypedefs()
void Creator::createIndenter( KODE::File &file )
{
- KODE::Function indenter( "indent", "TQString" );
+ KODE::Function indenter( "indent", TQSTRING_OBJECT_NAME_STRING );
indenter.addArgument( "int n = 0" );
KODE::Code code;
@@ -724,7 +724,7 @@ void Creator::createFileParserCustom( Element *element )
mParserClass.addInclude( "kdebug.h" );
mParserClass.addMemberVariable( KODE::MemberVariable( "mBuffer",
- "TQString" ) );
+ TQSTRING_OBJECT_NAME_STRING ) );
mParserClass.addMemberVariable( KODE::MemberVariable( "mRunning",
"unsigned int" ) );
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 59392ca84..0d5ddf154 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -97,7 +97,7 @@ Element *Parser::parse( const TQDomElement &docElement )
parseElement( e1, d, Pattern() );
Element::List definitions;
TQMap<TQString,Element::List >::ConstIterator it;
- it = mDefinitionMap.find( d->name );
+ it = mDefinitionMap.tqfind( d->name );
if ( it != mDefinitionMap.end() ) definitions = *it;
definitions.append( d );
mDefinitionMap.tqreplace( d->name, definitions );
@@ -192,7 +192,7 @@ void Parser::substituteReferences( Element *s )
r->substituted = true;
}
TQMap<TQString,Element::List >::ConstIterator it1;
- it1 = mDefinitionMap.find( r->name );
+ it1 = mDefinitionMap.tqfind( r->name );
if ( it1 != mDefinitionMap.end() ) {
Element::List elements = *it1;
Element::List::ConstIterator it4;
diff --git a/kode/license.cpp b/kode/license.cpp
index 12208f8c5..1cec5cab6 100644
--- a/kode/license.cpp
+++ b/kode/license.cpp
@@ -26,18 +26,18 @@
using namespace KODE;
License::License()
- : mType( GPL ), mQtException( true )
+ : mType( GPL ), mTQtException( true )
{
}
License::License( Type type )
- : mType( type ), mQtException( true )
+ : mType( type ), mTQtException( true )
{
}
-void License::setQtException( bool v )
+void License::setTQtException( bool v )
{
- mQtException = v;
+ mTQtException = v;
}
TQString License::text()
@@ -60,12 +60,12 @@ TQString License::text()
"You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n" "USA.\n";
- if ( mQtException ) {
+ if ( mTQtException ) {
txt += "\n";
txt +=
"As a special exception, permission is given to link this program\n"
-"with any edition of Qt, and distribute the resulting executable,\n"
-"without including the source code for Qt in the source distribution.\n";
+"with any edition of TQt, and distribute the resulting executable,\n"
+"without including the source code for TQt in the source distribution.\n";
}
break;
case LGPL:
diff --git a/kode/license.h b/kode/license.h
index d74a0b579..3cdeff1fa 100644
--- a/kode/license.h
+++ b/kode/license.h
@@ -34,14 +34,14 @@ class KDE_EXPORT License
License();
License( Type );
- void setQtException( bool );
+ void setTQtException( bool );
TQString text();
private:
Type mType;
- bool mQtException;
+ bool mTQtException;
};
}
diff --git a/kode/printer.cpp b/kode/printer.cpp
index 5fa8907c4..ddb5e5c44 100644
--- a/kode/printer.cpp
+++ b/kode/printer.cpp
@@ -199,8 +199,8 @@ TQString Printer::classHeader( const Class &c )
code += "{";
code.indent();
- if ( c.isQObject() ) {
- code += "Q_OBJECT";
+ if ( c.isTQObject() ) {
+ code += "TQ_OBJECT";
code.newLine();
}
@@ -308,9 +308,9 @@ TQString Printer::classImplementation( const Class &c )
code += "";
}
- if ( c.isQObject() ) {
+ if ( c.isTQObject() ) {
code.newLine();
- code += "#include \"" + c.name().lower() + ".moc\"";
+ code += "#include \"" + c.name().lower() + ".tqmoc\"";
}
return code.text();
@@ -346,7 +346,7 @@ void Printer::printHeader( const File &f )
TQStringList includes = (*it).headerIncludes();
TQStringList::ConstIterator it2;
for( it2 = includes.begin(); it2 != includes.end(); ++it2 ) {
- if ( processed.find( *it2 ) == processed.end() ) {
+ if ( processed.tqfind( *it2 ) == processed.end() ) {
out += "#include <" + *it2 + ">";
processed.append( *it2 );
}
@@ -361,7 +361,7 @@ void Printer::printHeader( const File &f )
TQStringList decls = (*it).forwardDeclarations();
TQStringList::ConstIterator it2;
for( it2 = decls.begin(); it2 != decls.end(); ++it2 ) {
- if ( processed.find( *it2 ) == processed.end() ) {
+ if ( processed.tqfind( *it2 ) == processed.end() ) {
out += "class " + *it2 + ";";
processed.append( *it2 );
}
@@ -395,7 +395,7 @@ void Printer::printHeader( const File &f )
if ( !mOutputDirectory.isEmpty() ) filename.prepend( mOutputDirectory + "/" );
- KSaveFile::backupFile( filename, TQString::null, ".backup" );
+ KSaveFile::backupFile( filename, TQString(), ".backup" );
TQFile header( filename );
if ( !header.open( IO_WriteOnly ) ) {
@@ -441,7 +441,7 @@ void Printer::printImplementation( const File &f, bool createHeaderInclude )
TQStringList includes = (*it).includes();
TQStringList::ConstIterator it2;
for( it2 = includes.begin(); it2 != includes.end(); ++it2 ) {
- if ( processed.find( *it2 ) == processed.end() ) {
+ if ( processed.tqfind( *it2 ) == processed.end() ) {
out += "#include <" + *it2 + ">";
processed.append( *it2 );
}
@@ -508,7 +508,7 @@ void Printer::printImplementation( const File &f, bool createHeaderInclude )
if ( !mOutputDirectory.isEmpty() ) filename.prepend( mOutputDirectory + "/" );
- KSaveFile::backupFile( filename, TQString::null, ".backup" );
+ KSaveFile::backupFile( filename, TQString(), ".backup" );
TQFile implementation( filename );
if ( !implementation.open( IO_WriteOnly ) ) {
@@ -529,7 +529,7 @@ void Printer::printAutoMakefile( const AutoMakefile &am )
if ( !mOutputDirectory.isEmpty() ) filename.prepend( mOutputDirectory + "/" );
- KSaveFile::backupFile( filename, TQString::null, ".backup" );
+ KSaveFile::backupFile( filename, TQString(), ".backup" );
TQFile file( filename );
if ( !file.open( IO_WriteOnly ) ) {
diff --git a/kode/printer.h b/kode/printer.h
index ec50bec01..65cbddaa8 100644
--- a/kode/printer.h
+++ b/kode/printer.h
@@ -49,7 +49,7 @@ class KDE_EXPORT Printer
void printAutoMakefile( const AutoMakefile & );
TQString functionSignature( const Function &f,
- const TQString &className = TQString::null,
+ const TQString &className = TQString(),
bool includeClassQualifier = false );
protected: