summaryrefslogtreecommitdiffstats
path: root/dcopjava/dcopidl2java
diff options
context:
space:
mode:
Diffstat (limited to 'dcopjava/dcopidl2java')
-rw-r--r--dcopjava/dcopidl2java/main.cpp14
-rw-r--r--dcopjava/dcopidl2java/main.h4
-rw-r--r--dcopjava/dcopidl2java/skel.cpp96
-rw-r--r--dcopjava/dcopidl2java/stubimpl.cpp68
4 files changed, 91 insertions, 91 deletions
diff --git a/dcopjava/dcopidl2java/main.cpp b/dcopjava/dcopidl2java/main.cpp
index 913b7e7a..97ba153d 100644
--- a/dcopjava/dcopidl2java/main.cpp
+++ b/dcopjava/dcopidl2java/main.cpp
@@ -48,7 +48,7 @@ int main( int argc, char** argv )
int argpos = 1;
bool generate_skel = TRUE;
bool generate_stub = TRUE;
- TQString package;
+ TTQString package;
while (argc > 2) {
@@ -67,7 +67,7 @@ int main( int argc, char** argv )
else if ( strcmp( argv[argpos], "--package" ) == 0 )
{
if (argpos + 1 < argc)
- package = TQString(argv[argpos+1]);
+ package = TTQString(argv[argpos+1]);
for (int i = argpos; i < argc - 2; i++) argv[i] = argv[i+2];
argc -= 2;
@@ -78,18 +78,18 @@ int main( int argc, char** argv )
}
}
- TQFile in( argv[argpos] );
+ TTQFile in( argv[argpos] );
if ( !in.open( IO_ReadOnly ) )
qFatal("Could not read %s", argv[argpos] );
- TQDomDocument doc;
+ TTQDomDocument doc;
doc.setContent( &in );
- TQDomElement de = doc.documentElement();
+ TTQDomElement de = doc.documentElement();
ASSERT( de.tagName() == "DCOP-IDL" );
- TQString base( argv[argpos] );
- TQString idl = base;
+ TTQString base( argv[argpos] );
+ TTQString idl = base;
int pos = base.findRev( '.' );
if ( pos != -1 )
diff --git a/dcopjava/dcopidl2java/main.h b/dcopjava/dcopidl2java/main.h
index d3f19c0c..ed0c0ec7 100644
--- a/dcopjava/dcopidl2java/main.h
+++ b/dcopjava/dcopidl2java/main.h
@@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/**
* Writes the skeleton
*/
-void generateSkel( const TQString& idl, const TQString& filename, TQDomElement de );
+void generateSkel( const TTQString& idl, const TTQString& filename, TTQDomElement de );
/**
* Writes the stub implementation
*/
-void generateStubImpl( const TQString& idl, const TQString& package, const TQString& filename, TQDomElement de );
+void generateStubImpl( const TTQString& idl, const TTQString& package, const TTQString& filename, TTQDomElement de );
diff --git a/dcopjava/dcopidl2java/skel.cpp b/dcopjava/dcopidl2java/skel.cpp
index 68f1b46b..8856ea32 100644
--- a/dcopjava/dcopidl2java/skel.cpp
+++ b/dcopjava/dcopidl2java/skel.cpp
@@ -52,23 +52,23 @@ static int const primes[] =
struct Function
{
Function(){};
- Function( const TQString& t, const TQString& n, const TQString&fn ) : type( t ), name( n ), fullName( fn ){}
- TQString type;
- TQString name;
- TQString fullName;
+ Function( const TTQString& t, const TTQString& n, const TTQString&fn ) : type( t ), name( n ), fullName( fn ){}
+ TTQString type;
+ TTQString name;
+ TTQString fullName;
};
/**
* Writes the skeleton
*/
-void generateSkel( const TQString& idl, const TQString& filename, TQDomElement de )
+void generateSkel( const TTQString& idl, const TTQString& filename, TTQDomElement de )
{
- TQFile skel( filename );
+ TTQFile skel( filename );
if ( !skel.open( IO_WriteOnly ) )
qFatal("Could not write to %s", filename.latin1() );
- TQTextStream str( &skel );
+ TTQTextStream str( &skel );
str << "/****************************************************************************" << endl;
str << "**" << endl;
@@ -79,41 +79,41 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << "*****************************************************************************/" << endl;
str << endl;
- TQDomElement e = de.firstChild().toElement();
+ TTQDomElement e = de.firstChild().toElement();
if ( e.tagName() == "SOURCE" ) {
str << "#include \"" << e.firstChild().toText().data() << "\"" << endl << endl;
}
for( ; !e.isNull(); e = e.nextSibling().toElement() ) {
if ( e.tagName() == "CLASS" ) {
- TQDomElement n = e.firstChild().toElement();
+ TTQDomElement n = e.firstChild().toElement();
ASSERT( n.tagName() == "NAME" );
- TQString className = n.firstChild().toText().data();
+ TTQString className = n.firstChild().toText().data();
// find dcop parent ( rightmost super class )
- TQString DCOPParent;
- TQDomElement s = n.nextSibling().toElement();
+ TTQString DCOPParent;
+ TTQDomElement s = n.nextSibling().toElement();
for( ; !s.isNull(); s = s.nextSibling().toElement() ) {
if ( s.tagName() == "SUPER" )
DCOPParent = s.firstChild().toText().data();
}
// get function table
- TQValueList<Function> functions;
+ TTQValueList<Function> functions;
s = n.nextSibling().toElement();
for( ; !s.isNull(); s = s.nextSibling().toElement() ) {
if ( s.tagName() == "FUNC" ) {
- TQDomElement r = s.firstChild().toElement();
+ TTQDomElement r = s.firstChild().toElement();
ASSERT( r.tagName() == "TYPE" );
- TQString funcType = r.firstChild().toText().data();
+ TTQString funcType = r.firstChild().toText().data();
r = r.nextSibling().toElement();
ASSERT ( r.tagName() == "NAME" );
- TQString funcName = r.firstChild().toText().data();
- TQStringList argtypes;
- TQStringList argnames;
+ TTQString funcName = r.firstChild().toText().data();
+ TTQStringList argtypes;
+ TTQStringList argnames;
r = r.nextSibling().toElement();
for( ; !r.isNull(); r = r.nextSibling().toElement() ) {
ASSERT( r.tagName() == "ARG" );
- TQDomElement a = r.firstChild().toElement();
+ TTQDomElement a = r.firstChild().toElement();
ASSERT( a.tagName() == "TYPE" );
argtypes.append( a.firstChild().toText().data() );
a = a.nextSibling().toElement();
@@ -121,14 +121,14 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
ASSERT( a.tagName() == "NAME" );
argnames.append( a.firstChild().toText().data() );
} else {
- argnames.append( TQString::null );
+ argnames.append( TTQString::null );
}
}
funcName += '(';
- TQString fullFuncName = funcName;
+ TTQString fullFuncName = funcName;
bool first = TRUE;
- TQStringList::Iterator ittype = argtypes.begin();
- TQStringList::Iterator itname = argnames.begin();
+ TTQStringList::Iterator ittype = argtypes.begin();
+ TTQStringList::Iterator itname = argnames.begin();
while ( ittype != argtypes.end() && itname != argnames.end() ) {
if ( !first ) {
funcName += ',';
@@ -168,7 +168,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << "static const int " << className << "_fhash = " << fhash << ";" << endl;
}
str << "static const char* const " << className << "_ftable[" << functions.count() + 1 << "][3] = {" << endl;
- for( TQValueList<Function>::Iterator it = functions.begin(); it != functions.end(); ++it ){
+ for( TTQValueList<Function>::Iterator it = functions.begin(); it != functions.end(); ++it ){
str << " { \"" << (*it).type << "\", \"" << (*it).name << "\", \"" << (*it).fullName << "\" }," << endl;
}
str << " { 0, 0, 0 }" << endl;
@@ -179,13 +179,13 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
// Write dispatcher
str << "bool " << className;
- str << "::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData)" << endl;
+ str << "::process(const TTQCString &fun, const TTQByteArray &data, TTQCString& replyType, TTQByteArray &replyData)" << endl;
str << "{" << endl;
if ( useHashing ) {
- str << " static TQAsciiDict<int>* fdict = 0;" << endl;
+ str << " static TTQAsciiDict<int>* fdict = 0;" << endl;
str << " if ( !fdict ) {" << endl;
- str << "\tfdict = new TQAsciiDict<int>( " << className << "_fhash, TRUE, FALSE );" << endl;
+ str << "\tfdict = new TTQAsciiDict<int>( " << className << "_fhash, TRUE, FALSE );" << endl;
str << "\tfor ( int i = 0; " << className << "_ftable[i][1]; i++ )" << endl;
str << "\t fdict->insert( " << className << "_ftable[i][1], new int( i ) );" << endl;
str << " }" << endl;
@@ -198,28 +198,28 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
bool firstFunc = TRUE;
for( ; !s.isNull(); s = s.nextSibling().toElement() ) {
if ( s.tagName() == "FUNC" ) {
- TQDomElement r = s.firstChild().toElement();
+ TTQDomElement r = s.firstChild().toElement();
ASSERT( r.tagName() == "TYPE" );
- TQString funcType = r.firstChild().toText().data();
+ TTQString funcType = r.firstChild().toText().data();
if ( funcType == "ASYNC" )
funcType = "void";
r = r.nextSibling().toElement();
ASSERT ( r.tagName() == "NAME" );
- TQString funcName = r.firstChild().toText().data();
- TQStringList args;
- TQStringList argtypes;
+ TTQString funcName = r.firstChild().toText().data();
+ TTQStringList args;
+ TTQStringList argtypes;
r = r.nextSibling().toElement();
for( ; !r.isNull(); r = r.nextSibling().toElement() ) {
ASSERT( r.tagName() == "ARG" );
- TQDomElement a = r.firstChild().toElement();
+ TTQDomElement a = r.firstChild().toElement();
ASSERT( a.tagName() == "TYPE" );
argtypes.append( a.firstChild().toText().data() );
- args.append( TQString("arg" ) + TQString::number( args.count() ) );
+ args.append( TTQString("arg" ) + TTQString::number( args.count() ) );
}
- TQString plainFuncName = funcName;
+ TTQString plainFuncName = funcName;
funcName += '(';
bool first = TRUE;
- for( TQStringList::Iterator argtypes_count = argtypes.begin(); argtypes_count != argtypes.end(); ++argtypes_count ){
+ for( TTQStringList::Iterator argtypes_count = argtypes.begin(); argtypes_count != argtypes.end(); ++argtypes_count ){
if ( !first )
funcName += ',';
first = FALSE;
@@ -237,13 +237,13 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
firstFunc = FALSE;
}
if ( !args.isEmpty() ) {
- TQStringList::Iterator ittypes = argtypes.begin();
- TQStringList::Iterator args_count;
+ TTQStringList::Iterator ittypes = argtypes.begin();
+ TTQStringList::Iterator args_count;
for( args_count = args.begin(); args_count != args.end(); ++args_count ){
str << '\t'<< *ittypes << " " << *args_count << ";" << endl;
++ittypes;
}
- str << "\tQDataStream arg( data, IO_ReadOnly );" << endl;
+ str << "\tTQDataStream arg( data, IO_ReadOnly );" << endl;
for( args_count = args.begin(); args_count != args.end(); ++args_count ){
str << "\targ >> " << *args_count << ";" << endl;
}
@@ -253,12 +253,12 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
if ( funcType == "void" ) {
str << '\t' << plainFuncName << '(';
} else {
- str << "\tQDataStream _replyStream( replyData, IO_WriteOnly );" << endl;
+ str << "\tTQDataStream _replyStream( replyData, IO_WriteOnly );" << endl;
str << "\t_replyStream << " << plainFuncName << '(';
}
first = TRUE;
- for ( TQStringList::Iterator args_count = args.begin(); args_count != args.end(); ++args_count ){
+ for ( TTQStringList::Iterator args_count = args.begin(); args_count != args.end(); ++args_count ){
if ( !first )
str << ", ";
first = FALSE;
@@ -286,29 +286,29 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << " return TRUE;" << endl;
str << "}" << endl << endl;
- str << "QCStringList " << className;
+ str << "TQCStringList " << className;
str << "::interfaces()" << endl;
str << "{" << endl;
if (!DCOPParent.isEmpty()) {
- str << " QCStringList ifaces = " << DCOPParent << "::interfaces();" << endl;
+ str << " TQCStringList ifaces = " << DCOPParent << "::interfaces();" << endl;
} else {
- str << " QCStringList ifaces;" << endl;
+ str << " TQCStringList ifaces;" << endl;
}
str << " ifaces += \"" << className << "\";" << endl;
str << " return ifaces;" << endl;
str << "}" << endl << endl;
- str << "QCStringList " << className;
+ str << "TQCStringList " << className;
str << "::functions()" << endl;
str << "{" << endl;
if (!DCOPParent.isEmpty()) {
- str << " QCStringList funcs = " << DCOPParent << "::functions();" << endl;
+ str << " TQCStringList funcs = " << DCOPParent << "::functions();" << endl;
} else {
- str << " QCStringList funcs;" << endl;
+ str << " TQCStringList funcs;" << endl;
}
str << " for ( int i = 0; " << className << "_ftable[i][2]; i++ ) {" << endl;
- str << "\tQCString func = " << className << "_ftable[i][0];" << endl;
+ str << "\tTQCString func = " << className << "_ftable[i][0];" << endl;
str << "\tfunc += ' ';" << endl;
str << "\tfunc += " << className << "_ftable[i][2];" << endl;
str << "\tfuncs << func;" << endl;
diff --git a/dcopjava/dcopidl2java/stubimpl.cpp b/dcopjava/dcopidl2java/stubimpl.cpp
index 55e474c9..dbb84a93 100644
--- a/dcopjava/dcopidl2java/stubimpl.cpp
+++ b/dcopjava/dcopidl2java/stubimpl.cpp
@@ -33,15 +33,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main.h"
-TQString javaType(TQString type)
+TTQString javaType(TTQString type)
{
if (type == "bool")
return "boolean";
- if (type == "TQString")
+ if (type == "TTQString")
return "String";
- if (type == "TQCString")
+ if (type == "TTQCString")
return "String";
- if (type == "TQStringList")
+ if (type == "TTQStringList")
return "String[]";
if (type == "short int")
return "short";
@@ -52,50 +52,50 @@ TQString javaType(TQString type)
}
-TQString javaRightAttribute(TQString attr)
+TTQString javaRightAttribute(TTQString attr)
{
if (attr == "&")
- return TQString::null;
+ return TTQString::null;
return "!!!NOT IMPLEMENTED: " + attr;
}
-TQString javaLeftAttribute(TQString attr)
+TTQString javaLeftAttribute(TTQString attr)
{
if (attr == "const")
- return TQString::null;
+ return TTQString::null;
return "!!!NOT IMPLEMENTED: " + attr;
}
-TQString javaQualifier(TQString qual)
+TTQString javaQualifier(TTQString qual)
{
if (qual == "const")
- return TQString::null;
+ return TTQString::null;
return "!!!NOT IMPLEMENTED: " + qual;
}
-TQString underscore(TQString in)
+TTQString underscore(TTQString in)
{
- return in.replace(TQRegExp(" "), "_");
+ return in.replace(TTQRegExp(" "), "_");
}
-TQString defValue(TQString type)
+TTQString defValue(TTQString type)
{
if (type == "bool")
return "false";
- if (type == "TQString")
+ if (type == "TTQString")
return "null";
- if (type == "TQStringList")
+ if (type == "TTQStringList")
return "null";
if (type == "DCOPRef")
return "null";
- if (type == "TQCString")
+ if (type == "TTQCString")
return "null";
return "0";
@@ -105,13 +105,13 @@ TQString defValue(TQString type)
/**
* Writes the stub implementation
*/
-void generateStubImpl( const TQString& idl, const TQString& package, const TQString& filename, TQDomElement de )
+void generateStubImpl( const TTQString& idl, const TTQString& package, const TTQString& filename, TTQDomElement de )
{
- TQFile impl( filename );
+ TTQFile impl( filename );
if ( !impl.open( IO_WriteOnly ) )
qFatal("Could not write to %s", filename.latin1() );
- TQTextStream str( &impl );
+ TTQTextStream str( &impl );
str << "/****************************************************************************" << endl;
str << "**" << endl;
@@ -129,16 +129,16 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
str << "import org.kde.DCOP.*;" << endl;
str << endl << endl;
- TQDomElement e = de.firstChild().toElement();
+ TTQDomElement e = de.firstChild().toElement();
for( ; !e.isNull(); e = e.nextSibling().toElement() ) {
if ( e.tagName() == "CLASS" ) {
- TQDomElement n = e.firstChild().toElement();
+ TTQDomElement n = e.firstChild().toElement();
ASSERT( n.tagName() == "NAME" );
- TQString className = n.firstChild().toText().data() + "_stub";
+ TTQString className = n.firstChild().toText().data() + "_stub";
// find dcop parent ( rightmost super class )
- TQString DCOPParent;
- TQDomElement s = n.nextSibling().toElement();
+ TTQString DCOPParent;
+ TTQDomElement s = n.nextSibling().toElement();
for( ; !s.isNull(); s = s.nextSibling().toElement() ) {
if ( s.tagName() == "SUPER" )
DCOPParent = s.firstChild().toText().data();
@@ -163,9 +163,9 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
s = e.firstChild().toElement();
for( ; !s.isNull(); s = s.nextSibling().toElement() ) {
if ( s.tagName() == "FUNC" ) {
- TQDomElement r = s.firstChild().toElement();
+ TTQDomElement r = s.firstChild().toElement();
ASSERT( r.tagName() == "TYPE" );
- TQString result = r.firstChild().toText().data();
+ TTQString result = r.firstChild().toText().data();
str << " public ";
bool async = result == "ASYNC";
if ( async)
@@ -180,11 +180,11 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
r = r.nextSibling().toElement();
ASSERT ( r.tagName() == "NAME" );
- TQString funcName = r.firstChild().toText().data();
+ TTQString funcName = r.firstChild().toText().data();
str << funcName << "(";
- TQStringList args;
- TQStringList argtypes;
+ TTQStringList args;
+ TTQStringList argtypes;
bool first = TRUE;
r = r.nextSibling().toElement();
for( ; !r.isNull(); r = r.nextSibling().toElement() ) {
@@ -192,7 +192,7 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
str << ", ";
first = FALSE;
ASSERT( r.tagName() == "ARG" );
- TQDomElement a = r.firstChild().toElement();
+ TTQDomElement a = r.firstChild().toElement();
ASSERT( a.tagName() == "TYPE" );
if ( a.hasAttribute( "qleft" ) )
str << javaLeftAttribute(a.attribute("qleft")) << " ";
@@ -202,7 +202,7 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
str << javaRightAttribute(a.attribute("qright")) << " ";
else
str << " ";
- args.append(TQString("arg") + TQString::number(args.count())) ;
+ args.append(TTQString("arg") + TTQString::number(args.count())) ;
str << args.last();
}
str << ")";
@@ -215,7 +215,7 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
funcName += "(";
first = TRUE;
- for( TQStringList::Iterator it = argtypes.begin(); it != argtypes.end(); ++it ){
+ for( TTQStringList::Iterator it = argtypes.begin(); it != argtypes.end(); ++it ){
if ( !first )
funcName += ",";
first = FALSE;
@@ -230,7 +230,7 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
str << " try" << endl;
str << " {" << endl;
- TQStringList::Iterator itt, ita;
+ TTQStringList::Iterator itt, ita;
for (itt = argtypes.begin(), ita = args.begin(); itt != argtypes.end(); ++itt, ++ita)
str << " write_" << *itt << "(os, " << *ita << ");" << endl;
}
@@ -256,7 +256,7 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
str << " try" << endl;
str << " {" << endl;
- TQStringList::Iterator itt, ita;
+ TTQStringList::Iterator itt, ita;
for (itt = argtypes.begin(), ita = args.begin(); itt != argtypes.end(); ++itt, ++ita)
str << " write_" << underscore(*itt) << "(os, " << *ita << ");" << endl;