diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /tools/designer/plugins | |
| parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'tools/designer/plugins')
| -rw-r--r-- | tools/designer/plugins/wizards/mainwindowwizard.ui.h | 6 | ||||
| -rw-r--r-- | tools/designer/plugins/wizards/sqlformwizardimpl.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
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; |