OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1292 Fixed CppCheck Issues in AppFwk/cafUserInterface

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-06 19:15:33 +01:00
parent 63baebc698
commit 749ce8e8af
18 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafUserInterface/cafAboutDialog.h
View File

@ -52,7 +52,7 @@ namespace caf {
class AboutDialog : public QDialog
{
public:
AboutDialog(QWidget* parent);
explicit AboutDialog(QWidget* parent);
void setApplicationName(const QString& appName);
void setApplicationVersion(const QString& ver);

2
Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxDelegate.h
View File

@ -52,7 +52,7 @@ class PdmUiCheckBoxDelegate : public QStyledItemDelegate
Q_OBJECT
public:
PdmUiCheckBoxDelegate( QObject* pParent = 0 );
explicit PdmUiCheckBoxDelegate( QObject* pParent = 0 );
virtual ~PdmUiCheckBoxDelegate();
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
View File

@ -143,8 +143,6 @@ QWidget* PdmUiColorEditor::createLabelWidget(QWidget * parent)
//--------------------------------------------------------------------------------------------------
void PdmUiColorEditor::colorSelectionClicked()
{
bool ok = false;
QColorDialog::ColorDialogOptions flags;
if (m_attributes.showAlpha)
{

2
Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.h
View File

@ -85,7 +85,7 @@ private:
std::map<QString, QPointer<QGroupBox> > m_newGroupBoxes; ///< used temporarily to store the new(complete) set of group boxes
QPointer<QWidget> m_mainWidget;
QGridLayout* m_layout;
QPointer<QGridLayout> m_layout;
};

2
Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp
View File

@ -58,7 +58,7 @@
class PdmDoubleValidator : public QDoubleValidator
{
public:
PdmDoubleValidator(QObject * parent = 0) : QDoubleValidator(parent)
explicit PdmDoubleValidator(QObject * parent = 0) : QDoubleValidator(parent)
{
}

11
Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
View File

@ -63,13 +63,12 @@ class PdmUniqueIdValidator : public QValidator
{
public:
PdmUniqueIdValidator(const std::set<int>& usedIds, bool multipleSelectionOfSameFieldsSelected, const QString& errorMessage, QObject* parent)
: QValidator(parent)
: QValidator(parent),
m_usedIds(usedIds),
m_nextValidValue(0),
m_multipleSelectionOfSameFieldsSelected(multipleSelectionOfSameFieldsSelected),
m_errorMessage(errorMessage)
{
m_usedIds = usedIds;
m_nextValidValue = 0;
m_multipleSelectionOfSameFieldsSelected = multipleSelectionOfSameFieldsSelected;
m_errorMessage = errorMessage;
computeNextValidId();
}

2
Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
View File

@ -66,7 +66,7 @@
class MyStringListModel : public QStringListModel
{
public:
MyStringListModel(QObject *parent = 0) : m_isItemsEditable(false), QStringListModel(parent) { }
explicit MyStringListModel(QObject *parent = 0) : m_isItemsEditable(false), QStringListModel(parent) { }
virtual Qt::ItemFlags flags (const QModelIndex& index) const
{

3
Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp
View File

@ -208,6 +208,9 @@ void caf::UiListViewModelPdm::setPdmData(PdmObjectCollection* objectGroup, const
///
//--------------------------------------------------------------------------------------------------
PdmUiListViewEditor::PdmUiListViewEditor()
: m_layout(nullptr),
m_tableView(nullptr),
m_tableModelPdm(nullptr)
{
}

2
Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.h
View File

@ -78,7 +78,7 @@ class UiListViewModelPdm : public QAbstractTableModel
Q_OBJECT
public:
UiListViewModelPdm(QObject* parent);
explicit UiListViewModelPdm(QObject* parent);
void setPdmData(PdmObjectCollection* objectGroup, const QString& configName);

3
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.cpp
View File

@ -144,8 +144,7 @@ void PdmUiPropertyView::showProperties( PdmObjectHandle* object)
}
// Create widget to handle this
QWidget* propertyWidget = NULL;
propertyWidget = m_currentObjectView->getOrCreateWidget(m_placeholder);
QWidget* propertyWidget = m_currentObjectView->getOrCreateWidget(m_placeholder);
assert(propertyWidget);

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
View File

@ -62,7 +62,7 @@ namespace caf
class FocusEventHandler : public QObject
{
public:
FocusEventHandler(PdmUiTableViewEditor* tableViewEditor)
explicit FocusEventHandler(PdmUiTableViewEditor* tableViewEditor)
: QObject(tableViewEditor)
{
m_tableViewEditor = tableViewEditor;
@ -93,7 +93,9 @@ PdmUiTableViewEditor::PdmUiTableViewEditor()
{
m_layout = NULL;;
m_tableView = NULL;
m_tableHeading = NULL;
m_tableModelPdm = NULL;
m_tableHeadingIcon = NULL;
m_pdmListField = NULL;
m_delegate = NULL;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewModel.h
View File

@ -64,7 +64,7 @@ class PdmUiTableViewModel : public QAbstractTableModel
Q_OBJECT
public:
PdmUiTableViewModel(QWidget* parent);
explicit PdmUiTableViewModel(QWidget* parent);
QItemSelection modelIndexFromPdmObject(PdmObjectHandle* pdmObject);
PdmFieldHandle* getField(const QModelIndex &index) const;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeItemEditor.h
View File

@ -50,7 +50,7 @@ namespace caf
class PdmUiTreeItemEditor: public PdmUiEditorHandle
{
public:
PdmUiTreeItemEditor(PdmUiItem* uiItem);
explicit PdmUiTreeItemEditor(PdmUiItem* uiItem);
virtual ~PdmUiTreeItemEditor() {};
void setTreeViewEditor(PdmUiTreeEditorHandle* treeViewEditor) { m_treeViewEditor = treeViewEditor; }

6
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
View File

@ -64,7 +64,7 @@ namespace caf
class PdmUiTreeViewWidget : public QTreeView
{
public:
PdmUiTreeViewWidget(QWidget* parent = 0) : QTreeView(parent) {};
explicit PdmUiTreeViewWidget(QWidget* parent = 0) : QTreeView(parent) {};
virtual ~PdmUiTreeViewWidget() {};
bool isTreeItemEditWidgetActive() const
@ -105,7 +105,9 @@ PdmUiTreeViewEditor::PdmUiTreeViewEditor()
m_useDefaultContextMenu = false;
m_updateSelectionManager = false;
m_appendClassNameToUiItemText = false;
m_layout = nullptr;
m_treeView = nullptr;
m_treeViewModel = nullptr;
}
//--------------------------------------------------------------------------------------------------

7
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
View File

@ -242,7 +242,7 @@ void PdmUiTreeViewModel::updateSubTreeRecursive(const QModelIndex& existingSubTr
}
// Delete items with largest index first from existing
for (std::vector<int>::reverse_iterator it = indicesToRemoveFromExisting.rbegin(); it != indicesToRemoveFromExisting.rend(); it++)
for (std::vector<int>::reverse_iterator it = indicesToRemoveFromExisting.rbegin(); it != indicesToRemoveFromExisting.rend(); ++it)
{
this->beginRemoveRows(existingSubTreeRootModIdx, *it, *it);
existingSubTreeRoot->removeChildren(*it, 1);
@ -320,7 +320,7 @@ void PdmUiTreeViewModel::updateSubTreeRecursive(const QModelIndex& existingSubTr
}
// Delete new items from source because they have been moved into newMergedOrdering
for (std::vector<int>::reverse_iterator it = indicesToRemoveFromSource.rbegin(); it != indicesToRemoveFromSource.rend(); it++)
for (std::vector<int>::reverse_iterator it = indicesToRemoveFromSource.rbegin(); it != indicesToRemoveFromSource.rend(); ++it)
{
// Use the removeChildrenNoDelete() to remove the pointer from the list without deleting the pointer
sourceSubTreeRoot->removeChildrenNoDelete(*it, 1);
@ -533,9 +533,6 @@ QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
}
bool isObjRep = uitreeOrdering->isRepresentingObject();
bool isFieldRep = uitreeOrdering->isRepresentingField();
bool isDisplayOnly = uitreeOrdering->isDisplayItemOnly();
if (role == Qt::DisplayRole && !uitreeOrdering->isValid())
{

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.h
View File

@ -60,7 +60,7 @@ class PdmUiTreeViewModel : public QAbstractItemModel
Q_OBJECT
public:
PdmUiTreeViewModel(PdmUiTreeViewEditor* treeViewEditor);
explicit PdmUiTreeViewModel(PdmUiTreeViewEditor* treeViewEditor);
void setPdmItemRoot(PdmUiItem* rootItem);
void updateSubTree(PdmUiItem* subTreeRoot);

43
Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp
View File

@ -256,9 +256,9 @@ namespace caf {
std::vector<size_t>& maxProgressStack_v = maxProgressStack();
size_t levCount = 1;
for (size_t levelDepth = 0; levelDepth < maxProgressStack().size(); ++levelDepth)
for (size_t levelDepth = 0; levelDepth < maxProgressStack_v.size(); ++levelDepth)
{
levCount *= maxProgressStack()[levelDepth];
levCount *= maxProgressStack_v[levelDepth];
}
return levCount;
}
@ -274,10 +274,10 @@ namespace caf {
std::vector<size_t>& progressSpanStack_v = progressSpanStack();
std::vector<size_t>& maxProgressStack_v = maxProgressStack();
for (int i = static_cast<int>(progressStack().size()) - 1; i >= 0; --i)
for (int i = static_cast<int>(progressStack_v.size()) - 1; i >= 0; --i)
{
size_t span = (i < 1) ? 1 : progressSpanStack()[i - 1];
progress = span*(progress + progressStack()[i]) / maxProgressStack()[i];
size_t span = (i < 1) ? 1 : progressSpanStack_v[i - 1];
progress = span*(progress + progressStack_v[i]) / maxProgressStack_v[i];
}
size_t totalIntProgress = static_cast<size_t>(currentTotalMaxProgressValue()*progress);
@ -332,7 +332,7 @@ namespace caf {
std::vector<size_t>& progressSpanStack_v = progressSpanStack();
std::vector<size_t>& maxProgressStack_v = maxProgressStack();
if (!maxProgressStack().size())
if (!maxProgressStack_v.size())
{
//progressDialog()->setWindowModality(Qt::ApplicationModal);
progressDialog()->setMinimum(0);
@ -341,9 +341,9 @@ namespace caf {
progressDialog()->show();
}
maxProgressStack().push_back(maxProgressValue);
progressStack().push_back(0);
progressSpanStack().push_back(1);
maxProgressStack_v.push_back(maxProgressValue);
progressStack_v.push_back(0);
progressSpanStack_v.push_back(1);
titleStack().push_back(title);
descriptionStack().push_back("");
@ -382,13 +382,13 @@ namespace caf {
std::vector<size_t>& progressSpanStack_v = progressSpanStack();
std::vector<size_t>& maxProgressStack_v = maxProgressStack();
if (progressValue == progressStack().back()) return; // Do nothing if no progress.
if (progressValue == progressStack_v.back()) return; // Do nothing if no progress.
// Guard against the max value set for this level
if (progressValue > maxProgressStack().back()) progressValue = maxProgressStack().back();
if (progressValue > maxProgressStack_v.back()) progressValue = maxProgressStack_v.back();
progressStack().back() = progressValue;
progressSpanStack().back() = 1;
progressStack_v.back() = progressValue;
progressSpanStack_v.back() = 1;
int totalProgress = static_cast<int>(currentTotalProgress());
int totalMaxProgress = static_cast<int>(currentTotalMaxProgressValue());
@ -412,10 +412,9 @@ namespace caf {
std::vector<size_t>& progressStack_v = progressStack();
std::vector<size_t>& progressSpanStack_v = progressSpanStack();
std::vector<size_t>& maxProgressStack_v = maxProgressStack();
assert(progressStack().size());
ProgressInfoStatic::setProgress(progressStack().back() + progressSpanStack().back());
assert(progressStack_v.size());
ProgressInfoStatic::setProgress(progressStack_v.back() + progressSpanStack_v.back());
}
@ -443,16 +442,16 @@ namespace caf {
std::vector<size_t>& progressSpanStack_v = progressSpanStack();
std::vector<size_t>& maxProgressStack_v = maxProgressStack();
assert(maxProgressStack().size() && progressStack().size() && progressSpanStack().size() && titleStack().size() && descriptionStack().size());
assert(maxProgressStack_v.size() && progressStack_v.size() && progressSpanStack_v.size() && titleStack().size() && descriptionStack().size());
// Set progress to max value, and leave it there until somebody touches the progress again
ProgressInfoStatic::setProgress(maxProgressStack().back());
ProgressInfoStatic::setProgress(maxProgressStack_v.back());
// Pop all the stacks
maxProgressStack().pop_back();
progressStack().pop_back();
progressSpanStack().pop_back();
maxProgressStack_v.pop_back();
progressStack_v.pop_back();
progressSpanStack_v.pop_back();
titleStack().pop_back();
descriptionStack().pop_back();
@ -460,7 +459,7 @@ namespace caf {
progressDialog()->setLabelText(currentComposedLabel());
// If we are finishing the last level, clean up
if (!maxProgressStack().size())
if (!maxProgressStack_v.size())
{
if (progressDialog() != NULL)
{

2
Fwk/AppFwk/cafUserInterface/cafUiProcess.h
View File

@ -60,7 +60,7 @@ private:
QTime m_timer;
public:
UiProcess(QObject* pParent = 0);
explicit UiProcess(QObject* pParent = 0);
private:
void doEmitStatusMsg(const QString& msg, int statusMsgType);