Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

19 files changed, 61 insertions, 60 deletions

diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 74a6b19..8c6b791 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -511,8 +511,8 @@ bool SetPropertyCommand::canMerge( Command *c )
 	return FALSE;
     }
     QVariant::Type t = QVariant::nameToType( p->type() );
-    return ( cmd->propName == propName &&
-	     t == QVariant::String || t == QVariant::CString || t == QVariant::Int || t == QVariant::UInt );
+    return ( ( cmd->propName == propName &&
+	     t == QVariant::String ) || t == QVariant::CString || t == QVariant::Int || t == QVariant::UInt );
 }
 
 void SetPropertyCommand::merge( Command *c )
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index ec620e7..9daeaae 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -1632,7 +1632,7 @@ QWidget *FormWindow::designerWidget( QObject *o ) const
     if ( !o || !o->isWidgetType() )
 	return 0;
     QWidget *w = (QWidget*)o;
-    while ( w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ] || isCentralWidget( w ) )
+    while ( ( w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ] ) || isCentralWidget( w ) )
 	w = (QWidget*)w->parent();
     return w;
 }
diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp
index 2701023..3422311 100644
--- a/tools/designer/designer/layout.cpp
+++ b/tools/designer/designer/layout.cpp
@@ -964,11 +964,12 @@ int Spacer::alignment() const
 QSize Spacer::minimumSize() const
 {
     QSize s = QSize( 20,20 );
-    if ( sizeType() == Expanding )
+    if ( sizeType() == Expanding ) {
 	if ( orient == Vertical )
 	    s.rheight() = 0;
 	else
 	    s.rwidth() = 0;
+	}
     return s;
 }
 
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 0474b2f..d4f8af4 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -989,12 +989,12 @@ bool MainWindow::eventFilter( QObject *o, QEvent *e )
 	     ( ::qt_cast<MenuBarEditor*>(o) ||
 	       ::qt_cast<PopupMenuEditor*>(o) ||
 	       ::qt_cast<QDesignerToolBar*>(o) ||
-	       ( ::qt_cast<QComboBox*>(o) ||
+	       ( ( ::qt_cast<QComboBox*>(o) ||
 		 ::qt_cast<QToolButton*>(o) ||
 		 ::qt_cast<QDesignerToolBarSeparator*>(o) ) &&
 	       o->parent()
 	       && ( ::qt_cast<QDesignerToolBar*>(o->parent())
-		   || ::qt_cast<QDesignerWidgetStack*>(o->parent())) ) ) {
+		   || ::qt_cast<QDesignerWidgetStack*>(o->parent())) ) ) ) {
 	    QWidget *w = (QWidget*)o;
 	    if ( ::qt_cast<QToolButton*>(w) ||
 		 ::qt_cast<QComboBox*>(w) ||
@@ -1570,10 +1570,10 @@ void MainWindow::setupRMBProperties( QValueList<uint> &ids, QMap<QString, int> &
     if ( pixmap && qstrcmp( pixmap->type(), "QPixmap") != 0 )
 	pixmap = 0;
 
-    if ( text && text->designable(w) ||
-	 title && title->designable(w) ||
-	 pagetitle && pagetitle->designable(w) ||
-	 pixmap && pixmap->designable(w) ) {
+    if ( ( text && text->designable(w) ) ||
+	 ( title && title->designable(w) ) ||
+	 ( pagetitle && pagetitle->designable(w) ) ||
+	 ( pixmap && pixmap->designable(w) ) ) {
 	int id = 0;
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator(0);
@@ -3337,7 +3337,7 @@ void MainWindow::showSourceLine( QObject *o, int line, LineMode lm )
 	    if ( fw->project() != currentProject )
 		continue;
 	    if ( qstrcmp( fw->name(), o->name() ) == 0 ||
-		 fw->isFake() && currentProject->objectForFakeForm( fw ) == o ) {
+		 ( fw->isFake() && currentProject->objectForFakeForm( fw ) == o ) ) {
 		if ( se ) {
 		    switch ( lm ) {
 		    case Error:
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index d8d99aa..94a115f 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -1248,7 +1248,7 @@ void MainWindow::fileOpen( const QString &filter, const QString &extension, cons
 			setCurrentProject( eProject );
 		    openFormWindow( filename );
 		    addRecentlyOpened( filename, recentlyFiles );
-		} else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 ||
+		} else if ( ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 ) ||
 			    additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) {
 		    SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) );
 		    if ( !sf )
@@ -1687,14 +1687,14 @@ void MainWindow::editBreakLayout()
     if ( formWindow()->currentWidget() )
 	w = formWindow()->currentWidget();
     if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
+	 ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) ) {
 	formWindow()->breakLayout( w );
 	return;
     } else {
 	QWidgetList widgets = formWindow()->selectedWidgets();
 	for ( w = widgets.first(); w; w = widgets.next() ) {
 	    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-		 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+		 ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) )
 		break;
 	}
 	if ( w ) {
@@ -1705,7 +1705,7 @@ void MainWindow::editBreakLayout()
 
     w = formWindow()->mainContainer();
     if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	 ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) )
 	formWindow()->breakLayout( w );
 }
 
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index cd36cc0..48422b1 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -355,7 +355,7 @@ void MetaDataBase::setMargin( QObject *o, int margin )
     QWidget *widget = (QWidget*)o;
     if ( widget && !::qt_cast<QLayoutWidget*>(widget) &&
 	( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ||
-	widget && widget->parentWidget() && ::qt_cast<FormWindow*>(widget->parentWidget()) ) )
+	  ( widget && widget->parentWidget() && ::qt_cast<FormWindow*>(widget->parentWidget()) ) ) )
 	isInnerLayout = FALSE;
 
 
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 3eae1c4..2c0912d 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -628,7 +628,7 @@ static void remove_multiline_contents( QString &contents, const QString &s, int
 	    if ( contents[ i ] == '\n' && !lastWasBackspash )
 		break;
 	    lastWasBackspash = ( contents[ i ] == '\\' ||
-				 lastWasBackspash && ( contents[ i ] == ' ' || contents[ i ] == '\t' ) );
+				 ( lastWasBackspash && ( contents[ i ] == ' ' || contents[ i ] == '\t' ) ) );
 	}
 	contents.remove( start, i - start + 1 );
     }
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 708f779..98d299c 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -553,9 +553,9 @@ QString PropertyItem::currentItemFromObject() const
 void PropertyItem::setFocus( QWidget *w )
 {
     if ( !qApp->focusWidget() ||
-	 listview->propertyEditor()->formWindow() &&
+	 ( listview->propertyEditor()->formWindow() &&
 	 ( !MainWindow::self->isAFormWindowChild( qApp->focusWidget() ) &&
-	   !qApp->focusWidget()->inherits( "Editor" ) ) )
+	   !qApp->focusWidget()->inherits( "Editor" ) ) ) )
 	w->setFocus();
 }
 
@@ -3151,7 +3151,7 @@ void PropertyList::setupProperties()
 	bool isPropertyObject = w->isA( "PropertyObject" );
 
 	if ( ( p->designable(w) ||
-	       isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) &&
+	       ( isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) ) &&
 	     ( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) {
 	    if ( p->isSetType() ) {
 		if ( QString( p->name() ) == "alignment" ) {
@@ -3733,9 +3733,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
 
 void PropertyList::setCurrentProperty( const QString &n )
 {
-    if ( currentItem() && currentItem()->text( 0 ) == n ||
-	 currentItem() && ( (PropertyItem*)currentItem() )->propertyParent() &&
-	 ( (PropertyItem*)currentItem() )->propertyParent()->text( 0 ) == n )
+    if ( ( currentItem() && currentItem()->text( 0 ) == n ) ||
+	 ( currentItem() && ( (PropertyItem*)currentItem() )->propertyParent() &&
+	 ( (PropertyItem*)currentItem() )->propertyParent()->text( 0 ) == n ) )
 	return;
 
     QListViewItemIterator it( this );
diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/qcompletionedit.cpp
index a293135..e9e65c0 100644
--- a/tools/designer/designer/qcompletionedit.cpp
+++ b/tools/designer/designer/qcompletionedit.cpp
@@ -115,8 +115,8 @@ void QCompletionEdit::updateListBox()
     if ( compList.isEmpty() )
 	return;
     for ( QStringList::Iterator it = compList.begin(); it != compList.end(); ++it ) {
-	if ( caseSensitive && (*it).left( text().length() ) == text() ||
-	     !caseSensitive && (*it).left( text().length() ).lower() == text().lower() )
+	if ( ( caseSensitive && (*it).left( text().length() ) == text() ) ||
+	     ( !caseSensitive && (*it).left( text().length() ).lower() == text().lower() ) )
 	    listbox->insertItem( *it );
     }
 }
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 257f4e6..7fed3ca 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -1220,8 +1220,8 @@ void Resource::saveItems( QObject *obj, QTextStream &ts, int indent )
         bool isDataTable = false;
 #  endif
 	for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
-	    if ( !table->horizontalHeader()->label( i ).isNull() &&
-		 table->horizontalHeader()->label( i ).toInt() != i + 1 ||
+	    if ( ( !table->horizontalHeader()->label( i ).isNull() &&
+		 table->horizontalHeader()->label( i ).toInt() != i + 1 ) ||
 		 table->horizontalHeader()->iconSet( i ) ||
 		  isDataTable ) {
 		ts << makeIndent( indent ) << "<column>" << endl;
@@ -1245,8 +1245,8 @@ void Resource::saveItems( QObject *obj, QTextStream &ts, int indent )
 	    }
 	}
 	for ( i = 0; i < table->verticalHeader()->count(); ++i ) {
-	    if ( !table->verticalHeader()->label( i ).isNull() &&
-		 table->verticalHeader()->label( i ).toInt() != i + 1 ||
+	    if ( ( !table->verticalHeader()->label( i ).isNull() &&
+		 table->verticalHeader()->label( i ).toInt() != i + 1 ) ||
 		 table->verticalHeader()->iconSet( i ) ) {
 		ts << makeIndent( indent ) << "<row>" << endl;
 		indent++;
@@ -1547,7 +1547,7 @@ void Resource::saveProperty( QObject *w, const QString &name, const QVariant &va
     uint unum;
     double dob;
     QString comment;
-    if ( w && formwindow->widgets()->find( (QWidget*)w ) || formwindow->actionList().find( (QAction*)w ) )
+    if ( ( w && formwindow->widgets()->find( (QWidget*)w ) ) || formwindow->actionList().find( (QAction*)w ) )
 	comment = MetaDataBase::propertyComment( w, name );
     switch ( t ) {
     case QVariant::String:
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index e168b4f..3757f5c 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -568,7 +568,7 @@ QLayout *WidgetFactory::createLayout( QWidget *widget, QLayout *layout, LayoutTy
 
     if ( ::qt_cast<QLayoutWidget*>(widget) &&
 	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ||
-	   widget && ::qt_cast<FormWindow*>(widget->parentWidget()) ) )
+	   ( widget && ::qt_cast<FormWindow*>(widget->parentWidget()) ) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
     if ( !layout && ::qt_cast<QTabWidget*>(widget) )
@@ -883,7 +883,7 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent,
 	MetaDataBase::setPropertyChanged( s, "sizeType", TRUE );
 	if ( !r )
 	    return s;
-	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
+	if ( !r->isValid() || ( r->width() < 2 && r->height() < 2 ) )
 	    s->setOrientation( orient );
 	else if ( r->width() < r->height() )
 	    s->setOrientation( Qt::Vertical );
@@ -904,7 +904,7 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent,
 	QSlider *s = new QSlider( parent, name );
 	if ( !r )
 	    return s;
-	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
+	if ( !r->isValid() || ( r->width() < 2 && r->height() < 2 ) )
 	    s->setOrientation( orient );
 	else if ( r->width() > r->height() )
 	    s->setOrientation( Qt::Horizontal );
@@ -915,7 +915,7 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent,
 	QScrollBar *s = new QScrollBar( parent, name );
 	if ( !r )
 	    return s;
-	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
+	if ( !r->isValid() || ( r->width() < 2 && r->height() < 2 ) )
 	    s->setOrientation( orient );
 	else if ( r->width() > r->height() )
 	    s->setOrientation( Qt::Horizontal );
@@ -936,7 +936,7 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent,
 	MetaDataBase::setPropertyChanged( l, "frameShape", TRUE );
 	if ( !r )
 	    return l;
-	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
+	if ( !r->isValid() || ( r->width() < 2 && r->height() < 2 ) )
 	    l->setOrientation( orient );
 	else if ( r->width() < r->height() )
 	    l->setOrientation( Qt::Vertical );
@@ -1143,7 +1143,7 @@ QWidget* WidgetFactory::widgetOfContainer( QWidget *w )
     while ( w ) {
 	int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) );
 	if ( WidgetDatabase::isContainer( id ) ||
-	     w && ::qt_cast<FormWindow*>(w->parentWidget()) )
+	     ( w && ::qt_cast<FormWindow*>(w->parentWidget()) ) )
 	    return w;
 	w = w->parentWidget();
     }
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp
index 9ab09fa..0473d06 100644
--- a/tools/designer/editor/completion.cpp
+++ b/tools/designer/editor/completion.cpp
@@ -363,8 +363,8 @@ bool EditorCompletion::eventFilter( QObject *o, QEvent *e )
 	    }
 	}
 
-	if ( ke->text().length() && !( ke->state() & AltButton ) &&
-	     ( !ke->ascii() || ke->ascii() >= 32 ) ||
+	if ( ( ke->text().length() && !( ke->state() & AltButton ) &&
+	     ( !ke->ascii() || ke->ascii() >= 32 ) ) ||
 	     ( ke->text() == "\t" && !( ke->state() & ControlButton ) ) ) {
 	    if ( ke->key() == Key_Tab ) {
 		if ( curEditor->textCursor()->index() == 0 &&
@@ -372,13 +372,13 @@ bool EditorCompletion::eventFilter( QObject *o, QEvent *e )
 		    return FALSE;
 		if ( doCompletion() )
 			return TRUE;
-	    } else if ( ke->key() == Key_Period &&
+	    } else if ( ( ke->key() == Key_Period &&
 			( curEditor->textCursor()->index() == 0 ||
-			  curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c != '.' )
+			  curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c != '.' ) )
 			||
-			ke->key() == Key_Greater &&
+			( ke->key() == Key_Greater &&
 			curEditor->textCursor()->index() > 0 &&
-			curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c == '-' ) {
+			curEditor->textCursor()->paragraph()->at( curEditor->textCursor()->index() - 1 )->c == '-' ) ) {
 		doObjectCompletion();
 	    } else {
 		if ( !doArgumentHint( ke->text() == "(" ) )
@@ -423,7 +423,7 @@ bool EditorCompletion::eventFilter( QObject *o, QEvent *e )
 	    return TRUE;
 	}
     }
-    if ( o == functionLabel || ::qt_cast<Editor*>(o) && functionLabel->isVisible() ) {
+    if ( o == functionLabel || ( ::qt_cast<Editor*>(o) && functionLabel->isVisible() ) ) {
 	if ( e->type() == QEvent::KeyPress ) {
 	    QKeyEvent *ke = (QKeyEvent*)e;
 	    if ( ke->key() == Key_Escape ) {
diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp
index ae7a3b5..d312b7a 100644
--- a/tools/designer/editor/parenmatcher.cpp
+++ b/tools/designer/editor/parenmatcher.cpp
@@ -120,9 +120,9 @@ bool ParenMatcher::checkOpenParen( QTextCursor *cursor )
 	    }
 
 	    int id = Match;
-	    if ( c == '{' && closedParen.chr != '}' ||
-		 c == '(' && closedParen.chr != ')' ||
-		 c == '[' && closedParen.chr != ']' )
+	    if ( ( c == '{' && closedParen.chr != '}' ) ||
+		 ( c == '(' && closedParen.chr != ')' ) ||
+		 ( c == '[' && closedParen.chr != ']' ) )
 		id = Mismatch;
 	    cursor->document()->setSelectionStart( id, *cursor );
 	    int tidx = cursor->index();
@@ -194,9 +194,9 @@ bool ParenMatcher::checkClosedParen( QTextCursor *cursor )
 	    }
 	
 	    int id = Match;
-	    if ( c == '}' && openParen.chr != '{' ||
-		 c == ')' && openParen.chr != '(' ||
-		 c == ']' && openParen.chr != '[' )
+	    if ( ( c == '}' && openParen.chr != '{' ) ||
+		 ( c == ')' && openParen.chr != '(' ) ||
+		 ( c == ']' && openParen.chr != '[' ) )
 		id = Mismatch;
 	    cursor->document()->setSelectionStart( id, *cursor );
 	    int tidx = cursor->index();
diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui.h b/tools/designer/plugins/wizards/mainwindowwizard.ui.h
index 8155e62..f975ba2 100644
--- a/tools/designer/plugins/wizards/mainwindowwizard.ui.h
+++ b/tools/designer/plugins/wizards/mainwindowwizard.ui.h
@@ -246,9 +246,9 @@ void MainWindowWizardBase::accept()
 	}
     }
     for ( QAction *ac = usedActions.first(); ac; ac = usedActions.next() ) {
-	if ( QString( ac->name() ).find( "file" ) != -1 && checkCreateConnectionsFile->isChecked() ||
-	    QString( ac->name() ).find( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() ||
-	    QString( ac->name() ).find( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) {
+	if ( ( QString( ac->name() ).find( "file" ) != -1 && checkCreateConnectionsFile->isChecked() ) ||
+	     ( QString( ac->name() ).find( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() ) ||
+	     ( QString( ac->name() ).find( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) ) {
 		QString slot = ac->name();
 		slot.remove( slot.length() - 6, 6 );
 		slot += "()";
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 7519877..1c45ab3 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -120,7 +120,7 @@ void SqlFormWizard::connectionSelected( const QString &c )
     listBoxTable->clear();
     QPtrList<DesignerDatabase> databases = proIface->databaseConnections();
     for ( DesignerDatabase *d = databases.first(); d; d = databases.next() ) {
-	if ( d->name() == c  || ( d->name() == "(default)" || d->name().isEmpty() ) && c == "(default)")
+	if ( d->name() == c  || ( ( d->name() == "(default)" || d->name().isEmpty() ) && c == "(default)") )
 	    listBoxTable->insertStringList( d->tables() );
     }
     setNextEnabled( databasePage, ( listBoxTable->currentItem() >= 0 ) );
@@ -356,7 +356,7 @@ void SqlFormWizard::accept()
     QPtrList<DesignerDatabase> databases = proIface->databaseConnections();
     DesignerDatabase *database = 0;
     for ( DesignerDatabase *d = databases.first(); d; d = databases.next() ) {
-	if ( d->name() == listBoxConnection->currentText() || ( d->name() == "(default)" || d->name().isEmpty() ) && listBoxConnection->currentText() == "(default)" ) {
+	if ( d->name() == listBoxConnection->currentText() || ( ( d->name() == "(default)" || d->name().isEmpty() ) && listBoxConnection->currentText() == "(default)" ) ) {
 	    database = d;
 	    d->open( FALSE );
 	    break;
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 09e60a1..35ec72f 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -113,7 +113,7 @@ QString richText( const QString& text )
 	} else if ( ch == '&' ) {
 	    rich += QString( "&amp;" );
 	} else if ( ch == ' ' ) {
-	    if ( i == 0 || i == (text.length()-1) || text[i - 1] == ' ' || text[i + 1] == ' ' ) {
+	    if ( i == 0 || i == ((int) text.length()-1) || text[i - 1] == ' ' || text[i + 1] == ' ' ) {
 		rich += richMeta( MessageEditor::tr("sp") );
 	    } else {
 		rich += ' ';
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index ce8fb98..ab6955e 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -573,9 +573,9 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		     (match(Tok_Comma) &&
 		      matchString(&com) &&
 		      (match(Tok_RightParen) ||
-		       match(Tok_Comma) &&
-		       matchEncoding(&utf8) &&
-		       match(Tok_RightParen))) )
+		       (match(Tok_Comma) &&
+		        matchEncoding(&utf8) &&
+		        match(Tok_RightParen)))) )
 		    tor->insert( MetaTranslatorMessage(context, text, com,
 						       QString::null, utf8) );
 	    }
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp
index c286a84..8588b3c 100644
--- a/tools/mergetr/mergetr.cpp
+++ b/tools/mergetr/mergetr.cpp
@@ -331,7 +331,7 @@ int main( int argc, char* argv[] )
     int orgfile = 1;
     int newfile = 2;
 
-    if ( argc <= newfile || argc > 1 && argv[1][0] == '-') {
+    if ( argc <= newfile || ( argc > 1 && argv[1][0] == '-' ) ) {
 	printf("usage: %s  orgfile newfile [outfile]\n", argv[0]);
 	exit(1);
     }
diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp
index 35d6131..3555fc6 100644
--- a/tools/qvfb/qanimationwriter.cpp
+++ b/tools/qvfb/qanimationwriter.cpp
@@ -392,7 +392,7 @@ void QAnimationWriter::appendFrame(const QImage& frm, const QPoint& offset)
 qDebug("%d,%d  %d,%d",minx,miny,offset.x(),offset.y());
 	    d->composeImage(diff,QPoint(minx,miny)+offset);
 	}
-	if ( prev.isNull() || prev.size() == frame.size() && offset == QPoint(0,0) ) {
+	if ( prev.isNull() || ( prev.size() == frame.size() && offset == QPoint(0,0) ) ) {
 	    prev = frame;
 	} else {
 	    bitBlt(&prev,offset.x(),offset.y(),&frame,0,0,frame.width(),frame.height());