Skip to content

Commit

Permalink
Some minor cleaning up.
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny committed Jul 5, 2017
2 parents fcc10c8 + 2e98e23 commit e50e092
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace CellMLAnnotationView {

CellmlAnnotationViewEditingWidget::CellmlAnnotationViewEditingWidget(CellMLAnnotationViewPlugin *pPlugin,
const QString &pFileName,
CellmlAnnotationViewWidget *pViewWidget,
CellmlAnnotationViewWidget *pAnnotationWidget,
QWidget *pParent) :
Core::SplitterWidget(pParent)
{
Expand Down Expand Up @@ -77,7 +77,7 @@ CellmlAnnotationViewEditingWidget::CellmlAnnotationViewEditingWidget(CellMLAnnot
// Create our two main parts

mCellmlList = new CellmlAnnotationViewCellmlListWidget(this);
mMetadataDetails = new CellmlAnnotationViewMetadataDetailsWidget(pPlugin, pViewWidget, this, mCellmlFile, this);
mMetadataDetails = new CellmlAnnotationViewMetadataDetailsWidget(pPlugin, pAnnotationWidget, this, mCellmlFile, this);

// Populate ourselves

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class CellmlAnnotationViewEditingWidget : public Core::SplitterWidget
public:
explicit CellmlAnnotationViewEditingWidget(CellMLAnnotationViewPlugin *pPlugin,
const QString &pFileName,
CellmlAnnotationViewWidget *pViewWidget,
CellmlAnnotationViewWidget *pAnnotationWidget,
QWidget *pParent);

virtual void retranslateUi();
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ namespace CellMLAnnotationView {
//==============================================================================

CellmlAnnotationViewMetadataDetailsWidget::CellmlAnnotationViewMetadataDetailsWidget(CellMLAnnotationViewPlugin *pPlugin,
CellmlAnnotationViewWidget *pViewWidget,
CellmlAnnotationViewEditingWidget *pViewEditingWidget,
CellmlAnnotationViewWidget *pAnnotationWidget,
CellmlAnnotationViewEditingWidget *pEditingWidget,
CellMLSupport::CellmlFile *pCellmlFile,
QWidget *pParent) :
Widget(pParent),
Expand Down Expand Up @@ -86,7 +86,7 @@ CellmlAnnotationViewMetadataDetailsWidget::CellmlAnnotationViewMetadataDetailsWi

// Create our details widgets

mMetadataEditDetails = new CellmlAnnotationViewMetadataEditDetailsWidget(pViewWidget, pViewEditingWidget, pCellmlFile, mSplitter);
mMetadataEditDetails = new CellmlAnnotationViewMetadataEditDetailsWidget(pAnnotationWidget, pEditingWidget, pCellmlFile, mSplitter);
mMetadataViewDetails = new CellmlAnnotationViewMetadataViewDetailsWidget(pCellmlFile, mSplitter);
mWebViewer = new WebViewerWidget::WebViewerWidget(mSplitter);

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class CellmlAnnotationViewMetadataDetailsWidget : public Core::Widget

public:
explicit CellmlAnnotationViewMetadataDetailsWidget(CellMLAnnotationViewPlugin *pPlugin,
CellmlAnnotationViewWidget *pViewWidget,
CellmlAnnotationViewEditingWidget *pViewEditingWidget,
CellmlAnnotationViewWidget *pAnnotationWidget,
CellmlAnnotationViewEditingWidget *pEditingWidget,
CellMLSupport::CellmlFile *pCellmlFile,
QWidget *pParent);

Expand Down
16 changes: 8 additions & 8 deletions ...lugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ QString CellmlAnnotationViewMetadataEditDetailsItem::id() const

//==============================================================================

CellmlAnnotationViewMetadataEditDetailsWidget::CellmlAnnotationViewMetadataEditDetailsWidget(CellmlAnnotationViewWidget *pViewWidget,
CellmlAnnotationViewEditingWidget *pViewEditingWidget,
CellmlAnnotationViewMetadataEditDetailsWidget::CellmlAnnotationViewMetadataEditDetailsWidget(CellmlAnnotationViewWidget *pAnnotationWidget,
CellmlAnnotationViewEditingWidget *pEditingWidget,
CellMLSupport::CellmlFile *pCellmlFile,
QWidget *pParent) :
Core::Widget(pParent),
mViewWidget(pViewWidget),
mViewEditingWidget(pViewEditingWidget),
mAnnotationWidget(pAnnotationWidget),
mEditingWidget(pEditingWidget),
mTermValue(0),
mAddTermButton(0),
mTerm(QString()),
Expand Down Expand Up @@ -285,7 +285,7 @@ CellmlAnnotationViewMetadataEditDetailsWidget::CellmlAnnotationViewMetadataEditD
// pParent, but this wouldn't work here since updateGui() gets called
// as part of the creation of this metadata details widget...

setTabOrder(qobject_cast<QWidget *>(mViewEditingWidget->cellmlList()->treeViewWidget()),
setTabOrder(qobject_cast<QWidget *>(mEditingWidget->cellmlList()->treeViewWidget()),
mQualifierValue);
setTabOrder(mQualifierValue, mLookUpQualifierButton);
setTabOrder(mLookUpQualifierButton, mTermValue);
Expand Down Expand Up @@ -416,7 +416,7 @@ void CellmlAnnotationViewMetadataEditDetailsWidget::updateGui(iface::cellml_api:
// we were then our busy widget would get 'reset' every time, which
// doesn't look nice...

if ( (pResetItemsGui && !mViewWidget->isBusyWidgetVisible())
if ( (pResetItemsGui && !mAnnotationWidget->isBusyWidgetVisible())
|| termIsDirect) {
updateItemsGui(CellmlAnnotationViewMetadataEditDetailsItems(),
!termIsDirect && !pFilePermissionsChanged);
Expand Down Expand Up @@ -830,7 +830,7 @@ void CellmlAnnotationViewMetadataEditDetailsWidget::linkClicked()

// Ask our parent to update its GUI with the added RDF triple

mViewEditingWidget->metadataDetails()->metadataViewDetails()->normalView()->addRdfTriple(rdfTriple);
mEditingWidget->metadataDetails()->metadataViewDetails()->normalView()->addRdfTriple(rdfTriple);
} else {
// We have clicked on a resource/id link, so start by enabling the
// looking up of information
Expand Down Expand Up @@ -1065,7 +1065,7 @@ void CellmlAnnotationViewMetadataEditDetailsWidget::addTerm()

// Ask our parent to update its GUI with the added RDF triple

mViewEditingWidget->metadataDetails()->metadataViewDetails()->normalView()->addRdfTriple(rdfTriple);
mEditingWidget->metadataDetails()->metadataViewDetails()->normalView()->addRdfTriple(rdfTriple);
}

//==============================================================================
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadataeditdetailswidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ class CellmlAnnotationViewMetadataEditDetailsWidget : public Core::Widget
Q_OBJECT

public:
explicit CellmlAnnotationViewMetadataEditDetailsWidget(CellmlAnnotationViewWidget *pViewWidget,
CellmlAnnotationViewEditingWidget *pViewEditingWidget,
explicit CellmlAnnotationViewMetadataEditDetailsWidget(CellmlAnnotationViewWidget *pAnnotationWidget,
CellmlAnnotationViewEditingWidget *pEditingWidget,
CellMLSupport::CellmlFile *pCellmlFile,
QWidget *pParent);

Expand All @@ -121,8 +121,8 @@ class CellmlAnnotationViewMetadataEditDetailsWidget : public Core::Widget
Id
};

CellmlAnnotationViewWidget *mViewWidget;
CellmlAnnotationViewEditingWidget *mViewEditingWidget;
CellmlAnnotationViewWidget *mAnnotationWidget;
CellmlAnnotationViewEditingWidget *mEditingWidget;

QNetworkAccessManager *mNetworkAccessManager;

Expand Down
10 changes: 5 additions & 5 deletions src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,21 +146,21 @@ void CellmlEditingViewWidget::retranslateUi()

//==============================================================================

void CellmlEditingViewWidget::updateSettings(CellmlEditingViewWidget *pCellmlEditingViewWidget)
void CellmlEditingViewWidget::updateSettings(CellmlEditingViewWidget *pEditingWidget)
{
// Make sure that we are given another editing widget

if (!pCellmlEditingViewWidget || (pCellmlEditingViewWidget == this))
if (!pEditingWidget || (pEditingWidget == this))
return;

// Update our sizes, MathML viewer and editor widgets' settings

mEditingWidgetSizes = pCellmlEditingViewWidget->editingWidgetSizes();
mEditingWidgetSizes = pEditingWidget->editingWidgetSizes();

setSizes(mEditingWidgetSizes);

mMathmlViewerWidget->updateSettings(pCellmlEditingViewWidget->mathmlViewer());
mEditorWidget->updateSettings(pCellmlEditingViewWidget->editorWidget());
mMathmlViewerWidget->updateSettings(pEditingWidget->mathmlViewer());
mEditorWidget->updateSettings(pEditingWidget->editorWidget());
}

//==============================================================================
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class CELLMLEDITINGVIEW_EXPORT CellmlEditingViewWidget : public Core::SplitterWi

virtual void retranslateUi();

void updateSettings(CellmlEditingViewWidget *pCellmlEditingViewWidget);
void updateSettings(CellmlEditingViewWidget *pEditingWidget);

MathMLViewerWidget::MathmlViewerWidget * mathmlViewer() const;
EditorWidget::EditorWidget * editorWidget() const;
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/editing/SEDMLEditingView/src/sedmleditingviewwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,20 @@ void SedmlEditingViewWidget::retranslateUi()

//==============================================================================

void SedmlEditingViewWidget::updateSettings(SedmlEditingViewWidget *pSedmlEditingViewWidget)
void SedmlEditingViewWidget::updateSettings(SedmlEditingViewWidget *pEditingWidget)
{
// Make sure that we are given another editing widget

if (!pSedmlEditingViewWidget || (pSedmlEditingViewWidget == this))
if (!pEditingWidget || (pEditingWidget == this))
return;

// Update our sizes and editor widget's settings

mEditingWidgetSizes = pSedmlEditingViewWidget->editingWidgetSizes();
mEditingWidgetSizes = pEditingWidget->editingWidgetSizes();

setSizes(mEditingWidgetSizes);

mEditorWidget->updateSettings(pSedmlEditingViewWidget->editorWidget());
mEditorWidget->updateSettings(pEditingWidget->editorWidget());
}

//==============================================================================
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/editing/SEDMLEditingView/src/sedmleditingviewwidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class SEDMLEDITINGVIEW_EXPORT SedmlEditingViewWidget : public Core::SplitterWidg

virtual void retranslateUi();

void updateSettings(SedmlEditingViewWidget *pSedmlEditingViewWidget);
void updateSettings(SedmlEditingViewWidget *pEditingWidget);

EditorWidget::EditorWidget * editorWidget() const;
EditorWidget::EditorListWidget * editorListWidget() const;
Expand Down

0 comments on commit e50e092

Please sign in to comment.