summaryrefslogtreecommitdiffstats
path: root/dcopjava/dcopidl2java
diff options
context:
space:
mode:
Diffstat (limited to 'dcopjava/dcopidl2java')
-rw-r--r--dcopjava/dcopidl2java/main.cpp8
-rw-r--r--dcopjava/dcopidl2java/skel.cpp22
-rw-r--r--dcopjava/dcopidl2java/stubimpl.cpp8
3 files changed, 19 insertions, 19 deletions
diff --git a/dcopjava/dcopidl2java/main.cpp b/dcopjava/dcopidl2java/main.cpp
index f8351e88..0a195f7b 100644
--- a/dcopjava/dcopidl2java/main.cpp
+++ b/dcopjava/dcopidl2java/main.cpp
@@ -46,21 +46,21 @@ int main( int argc, char** argv )
exit(1);
}
int argpos = 1;
- bool generate_skel = TRUE;
- bool generate_stub = TRUE;
+ bool generate_skel = true;
+ bool generate_stub = true;
TQString package;
while (argc > 2) {
if ( strcmp( argv[argpos], "--no-skel" ) == 0 )
{
- generate_skel = FALSE;
+ generate_skel = false;
for (int i = argpos; i < argc - 1; i++) argv[i] = argv[i+1];
argc--;
}
else if ( strcmp( argv[argpos], "--no-stub" ) == 0 )
{
- generate_stub = FALSE;
+ generate_stub = false;
for (int i = argpos; i < argc - 1; i++) argv[i] = argv[i+1];
argc--;
}
diff --git a/dcopjava/dcopidl2java/skel.cpp b/dcopjava/dcopidl2java/skel.cpp
index 2fe7b9b0..589fb333 100644
--- a/dcopjava/dcopidl2java/skel.cpp
+++ b/dcopjava/dcopidl2java/skel.cpp
@@ -126,7 +126,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
}
funcName += '(';
TQString fullFuncName = funcName;
- bool first = TRUE;
+ bool first = true;
TQStringList::Iterator ittype = argtypes.begin();
TQStringList::Iterator itname = argnames.begin();
while ( ittype != argtypes.end() && itname != argnames.end() ) {
@@ -134,7 +134,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
funcName += ',';
fullFuncName += ',';
}
- first = FALSE;
+ first = false;
funcName += *ittype;
fullFuncName += *ittype;
if ( ! (*itname).isEmpty() ) {
@@ -185,7 +185,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << " static TQAsciiDict<int>* fdict = 0;" << endl;
str << " if ( !fdict ) {" << endl;
- str << "\tfdict = new TQAsciiDict<int>( " << className << "_fhash, TRUE, FALSE );" << endl;
+ str << "\tfdict = new TQAsciiDict<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;
@@ -195,7 +195,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
}
s = n.nextSibling().toElement();
int fcount = 0;
- bool firstFunc = TRUE;
+ bool firstFunc = true;
for( ; !s.isNull(); s = s.nextSibling().toElement() ) {
if ( s.tagName() == "FUNC" ) {
TQDomElement r = s.firstChild().toElement();
@@ -218,11 +218,11 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
}
TQString plainFuncName = funcName;
funcName += '(';
- bool first = TRUE;
+ bool first = true;
for( TQStringList::Iterator argtypes_count = argtypes.begin(); argtypes_count != argtypes.end(); ++argtypes_count ){
if ( !first )
funcName += ',';
- first = FALSE;
+ first = false;
funcName += *argtypes_count;
}
funcName += ')';
@@ -234,7 +234,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << " if ( fun == " << className << "_ftable[" << fcount << "][1] ) { // " << funcType << " " << funcName << endl;
else
str << " else if ( fun == " << className << "_ftable[" << fcount << "][1] ) { // " << funcType << " " << funcName << endl;
- firstFunc = FALSE;
+ firstFunc = false;
}
if ( !args.isEmpty() ) {
TQStringList::Iterator ittypes = argtypes.begin();
@@ -257,11 +257,11 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << "\t_replyStream << " << plainFuncName << '(';
}
- first = TRUE;
+ first = true;
for ( TQStringList::Iterator args_count = args.begin(); args_count != args.end(); ++args_count ){
if ( !first )
str << ", ";
- first = FALSE;
+ first = false;
str << *args_count;
}
str << " );" << endl;
@@ -280,10 +280,10 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
if (!DCOPParent.isEmpty()) {
str << "\treturn " << DCOPParent << "::process( fun, data, replyType, replyData );" << endl;
} else {
- str << "\treturn FALSE;" << endl;
+ str << "\treturn false;" << endl;
}
str << " }" << endl;
- str << " return TRUE;" << endl;
+ str << " return true;" << endl;
str << "}" << endl << endl;
str << "QCStringList " << className;
diff --git a/dcopjava/dcopidl2java/stubimpl.cpp b/dcopjava/dcopidl2java/stubimpl.cpp
index 3909a394..2010e19d 100644
--- a/dcopjava/dcopidl2java/stubimpl.cpp
+++ b/dcopjava/dcopidl2java/stubimpl.cpp
@@ -185,12 +185,12 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
TQStringList args;
TQStringList argtypes;
- bool first = TRUE;
+ bool first = true;
r = r.nextSibling().toElement();
for( ; !r.isNull(); r = r.nextSibling().toElement() ) {
if ( !first )
str << ", ";
- first = FALSE;
+ first = false;
ASSERT( r.tagName() == "ARG" );
TQDomElement a = r.firstChild().toElement();
ASSERT( a.tagName() == "TYPE" );
@@ -214,11 +214,11 @@ void generateStubImpl( const TQString& idl, const TQString& package, const TQStr
str << " {" << endl ;
funcName += "(";
- first = TRUE;
+ first = true;
for( TQStringList::Iterator it = argtypes.begin(); it != argtypes.end(); ++it ){
if ( !first )
funcName += ",";
- first = FALSE;
+ first = false;
funcName += *it;
}
funcName += ")";