OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes detected by cppcheck (#4974)

Browse Source 
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
This commit is contained in:
Magne Sjaastad
2019-11-03 08:37:03 +01:00
committed by GitHub
parent 18eee02bb1
commit 67e7bb0cf3
64 changed files with 159 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp
+3 -12
View File
@@ -152,21 +152,13 @@ void RicCreateMultipleFracturesFeature::slotAppendFractures()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCreateMultipleFracturesFeature::slotClose()
{
if ( m_dialog )
{
m_dialog->close();
}
}
void RicCreateMultipleFracturesFeature::slotClose() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCreateMultipleFracturesFeature::onActionTriggered( bool isChecked )
{
m_dialog = nullptr;
RiuCreateMultipleFractionsUi* multipleFractionsUi = this->multipleFractionsUi();
if ( multipleFractionsUi )
{
@@ -217,8 +209,7 @@ void RicCreateMultipleFracturesFeature::onActionTriggered( bool isChecked )
"Create Multiple Fractures",
"" );
m_dialog = &propertyDialog;
multipleFractionsUi->setParentDialog( m_dialog );
multipleFractionsUi->setParentDialog( &propertyDialog );
propertyDialog.resize( QSize( 700, 450 ) );
@@ -246,7 +237,7 @@ void RicCreateMultipleFracturesFeature::onActionTriggered( bool isChecked )
{
QPushButton* pushButton = dialogButtonBox->addButton( "Close", QDialogButtonBox::ActionRole );
connect( pushButton, SIGNAL( clicked() ), this, SLOT( slotClose() ) );
connect( pushButton, SIGNAL( clicked() ), &propertyDialog, SLOT( close() ) );
pushButton->setDefault( false );
pushButton->setAutoDefault( false );
}
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.h
+1 -2
View File
@@ -61,6 +61,5 @@ private:
RiuCreateMultipleFractionsUi* multipleFractionsUi() const;
private:
QPointer<caf::PdmUiPropertyViewDialog> m_dialog;
QString m_copyOfObject;
QString m_copyOfObject;
};