sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-11-05 09:48:03 +01:00
parent 7b9aa9992f
commit abb924affb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgsaddtaborgroup.cpp
View File

@ -77,5 +77,5 @@ void QgsAddTabOrGroup::on_mGroupButton_toggled( bool checked )
void QgsAddTabOrGroup::on_mTabButton_toggled( bool checked )
{
mTabList->setEnabled( not checked );
mTabList->setEnabled( !checked );
}

15
src/app/qgsattributedialog.cpp
View File

@ -65,9 +65,9 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
QDialogButtonBox *buttonBox = NULL;
// UI-File defined layout
if ( !vl->editorLayout() == QgsVectorLayer::UiFileLayout && !vl->editForm().isEmpty() )
if ( vl->editorLayout() == QgsVectorLayer::UiFileLayout && !vl->editForm().isEmpty() )
{
// UI-File defined layout
QFile file( vl->editForm() );
if ( file.open( QFile::ReadOnly ) )
@ -83,9 +83,9 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
buttonBox = myWidget->findChild<QDialogButtonBox*>();
}
}
// Tab display
if ( vl->editorLayout() == QgsVectorLayer::TabLayout )
else if ( vl->editorLayout() == QgsVectorLayer::TabLayout )
{
// Tab display
mDialog = new QDialog( QgisApp::instance() );
QGridLayout *gridLayout;
@ -149,19 +149,24 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
//
QVBoxLayout *mypOuterLayout = new QVBoxLayout();
mypOuterLayout->setContentsMargins( 0, 0, 0, 0 );
//transfers layout ownership so no need to call delete
//transfers layout ownership so no need to call delete
mFrame->setLayout( mypOuterLayout );
QScrollArea *mypScrollArea = new QScrollArea();
mypScrollArea->setFrameShape( QFrame::NoFrame );
mypScrollArea->setFrameShadow( QFrame::Plain );
//transfers scroll area ownership so no need to call delete
mypOuterLayout->addWidget( mypScrollArea );
QFrame *mypInnerFrame = new QFrame();
mypInnerFrame->setFrameShape( QFrame::NoFrame );
mypInnerFrame->setFrameShadow( QFrame::Plain );
//transfers frame ownership so no need to call delete
mypScrollArea->setWidget( mypInnerFrame );
mypScrollArea->setWidgetResizable( true );
QGridLayout *mypInnerLayout = new QGridLayout( mypInnerFrame );