Skip to content

Commit

Permalink
Some minor cleaning up (#1592).
Browse files Browse the repository at this point in the history 
Removed our use of full namespaces since we don’t need them with the
new signal/slot mechanism.
  • Loading branch information
@agarny
agarny committed Apr 4, 2018
1 parent df284b1 commit 626d02a
Show file tree
Hide file tree
Showing 39 changed files with 133 additions and 140 deletions.
6 changes: 3 additions & 3 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.cpp
View file
Expand Up @@ -165,7 +165,7 @@ CellmlAnnotationViewMetadataDetailsWidget * CellmlAnnotationViewEditingWidget::m

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

void CellmlAnnotationViewEditingWidget::updateWebViewerWithQualifierDetails(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void CellmlAnnotationViewEditingWidget::updateWebViewerWithQualifierDetails(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pQualifier)
{
// The user requested a qualifier to be looked up, so generate a web page
Expand Down Expand Up @@ -255,7 +255,7 @@ void CellmlAnnotationViewEditingWidget::updateWebViewerWithQualifierDetails(Open

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

void CellmlAnnotationViewEditingWidget::updateWebViewerWithResourceDetails(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void CellmlAnnotationViewEditingWidget::updateWebViewerWithResourceDetails(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pResource)
{
// The user requested a resource to be looked up, so retrieve it using
Expand All @@ -266,7 +266,7 @@ void CellmlAnnotationViewEditingWidget::updateWebViewerWithResourceDetails(OpenC

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

void CellmlAnnotationViewEditingWidget::updateWebViewerWithIdDetails(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void CellmlAnnotationViewEditingWidget::updateWebViewerWithIdDetails(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pResource,
const QString &pId)
{
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationvieweditingwidget.h
View file
Expand Up @@ -97,11 +97,11 @@ class CellmlAnnotationViewEditingWidget : public Core::SplitterWidget
private slots:
void emitSplitterMoved();

void updateWebViewerWithQualifierDetails(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void updateWebViewerWithQualifierDetails(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pQualifier);
void updateWebViewerWithResourceDetails(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void updateWebViewerWithResourceDetails(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pResource);
void updateWebViewerWithIdDetails(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void updateWebViewerWithIdDetails(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pResource,
const QString &pId);
};
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.h
View file
Expand Up @@ -110,11 +110,11 @@ class CellmlAnnotationViewMetadataDetailsWidget : public Core::Widget
void splitterMoved(const QIntList &pSizes);


void qualifierDetailsRequested(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void qualifierDetailsRequested(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pQualifier);
void resourceDetailsRequested(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void resourceDetailsRequested(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pResource);
void idDetailsRequested(OpenCOR::WebViewerWidget::WebViewerWidget *pWebViewer,
void idDetailsRequested(WebViewerWidget::WebViewerWidget *pWebViewer,
const QString &pResource, const QString &pId);

public slots:
Expand Down
2 changes: 1 addition & 1 deletion ...ns/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatanormalviewdetailswidget.h
View file
Expand Up @@ -143,7 +143,7 @@ class CellmlAnnotationViewMetadataNormalViewDetailsWidget : public Core::Widget
void idLookUpRequested(const QString &pResource, const QString &pId);
void noLookUpRequested();

void rdfTripleRemoved(OpenCOR::CellMLSupport::CellmlFileRdfTriple *pRdfTriple);
void rdfTripleRemoved(CellMLSupport::CellmlFileRdfTriple *pRdfTriple);

public slots:
void disableLookUpInformation();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.cpp
View file
Expand Up @@ -215,7 +215,7 @@ void CellmlEditingViewWidget::splitterMoved()

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

void CellmlEditingViewWidget::itemRequested(OpenCOR::EditorWidget::EditorListItem *pItem)
void CellmlEditingViewWidget::itemRequested(EditorWidget::EditorListItem *pItem)
{
// Set our editor widget's cursor position to the line/column of the given
// item and give our editor widget the focus so that we can see the exact
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/editing/CellMLEditingView/src/cellmleditingviewwidget.h
View file
Expand Up @@ -91,7 +91,7 @@ class CELLMLEDITINGVIEW_EXPORT CellmlEditingViewWidget : public Core::SplitterWi

private slots:
void splitterMoved();
void itemRequested(OpenCOR::EditorWidget::EditorListItem *pItem);
void itemRequested(EditorWidget::EditorListItem *pItem);
};

//==============================================================================
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/editing/SEDMLEditingView/src/sedmleditingviewwidget.cpp
View file
Expand Up @@ -188,7 +188,7 @@ void SedmlEditingViewWidget::splitterMoved()

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

void SedmlEditingViewWidget::itemRequested(OpenCOR::EditorWidget::EditorListItem *pItem)
void SedmlEditingViewWidget::itemRequested(EditorWidget::EditorListItem *pItem)
{
// Set our editor widget's cursor position to the line/column of the given
// item and give our editor widget the focus so that we can see the exact
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/editing/SEDMLEditingView/src/sedmleditingviewwidget.h
View file
Expand Up @@ -83,7 +83,7 @@ class SEDMLEDITINGVIEW_EXPORT SedmlEditingViewWidget : public Core::SplitterWidg

private slots:
void splitterMoved();
void itemRequested(OpenCOR::EditorWidget::EditorListItem *pItem);
void itemRequested(EditorWidget::EditorListItem *pItem);
};

//==============================================================================
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/miscellaneous/Core/src/propertyeditorwidget.h
View file
Expand Up @@ -464,7 +464,7 @@ class CORE_EXPORT PropertyEditorWidget : public TreeViewWidget
void deleteProperty(Property *pProperty);

signals:
void propertyChanged(OpenCOR::Core::Property *pProperty);
void propertyChanged(Property *pProperty);

private slots:
void updateHeight();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/organisation/PMRWindow/src/pmrwindowwindow.cpp
View file
Expand Up @@ -337,7 +337,7 @@ void PmrWindowWindow::on_actionReload_triggered()

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

void PmrWindowWindow::initializeWidget(const OpenCOR::PMRSupport::PmrExposures &pExposures)
void PmrWindowWindow::initializeWidget(const PMRSupport::PmrExposures &pExposures)
{
// Ask our PMR widget to initialise itself

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/organisation/PMRWindow/src/pmrwindowwindow.h
View file
Expand Up @@ -107,7 +107,7 @@ private slots:

void retrieveExposures(bool pVisible);

void initializeWidget(const OpenCOR::PMRSupport::PmrExposures &pExposures);
void initializeWidget(const PMRSupport::PmrExposures &pExposures);

void itemDoubleClicked();
};
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowwidget.cpp
View file
Expand Up @@ -828,7 +828,7 @@ void PmrWorkspacesWindowWidget::initialize(const PMRSupport::PmrWorkspaces &pWor

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

void PmrWorkspacesWindowWidget::initialize(const OpenCOR::PMRSupport::PmrWorkspaces &pWorkspaces)
void PmrWorkspacesWindowWidget::initialize(const PMRSupport::PmrWorkspaces &pWorkspaces)
{
// Initialise ourselves using the given workspaces

Expand Down Expand Up @@ -1399,7 +1399,7 @@ void PmrWorkspacesWindowWidget::refreshWorkspaces()

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

void PmrWorkspacesWindowWidget::workspaceCloned(OpenCOR::PMRSupport::PmrWorkspace *pWorkspace)
void PmrWorkspacesWindowWidget::workspaceCloned(PMRSupport::PmrWorkspace *pWorkspace)
{
// The given workspace has been cloned, so update ourselves accordingly

Expand Down Expand Up @@ -1436,7 +1436,7 @@ void PmrWorkspacesWindowWidget::workspaceCloned(OpenCOR::PMRSupport::PmrWorkspac

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

void PmrWorkspacesWindowWidget::workspaceUncloned(OpenCOR::PMRSupport::PmrWorkspace *pWorkspace)
void PmrWorkspacesWindowWidget::workspaceUncloned(PMRSupport::PmrWorkspace *pWorkspace)
{
// The given workspace has been uncloned, so update ourselves accordingly

Expand All @@ -1448,7 +1448,7 @@ void PmrWorkspacesWindowWidget::workspaceUncloned(OpenCOR::PMRSupport::PmrWorksp

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

void PmrWorkspacesWindowWidget::workspaceSynchronized(OpenCOR::PMRSupport::PmrWorkspace *pWorkspace)
void PmrWorkspacesWindowWidget::workspaceSynchronized(PMRSupport::PmrWorkspace *pWorkspace)
{
// The workspace has been synchronised, so refresh it

Expand Down
8 changes: 4 additions & 4 deletions src/plugins/organisation/PMRWorkspacesWindow/src/pmrworkspaceswindowwidget.h
View file
Expand Up @@ -311,7 +311,7 @@ class PmrWorkspacesWindowWidget : public Core::TreeViewWidget
void openFilesRequested(const QStringList &pFileNames);

public slots:
void initialize(const OpenCOR::PMRSupport::PmrWorkspaces &pWorkspaces);
void initialize(const PMRSupport::PmrWorkspaces &pWorkspaces);

private slots:
void showCustomContextMenu() const;
Expand All @@ -323,9 +323,9 @@ private slots:

void refreshWorkspaces();

void workspaceCloned(OpenCOR::PMRSupport::PmrWorkspace *pWorkspace);
void workspaceUncloned(OpenCOR::PMRSupport::PmrWorkspace *pWorkspace);
void workspaceSynchronized(OpenCOR::PMRSupport::PmrWorkspace *pWorkspace);
void workspaceCloned(PMRSupport::PmrWorkspace *pWorkspace);
void workspaceUncloned(PMRSupport::PmrWorkspace *pWorkspace);
void workspaceSynchronized(PMRSupport::PmrWorkspace *pWorkspace);

void viewWorkspaceInPmr();
void viewWorkspaceOncomputer();
Expand Down
22 changes: 11 additions & 11 deletions ...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp
View file
Expand Up @@ -271,7 +271,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::finalize()

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel,
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(GraphPanelWidget::GraphPanelWidget *pGraphPanel,
bool pActive)
{
// Retrieve the graph panel and graphs property editors for the given file
Expand Down Expand Up @@ -376,7 +376,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(Op

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel)
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(GraphPanelWidget::GraphPanelWidget *pGraphPanel)
{
// Initialise the given graph panel

Expand All @@ -385,7 +385,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(Op

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::finalize(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel)
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::finalize(GraphPanelWidget::GraphPanelWidget *pGraphPanel)
{
// Remove track of the link betwen our graph panel and our graph panel and
// graphs property editors
Expand Down Expand Up @@ -414,9 +414,9 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::finalize(Open

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::addGraph(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel,
OpenCOR::GraphPanelWidget::GraphPanelPlotGraph *pGraph,
const OpenCOR::GraphPanelWidget::GraphPanelPlotGraphProperties &pGraphProperties)
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::addGraph(GraphPanelWidget::GraphPanelWidget *pGraphPanel,
GraphPanelWidget::GraphPanelPlotGraph *pGraph,
const GraphPanelWidget::GraphPanelPlotGraphProperties &pGraphProperties)
{
// Make sure that we have a graphs property editor

Expand Down Expand Up @@ -504,8 +504,8 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::addGraph(Open

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::removeGraphs(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel,
const OpenCOR::GraphPanelWidget::GraphPanelPlotGraphs &pGraphs)
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::removeGraphs(GraphPanelWidget::GraphPanelWidget *pGraphPanel,
const GraphPanelWidget::GraphPanelPlotGraphs &pGraphs)
{
// Make sure that we have a graphs property editor

Expand All @@ -529,7 +529,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::removeGraphs(

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::toggleGraph(OpenCOR::GraphPanelWidget::GraphPanelPlotGraph *pGraph)
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::toggleGraph(GraphPanelWidget::GraphPanelPlotGraph *pGraph)
{
// Toggle our graph property

Expand Down Expand Up @@ -1339,7 +1339,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphPanelSec

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphPanelPropertyChanged(OpenCOR::Core::Property *pProperty)
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphPanelPropertyChanged(Core::Property *pProperty)
{
// Update our graph panel settings

Expand Down Expand Up @@ -1421,7 +1421,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphPanelPro

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

void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphsPropertyChanged(OpenCOR::Core::Property *pProperty)
void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphsPropertyChanged(Core::Property *pProperty)
{
// Our graph has changed, which means that either it has been un/selected or
// that the value of one of its properties has changed
Expand Down
28 changes: 14 additions & 14 deletions ...mulationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.h
View file
Expand Up @@ -167,31 +167,31 @@ class SimulationExperimentViewInformationGraphPanelAndGraphsWidget : public QSta
bool rootProperty(Core::Property *pProperty) const;

signals:
void graphPanelGraphsModeChanged(const OpenCOR::SimulationExperimentView::SimulationExperimentViewInformationGraphPanelAndGraphsWidget::Mode &pMode);
void graphPanelGraphsModeChanged(const SimulationExperimentViewInformationGraphPanelAndGraphsWidget::Mode &pMode);

void graphPanelHeaderSectionResized(int pIndex, int pOldSize, int pNewSize);
void graphsHeaderSectionResized(int pIndex, int pOldSize, int pNewSize);

void graphPanelSectionExpanded(int pSection, bool pExpanded);

void graphUpdated(OpenCOR::GraphPanelWidget::GraphPanelPlotGraph *pGraph);
void graphsUpdated(const OpenCOR::GraphPanelWidget::GraphPanelPlotGraphs &pGraphs);
void graphUpdated(GraphPanelWidget::GraphPanelPlotGraph *pGraph);
void graphsUpdated(const GraphPanelWidget::GraphPanelPlotGraphs &pGraphs);

public slots:
void initialize(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel,
void initialize(GraphPanelWidget::GraphPanelWidget *pGraphPanel,
bool pActive);
void initialize(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel);
void finalize(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel);
void initialize(GraphPanelWidget::GraphPanelWidget *pGraphPanel);
void finalize(GraphPanelWidget::GraphPanelWidget *pGraphPanel);

void addGraph(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel,
OpenCOR::GraphPanelWidget::GraphPanelPlotGraph *pGraph,
const OpenCOR::GraphPanelWidget::GraphPanelPlotGraphProperties &pGraphProperties);
void addGraph(GraphPanelWidget::GraphPanelWidget *pGraphPanel,
GraphPanelWidget::GraphPanelPlotGraph *pGraph,
const GraphPanelWidget::GraphPanelPlotGraphProperties &pGraphProperties);
void addGraph();

void removeGraphs(OpenCOR::GraphPanelWidget::GraphPanelWidget *pGraphPanel,
const OpenCOR::GraphPanelWidget::GraphPanelPlotGraphs &pGraphs);
void removeGraphs(GraphPanelWidget::GraphPanelWidget *pGraphPanel,
const GraphPanelWidget::GraphPanelPlotGraphs &pGraphs);

void toggleGraph(OpenCOR::GraphPanelWidget::GraphPanelPlotGraph *pGraph);
void toggleGraph(GraphPanelWidget::GraphPanelPlotGraph *pGraph);

void toggleLegend();

Expand All @@ -213,8 +213,8 @@ private slots:
void graphPanelSectionExpanded(const QModelIndex &pIndex);
void graphPanelSectionCollapsed(const QModelIndex &pIndex);

void graphPanelPropertyChanged(OpenCOR::Core::Property *pProperty);
void graphsPropertyChanged(OpenCOR::Core::Property *pProperty);
void graphPanelPropertyChanged(Core::Property *pProperty);
void graphsPropertyChanged(Core::Property *pProperty);

void updateParameterValue();
};
Expand Down
2 changes: 1 addition & 1 deletion ...tion/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.cpp
View file
Expand Up @@ -214,7 +214,7 @@ void SimulationExperimentViewInformationParametersWidget::updateParameters(doubl

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

void SimulationExperimentViewInformationParametersWidget::propertyChanged(OpenCOR::Core::Property *pProperty)
void SimulationExperimentViewInformationParametersWidget::propertyChanged(Core::Property *pProperty)
{
// Update our simulation data

Expand Down
6 changes: 3 additions & 3 deletions ...lation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.h
View file
Expand Up @@ -87,14 +87,14 @@ class SimulationExperimentViewInformationParametersWidget : public Core::Propert
void retranslateContextMenu();

signals:
void graphRequired(OpenCOR::CellMLSupport::CellmlFileRuntimeParameter *pParameterX,
OpenCOR::CellMLSupport::CellmlFileRuntimeParameter *pParameterY);
void graphRequired(CellMLSupport::CellmlFileRuntimeParameter *pParameterX,
CellMLSupport::CellmlFileRuntimeParameter *pParameterY);

public slots:
void updateParameters(double pCurrentPoint);

private slots:
void propertyChanged(OpenCOR::Core::Property *pProperty);
void propertyChanged(Core::Property *pProperty);

void emitGraphRequired();
};
Expand Down
4 changes: 2 additions & 2 deletions ...ulation/SimulationExperimentView/src/simulationexperimentviewinformationsolverswidget.cpp
View file
Expand Up @@ -110,7 +110,7 @@ SimulationExperimentViewInformationSolversWidget::SimulationExperimentViewInform
// Keep track of changes to list properties

connect(this, &SimulationExperimentViewInformationSolversWidget::propertyChanged,
this, QOverload<OpenCOR::Core::Property *>::of(&SimulationExperimentViewInformationSolversWidget::solverChanged));
this, QOverload<Core::Property *>::of(&SimulationExperimentViewInformationSolversWidget::solverChanged));
}

//==============================================================================
Expand Down Expand Up @@ -476,7 +476,7 @@ void SimulationExperimentViewInformationSolversWidget::solverChanged(SimulationE

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

void SimulationExperimentViewInformationSolversWidget::solverChanged(OpenCOR::Core::Property *pProperty)
void SimulationExperimentViewInformationSolversWidget::solverChanged(Core::Property *pProperty)
{
// Try, for the ODE/NLA solvers list property, to handle the change in the
// list property
Expand Down
2 changes: 1 addition & 1 deletion ...imulation/SimulationExperimentView/src/simulationexperimentviewinformationsolverswidget.h
View file
Expand Up @@ -107,7 +107,7 @@ class SimulationExperimentViewInformationSolversWidget : public Core::PropertyEd
const QString &pVoiUnit);

private slots:
void solverChanged(OpenCOR::Core::Property *pProperty);
void solverChanged(Core::Property *pProperty);
};

//==============================================================================
Expand Down

0 comments on commit 626d02a

Please sign in to comment.