Replace TRUE/FALSE with boolean values true/falser14.1.4r14.1.x

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit f3c7a90bfa0646afefeaa7af84edf625cdadf78d)

10 files changed, 92 insertions, 92 deletions

diff --git a/PerlTQt/handlers.cpp b/PerlTQt/handlers.cpp
index 280336a..cae7d6b 100644
--- a/PerlTQt/handlers.cpp
+++ b/PerlTQt/handlers.cpp
@@ -1202,13 +1202,13 @@ static void marshall_ ## FNAME (Marshall *m) {
     }                                                                                     \
 }
 
-MARSHALL_TQPTRLIST( TQPtrListTQNetworkOperation, TQPtrList<TQNetworkOperation>, TQNetworkOperation, " TQt::NetworkOperation", FALSE )
-MARSHALL_TQPTRLIST( TQPtrListTQToolBar, TQPtrList<TQToolBar>, TQToolBar, " TQt::ToolBar", FALSE )
-MARSHALL_TQPTRLIST( TQPtrListTQTab, TQPtrList<TQTab>, TQTab, " TQt::Tab", FALSE )
-MARSHALL_TQPTRLIST( TQPtrListTQDockWindow, TQPtrList<TQDockWindow>, TQDockWindow, " TQt::DockWindow", FALSE )
-MARSHALL_TQPTRLIST( TQWidgetList, TQWidgetList, TQWidget, " TQt::Widget", FALSE )
-MARSHALL_TQPTRLIST( TQObjectList, TQObjectList, TQObject, " TQt::Object", FALSE )
-MARSHALL_TQPTRLIST( TQFileInfoList, TQFileInfoList, TQFileInfo, " TQt::FileInfo", FALSE )
+MARSHALL_TQPTRLIST( TQPtrListTQNetworkOperation, TQPtrList<TQNetworkOperation>, TQNetworkOperation, " TQt::NetworkOperation", false )
+MARSHALL_TQPTRLIST( TQPtrListTQToolBar, TQPtrList<TQToolBar>, TQToolBar, " TQt::ToolBar", false )
+MARSHALL_TQPTRLIST( TQPtrListTQTab, TQPtrList<TQTab>, TQTab, " TQt::Tab", false )
+MARSHALL_TQPTRLIST( TQPtrListTQDockWindow, TQPtrList<TQDockWindow>, TQDockWindow, " TQt::DockWindow", false )
+MARSHALL_TQPTRLIST( TQWidgetList, TQWidgetList, TQWidget, " TQt::Widget", false )
+MARSHALL_TQPTRLIST( TQObjectList, TQObjectList, TQObject, " TQt::Object", false )
+MARSHALL_TQPTRLIST( TQFileInfoList, TQFileInfoList, TQFileInfo, " TQt::FileInfo", false )
 
 void marshall_TQCanvasItemList(Marshall *m) {
    switch(m->action()) {
@@ -1233,7 +1233,7 @@ void marshall_TQCanvasItemList(Marshall *m) {
                 it != cilist->end();
                 ++it){
                 TQCanvasItem* t= *it;
-                GET_PERL_OBJECT( TQCanvasItem, " TQt::CanvasItem", FALSE )
+                GET_PERL_OBJECT( TQCanvasItem, " TQt::CanvasItem", false )
                 av_push(av, ret);
             }
             if(m->cleanup())
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 9deaca3..4370f16 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -1326,7 +1326,7 @@ JNIEXPORT jobject JNICALL
 Java_org_trinitydesktop_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)
 {
 	TQPoint _p= ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->at((uint) index);
-	return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.trinitydesktop.qt.TQPoint", TRUE);
+	return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.trinitydesktop.qt.TQPoint", true);
 }
 	
 EOF
@@ -2304,7 +2304,7 @@ sub jniToReturnValue($$$)
 		} elsif ($cplusplusType =~ /\&/) {
 			$returnCall .= "($className *) &$functionCall, \"$fullyQualifiedReturnType\");\n";
 		} else {
-			$returnCall .= "new $className($functionCall), \"$fullyQualifiedReturnType\", TRUE);\n";
+			$returnCall .= "new $className($functionCall), \"$fullyQualifiedReturnType\", true);\n";
 		}
 		$returnCall .= "$jniCleanups\treturn xret;\n";
 	} elsif ( $javaType =~ /^char\s*/ ) {
@@ -4257,7 +4257,7 @@ sub generateAllMethods($$$$$$$$)
 				if ($main::qt_embedded) {
 					$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n";
 				} else {
-					$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(FALSE) == 0) {\n";
+					$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(false) == 0) {\n";
 				}
 			} elsif ( is_kindof($classNode, 'TQListViewItem') ) {
 				$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n";
@@ -4271,7 +4271,7 @@ sub generateAllMethods($$$$$$$$)
 				if ($main::qt_embedded) {
 					$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n";
 				} else {
-					$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(TRUE) == 0) {\n";
+					$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(true) == 0) {\n";
 				}
 			} elsif ( $classNode->{astNodeName} =~ /^TQObject$/  || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parent" ) ) {
 				$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && (($className*)QtSupport::getQt(env, obj))->parent() == 0) {\n";
@@ -4372,7 +4372,7 @@ sub virtualMethodCallbacks
 				$jbridgeCode .= "\t\tif (!QtSupport::eventFilterDelegate(this,\"$qobjectType\",object,event)) {\n";
 				$jbridgeCode .= "\t\t\treturn " . $parent->{astNodeName} . "::eventFilter(object,event);\n";
 				$jbridgeCode .= "\t\t} else {\n";
-				$jbridgeCode .= "\t\t\treturn TRUE;\n";
+				$jbridgeCode .= "\t\t\treturn true;\n";
 				$jbridgeCode .= "\t\t}\n\t}\n";
 			} elsif( $name =~ /^fixup$/ and $node->{astNodeName} eq 'TQValidator' ) {
 				$jbridgeCode .= "\tTQValidator::State validate(TQString& input,int& pos) const\n";
diff --git a/puic/domtool.cpp b/puic/domtool.cpp
index 6c2809f..6bee7a5 100644
--- a/puic/domtool.cpp
+++ b/puic/domtool.cpp
@@ -86,10 +86,10 @@ bool DomTool::hasProperty( const TQDomElement& e, const TQString& name )
 	if ( n.tagName() == "property" ) {
 	    if ( n.attribute( "name" ) != name )
 		continue;
-	    return TRUE;
+	    return true;
 	}
     }
-    return FALSE;
+    return false;
 }
 
 TQStringList DomTool::propertiesOfType( const TQDomElement& e, const TQString& type )
@@ -186,7 +186,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
     } else if ( e.tagName() == "cstring" ) {
 	v = TQVariant( TQCString( e.firstChild().toText().data() ) );
     } else if ( e.tagName() == "number" ) {
-	bool ok = TRUE;
+	bool ok = true;
 	v = TQVariant( e.firstChild().toText().data().toInt( &ok ) );
 	if ( !ok )
 	    v = TQVariant( e.firstChild().toText().data().toDouble() );
@@ -340,10 +340,10 @@ bool DomTool::hasAttribute( const TQDomElement& e, const TQString& name )
 	if ( n.tagName() == "attribute" ) {
 	    if ( n.attribute( "name" ) != name )
 		continue;
-	    return TRUE;
+	    return true;
 	}
     }
-    return FALSE;
+    return false;
 }
 
 static bool toBool( const TQString& s )
diff --git a/puic/form.cpp b/puic/form.cpp
index 473eda3..03989a7 100644
--- a/puic/form.cpp
+++ b/puic/form.cpp
@@ -141,9 +141,9 @@ TQCString combinePath( const char *infile, const char *outfile )
     int numCommonComponents = 0;
 
     TQStringList inSplitted =
-	TQStringList::split( '/', inFileInfo.dir().canonicalPath(), TRUE );
+	TQStringList::split( '/', inFileInfo.dir().canonicalPath(), true );
     TQStringList outSplitted =
-	TQStringList::split( '/', outFileInfo.dir().canonicalPath(), TRUE );
+	TQStringList::split( '/', outFileInfo.dir().canonicalPath(), true );
 
     while ( !inSplitted.isEmpty() && !outSplitted.isEmpty() &&
 	    inSplitted.first() == outSplitted.first() ) {
@@ -575,14 +575,14 @@ void Uic::createFormImpl( const TQDomElement &e )
 	sqlClasses += "TQt::SqlDatabase";
     if ( dbCursors.count() )
 	sqlClasses += "TQt::SqlCursor";
-    bool dbForm = FALSE;
+    bool dbForm = false;
     if ( dbForms[ "(default)" ].count() )
-	dbForm = TRUE;
-    bool subDbForms = FALSE;
+	dbForm = true;
+    bool subDbForms = false;
     for ( it = dbConnections.begin(); it != dbConnections.end(); ++it ) {
 	if ( !(*it).isEmpty()  && (*it) != "(default)" ) {
 	    if ( dbForms[ (*it) ].count() ) {
-		subDbForms = TRUE;
+		subDbForms = true;
 		break;
 	    }
 	}
@@ -705,7 +705,7 @@ void Uic::createFormImpl( const TQDomElement &e )
     } else if ( objClass == "TQt::MainWindow" ) {
 	out << indent << "shift->SUPER::NEW(@_[0..2]);" << endl;
 	out << indent << "statusBar();" << endl;
-	isMainWindow = TRUE;
+	isMainWindow = true;
     } else {
 	out << indent << "shift->SUPER::NEW(@_[0,1]);" << endl;
     }
@@ -791,7 +791,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 		TQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
 		out << indent << "addPage( " << page << ", \"\" );" << endl;
 		trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " );" << endl;
-		TQVariant def( FALSE );
+		TQVariant def( false );
 		if ( DomTool::hasAttribute( n, "backEnabled" ) )
 		    out << indent << "setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ");" << endl;
 		if ( DomTool::hasAttribute( n, "nextEnabled" ) )
@@ -841,35 +841,35 @@ void Uic::createFormImpl( const TQDomElement &e )
     }
 
     // actions, toolbars, menubar
-    bool needEndl = FALSE;
+    bool needEndl = false;
     for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) {
 	if ( n.tagName()  == "actions" ) {
 	    if ( !needEndl )
 		out << endl;
 	    createActionImpl( n.firstChild().toElement(), "this" );
-	    needEndl = TRUE;
+	    needEndl = true;
 	}
     }
     if ( needEndl )
 	out << endl;
-    needEndl = FALSE;
+    needEndl = false;
     for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) {
 	if ( n.tagName() == "toolbars" ) {
 	    if ( !needEndl )
 		out << endl;
 	    createToolbarImpl( n, objClass, objName );
-	    needEndl = TRUE;
+	    needEndl = true;
 	}
     }
     if ( needEndl )
 	out << endl;
-    needEndl = FALSE;
+    needEndl = false;
     for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) {
 	if ( n.tagName() == "menubar" ) {
 	    if ( !needEndl )
 		out << endl;
 	    createMenuBarImpl( n, objClass, objName );
-	    needEndl = TRUE;
+	    needEndl = true;
 	}
     }
     if ( needEndl )
@@ -943,14 +943,14 @@ void Uic::createFormImpl( const TQDomElement &e )
     }
 
     // buddies
-    bool firstBuddy = TRUE;
+    bool firstBuddy = true;
     for ( TQValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) {
 	if ( isObjectRegistered( (*buddy).buddy ) ) {
 	    if ( firstBuddy ) {
 		out << endl;
 	    }
 	    out << indent << (*buddy).key << "->setBuddy(this->" << registeredName( (*buddy).buddy ) << ");" << endl;
-	    firstBuddy = FALSE;
+	    firstBuddy = false;
 	}
 
     }
@@ -977,21 +977,21 @@ void Uic::createFormImpl( const TQDomElement &e )
 
 
     // handle application events if required
-    bool needFontEventHandler = FALSE;
-    bool needSqlTableEventHandler = FALSE;
-    bool needSqlDataBrowserEventHandler = FALSE;
+    bool needFontEventHandler = false;
+    bool needSqlTableEventHandler = false;
+    bool needSqlDataBrowserEventHandler = false;
     nl = e.elementsByTagName( "widget" );
     for ( i = 0; i < (int) nl.length(); i++ ) {
 	if ( !DomTool::propertiesOfType( nl.item(i).toElement() , "font" ).isEmpty() )
-	    needFontEventHandler = TRUE;
+	    needFontEventHandler = true;
 	TQString s = getClassName( nl.item(i).toElement() );
 	if ( s == "TQt::DataTable" || s == "TQt::DataBrowser" ) {
 	    if ( !isFrameworkCodeGenerated( nl.item(i).toElement() ) )
 		 continue;
 	    if ( s == "TQt::DataTable" )
-		needSqlTableEventHandler = TRUE;
+		needSqlTableEventHandler = true;
 	    if ( s == "TQt::DataBrowser" )
-		needSqlDataBrowserEventHandler = TRUE;
+		needSqlDataBrowserEventHandler = true;
 	}
 	if ( needFontEventHandler && needSqlTableEventHandler && needSqlDataBrowserEventHandler )
 	    break;
@@ -1139,7 +1139,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	    int astart = (*it).find('(');
 	    out << indent << "sub " << (*it).left(astart)<< endl;
 	    out << indent << "{" << endl;
-	    bool createWarning = TRUE;
+	    bool createWarning = true;
 	    TQString fname = Parser::cleanArgs( *it );
 	    TQMap<TQString, TQString>::Iterator fit = functionImpls.find( fname );
 	    if ( fit != functionImpls.end() ) {
diff --git a/puic/main.cpp b/puic/main.cpp
index d6411ee..bb36782 100644
--- a/puic/main.cpp
+++ b/puic/main.cpp
@@ -46,10 +46,10 @@ void getDBConnections( Uic& uic, TQString& s);
 int main( int argc, char * argv[] )
 {
     PyIndent indent;
-    bool execCode = FALSE;
-    bool subcl = FALSE;
-    bool imagecollection = FALSE;
-    bool imagecollection_tmpfile = FALSE;
+    bool execCode = false;
+    bool subcl = false;
+    bool imagecollection = false;
+    bool imagecollection_tmpfile = false;
     TQStringList images;
     const char *error = 0;
     const char* fileName = 0;
@@ -58,9 +58,9 @@ int main( int argc, char * argv[] )
     TQCString image_tmpfile;
     const char* projectName = 0;
     const char* trmacro = 0;
-    bool nofwd = FALSE;
-    bool fix = FALSE;
-    TQApplication app(argc, argv, FALSE);
+    bool nofwd = false;
+    bool fix = false;
+    TQApplication app(argc, argv, false);
     TQString uicClass;
 
 
@@ -78,7 +78,7 @@ int main( int argc, char * argv[] )
 		} else
 		    outputFile = &opt[1];
 	    } else if ( opt[0] == 'e' || opt == "embed" ) {
-		imagecollection = TRUE;
+		imagecollection = true;
 		if ( opt == "embed" || opt[1] == '\0' ) {
 		    if ( !(n < argc-2) ) {
 			error = "Missing arguments.";
@@ -89,14 +89,14 @@ int main( int argc, char * argv[] )
 		    projectName = &opt[1];
 		}
 		if ( argc > n+1 && qstrcmp( argv[n+1], "-f" ) == 0 ) {
-		    imagecollection_tmpfile = TRUE;
+		    imagecollection_tmpfile = true;
 		    image_tmpfile = argv[n+2];
 		    n += 2;
 		}
 	    } else if ( opt == "nofwd" ) {
-		nofwd = TRUE;
+		nofwd = true;
 	    } else if ( opt == "subimpl" ) {
-		subcl = TRUE;
+		subcl = true;
 		if ( !(n < argc-2) ) {
 		    error = "Missing arguments.";
 		    break;
@@ -120,7 +120,7 @@ int main( int argc, char * argv[] )
 	    } else if ( opt == "help" ) {
 		break;
 	    } else if ( opt == "fix" ) {
-		fix = TRUE;
+		fix = true;
 	    } else if ( opt[0] == 'p' ) {
 		uint tabstop;
 		bool ok;
@@ -139,7 +139,7 @@ int main( int argc, char * argv[] )
 		else
 		    error = "Invalid indent";
 	    } else if ( opt == "x" ) {
-		execCode = TRUE;
+		execCode = true;
 	    } else {
 		error = TQString( "Unrecognized option " + opt ).latin1();
 	    }
diff --git a/puic/object.cpp b/puic/object.cpp
index 21f532e..ef7dd39 100644
--- a/puic/object.cpp
+++ b/puic/object.cpp
@@ -97,7 +97,7 @@ void Uic::createAttrDecl( const TQDomElement& e )
   \sa createObjectDecl()
  */
 
-static bool createdCentralWidget = FALSE;
+static bool createdCentralWidget = false;
 
 TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& par, const TQString& layout )
 {
@@ -105,7 +105,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
     if ( parent == "this" && isMainWindow ) {
 	if ( !createdCentralWidget )
 	    out << indent << "setCentralWidget(TQt::Widget(this, \"qt_central_widget\"));" << endl;
-	createdCentralWidget = TRUE;
+	createdCentralWidget = true;
 	parent = "centralWidget()";
     }
     TQDomElement n;
@@ -172,7 +172,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 
     lastItem = "undef";
     // set the properties and insert items
-    bool hadFrameShadow = FALSE;
+    bool hadFrameShadow = false;
     for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
 	if ( n.tagName() == "property" ) {
 	    bool stdset = stdsetdef;
@@ -187,7 +187,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
 	    if ( prop == "name" )
 		continue;
 	    if ( isLine && prop == "frameShadow" )
-		hadFrameShadow = TRUE;
+		hadFrameShadow = true;
 	    if ( prop == "buddy" && value.startsWith("\"") && value.endsWith("\"") ) {
 		buddies << Buddy( objName, value.mid(1, value.length() - 2 ) );
 		continue;
diff --git a/puic/subclassing.cpp b/puic/subclassing.cpp
index 7f0e127..db3f8da 100644
--- a/puic/subclassing.cpp
+++ b/puic/subclassing.cpp
@@ -65,7 +65,7 @@ void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass )
     } else if ( objClass == "TQt::MainWindow" ) {
 	out << indent << "shift->SUPER::NEW(@_[0..2]);" << endl;
 	out << indent << "statusBar();" << endl;
-	isMainWindow = TRUE;
+	isMainWindow = true;
     } else {
 	out << indent << "shift->SUPER::NEW(@_[0,1]);" << endl;
     }
diff --git a/puic/uic.cpp b/puic/uic.cpp
index 67ec24b..09ecead 100644
--- a/puic/uic.cpp
+++ b/puic/uic.cpp
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-bool Uic::isMainWindow = FALSE;
+bool Uic::isMainWindow = false;
 PyIndent Uic::indent;
 
 
@@ -109,13 +109,13 @@ TQString Uic::trcall( const TQString& sourceText, const TQString& comment )
    if ( sourceText.isEmpty() && comment.isEmpty() )
 	return "\"\"";
    TQString t = trmacro;
-    bool encode = FALSE;
+    bool encode = false;
     if ( t.isNull() ) {
 	t = "tr";
 	for ( int i = 0; i < (int) sourceText.length(); i++ ) {
 	    if ( sourceText[i].unicode() >= 0x80 ) {
 		t = "trUtf8";
-		encode = TRUE;
+		encode = true;
 		break;
 	    }
 	}
@@ -144,7 +144,7 @@ Uic::Uic( const TQString &fn, const char *outputFn, TQTextStream &outStream,
       outputFileName( outputFn ), trmacro( trm ), nofwd( omitForwardDecls )
 {
     fileName = fn;
-    writeFunctImpl = TRUE;
+    writeFunctImpl = true;
     defMargin = BOXLAYOUT_DEFAULT_MARGIN;
     defSpacing = BOXLAYOUT_DEFAULT_SPACING;
     externPixmaps = FALSE;
@@ -259,16 +259,16 @@ TQString Uic::getClassName( const TQDomElement& e )
 
 
 
-/*! Returns TRUE if database framework code is generated, else FALSE.
+/*! Returns true if database framework code is generated, else false.
 */
 
 bool Uic::isFrameworkCodeGenerated( const TQDomElement& e )
 {
     TQDomElement n = getObjectProperty( e, "frameworkCode" );
     if ( n.attribute("name") == "frameworkCode" &&
-	 !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( TRUE ) ).toBool() )
-	return FALSE;
-    return TRUE;
+	 !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( true ) ).toBool() )
+	return false;
+    return true;
 }
 
 /*! Extracts an object name from \a e. It's stored in the 'name'
@@ -376,7 +376,7 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
 	    out << indent << objName << "= TQt::ActionGroup(" << parent << ", \"" << objName << "\");" << endl;
 	else
 	    continue;
-	bool subActionsDone = FALSE;
+	bool subActionsDone = false;
 	for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) {
 	    if ( n2.tagName() == "property" ) {
 		bool stdset = stdsetdef;
@@ -408,7 +408,7 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
 		}
 	    } else if ( !subActionsDone && ( n2.tagName() == "actiongroup" || n2.tagName() == "action" ) ) {
 		createActionImpl( n2, objName );
-		subActionsDone = TRUE;
+		subActionsDone = true;
 	    }
 	}
     }
@@ -669,7 +669,7 @@ TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &p
     TQString txt;
     TQString com;
     TQString pix;
-    bool clickable = FALSE, resizable = FALSE;
+    bool clickable = false, resizable = false;
     while ( !n.isNull() ) {
 	if ( n.tagName() == "property" ) {
 	    TQString attrib = n.attribute("name");
@@ -968,7 +968,7 @@ TQColorGroup Uic::loadColorGroup( const TQDomElement &e )
     return cg;
 }
 
-/*!  Returns TRUE if the widget properties specify that it belongs to
+/*!  Returns true if the widget properties specify that it belongs to
   the database \a connection and \a table.
 */
 
@@ -977,8 +977,8 @@ bool Uic::isWidgetInTable( const TQDomElement& e, const TQString& connection, co
     TQString conn = getDatabaseInfo( e, "connection" );
     TQString tab = getDatabaseInfo( e, "table" );
     if ( conn == connection && tab == table )
-	return TRUE;
-    return FALSE;
+	return true;
+    return false;
 }
 
 /*!
diff --git a/puic/uic.h b/puic/uic.h
index 75b3c1c..4dd0482 100644
--- a/puic/uic.h
+++ b/puic/uic.h
@@ -35,7 +35,7 @@
 #  define TQ_DUMMY_COMPARISON_OPERATOR(C) \
     bool operator==( const C& ) const { \
         tqWarning( #C"::operator==( const "#C"& ) got called." ); \
-        return FALSE; \
+        return false; \
     }
 # else
 #  define TQ_DUMMY_COMPARISON_OPERATOR(C)
@@ -181,7 +181,7 @@ private:
     static TQString mkBool( bool b );
     static TQString mkBool( const TQString& s );
     bool toBool( const TQString& s );
-    static TQString fixString( const TQString &str, bool encode = FALSE );
+    static TQString fixString( const TQString &str, bool encode = false );
     static bool onlyAscii;
     static TQString mkStdSet( const TQString& prop );
     static TQString getComment( const TQDomNode& n );
diff --git a/puic/widgetdatabase.cpp b/puic/widgetdatabase.cpp
index d94ebce..a65902c 100644
--- a/puic/widgetdatabase.cpp
+++ b/puic/widgetdatabase.cpp
@@ -48,10 +48,10 @@ static int dbcount  = 0;
 static int dbcustomcount = 200;
 static TQStrList *wGroups;
 static TQStrList *invisibleGroups;
-static bool whatsThisLoaded = FALSE;
+static bool whatsThisLoaded = false;
 static TQPluginManager<WidgetInterface> *widgetPluginManager = 0;
-static bool plugins_set_up = FALSE;
-static bool was_in_setup = FALSE;
+static bool plugins_set_up = false;
+static bool was_in_setup = false;
 
 TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager;
 
@@ -101,7 +101,7 @@ WidgetDatabase::WidgetDatabase()
 
 void WidgetDatabase::setupDataBase( int id )
 {
-    was_in_setup = TRUE;
+    was_in_setup = true;
 #ifndef UIC
     TQ_UNUSED( id )
     if ( dbcount )
@@ -122,7 +122,7 @@ void WidgetDatabase::setupDataBase( int id )
     invisibleGroups->append( "Forms" );
     invisibleGroups->append( "Temp" );
     className2Id = new TQDict<int>( dbdictsize );
-    className2Id->setAutoDelete( TRUE );
+    className2Id->setAutoDelete( true );
 
     WidgetDatabaseRecord *r = 0;
 
@@ -574,7 +574,7 @@ void WidgetDatabase::setupPlugins()
 {
     if ( plugins_set_up )
 	return;
-    plugins_set_up = TRUE;
+    plugins_set_up = true;
     TQStringList widgets = widgetManager()->featureList();
     for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) {
 	if ( hasWidget( *it ) )
@@ -724,7 +724,7 @@ bool WidgetDatabase::isForm( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return FALSE;
+	return false;
     return r->isForm;
 }
 
@@ -736,7 +736,7 @@ bool WidgetDatabase::isContainer( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return FALSE;
+	return false;
     return r->isContainer || r->isForm;
 }
 
@@ -745,7 +745,7 @@ bool WidgetDatabase::isCommon( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return FALSE;
+	return false;
     return r->isCommon;
 }
 
@@ -837,9 +837,9 @@ bool WidgetDatabase::isGroupEmpty( const TQString &grp )
 	if ( !( r = db[ i ] ) )
 	    continue;
 	if ( r->group == grp )
-	    return FALSE;
+	    return false;
     }
-    return TRUE;
+    return true;
 }
 
 TQString WidgetDatabase::widgetGroup( int i )
@@ -883,8 +883,8 @@ void WidgetDatabase::customWidgetClassNameChanged( const TQString &oldName,
 bool WidgetDatabase::isCustomWidget( int id )
 {
     if ( id >= dbcustom && id < dbcustomcount )
-	return TRUE;
-    return FALSE;
+	return true;
+    return false;
 }
 
 bool WidgetDatabase::isCustomPluginWidget( int id )
@@ -892,7 +892,7 @@ bool WidgetDatabase::isCustomPluginWidget( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return FALSE;
+	return false;
     return r->isPlugin;
 }
 
@@ -916,13 +916,13 @@ void WidgetDatabase::loadWhatsThis( const TQString &docPath )
 	if ( r )
 	    r->whatsThis = l[ 0 ];
     }
-    whatsThisLoaded = TRUE;
+    whatsThisLoaded = true;
 }
 
 
 // ### TQt 3.1: make these publically accessible via TQWidgetDatabase API
 #if defined(UIC)
-bool dbnounload = FALSE;
+bool dbnounload = false;
 TQStringList *dbpaths = 0;
 #else
 extern TQString *qwf_plugin_dir;
@@ -941,7 +941,7 @@ TQPluginManager<WidgetInterface> *widgetManager()
 	cleanup_manager.add( &widgetPluginManager );
 #if defined(UIC)
 	if ( dbnounload )
-	    widgetPluginManager->setAutoUnload( FALSE );
+	    widgetPluginManager->setAutoUnload( false );
 	if ( dbpaths ) {
 	    TQStringList::ConstIterator it = dbpaths->begin();
 	    for ( ; it != dbpaths->end(); ++it )