Skip to content

Commit c9b7a45

Browse files
committed
Fixed some compiler warnings
1 parent dee95d8 commit c9b7a45

40 files changed

+91
-94
lines changed

range/Range/src/action.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,9 @@ void Action::onModelOpen()
263263

264264
void Action::onModelSave()
265265
{
266-
QList<uint> selectedModelIDs = Session::getInstance().getSelectedModelIDs();
267-
268-
for (int i=0;i<selectedModelIDs.size();i++)
266+
foreach (uint selectedModelID,Session::getInstance().getSelectedModelIDs())
269267
{
270-
Model &rModel = Session::getInstance().getModel(selectedModelIDs[i]);
268+
Model &rModel = Session::getInstance().getModel(selectedModelID);
271269

272270
QString fileName = ModelIO::getModelSaveName(MainSettings::getInstance(),this->mainWindow,rModel);
273271

@@ -1218,13 +1216,11 @@ void Action::onGeometrySurfaceCloseHole()
12181216
return;
12191217
}
12201218

1221-
QList<uint> modelIDs = pickList.getModelIDs();
1222-
1223-
for (int i=0;i<modelIDs.size();i++)
1219+
foreach (uint modelID,pickList.getModelIDs())
12241220
{
12251221
QList<uint> holeIDs;
12261222

1227-
QVector<PickItem> pickItems = pickList.getItems(modelIDs[i]);
1223+
QVector<PickItem> pickItems = pickList.getItems(modelID);
12281224
for (int j=0;j<pickItems.size();j++)
12291225
{
12301226
if (pickItems[j].getItemType() == PICK_ITEM_HOLE_ELEMENT)
@@ -1238,7 +1234,7 @@ void Action::onGeometrySurfaceCloseHole()
12381234
}
12391235
}
12401236

1241-
ModelActionInput modelActionInput(modelIDs[i]);
1237+
ModelActionInput modelActionInput(modelID);
12421238
modelActionInput.setCloseSurfaceHole(holeIDs);
12431239

12441240
ModelAction *modelAction = new ModelAction;

range/Range/src/action_definition.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ QList<ActionType> ActionDefinition::getActionTypes(ActionGroupTypeMask actionGro
9090
{
9191
QList<ActionType> actionTypes;
9292

93-
for (int i=0;i<this->actionDesc.size();i++)
93+
foreach (ActionDefinitionItem item, this->actionDesc)
9494
{
95-
if (this->actionDesc[i].getGroupType() & actionGroupTypeMask)
95+
if (item.getGroupType() & actionGroupTypeMask)
9696
{
97-
actionTypes.push_back(this->actionDesc[i].getType());
97+
actionTypes.push_back(item.getType());
9898
}
9999
}
100100

range/Range/src/action_definition_item.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ ActionDefinitionItem &ActionDefinitionItem::operator =(const ActionDefinitionIte
5555
return (*this);
5656
}
5757

58-
ActionType ActionDefinitionItem::getType(void) const
58+
ActionType ActionDefinitionItem::getType() const
5959
{
6060
return this->type;
6161
}
6262

63-
ActionGroupType ActionDefinitionItem::getGroupType(void) const
63+
ActionGroupType ActionDefinitionItem::getGroupType() const
6464
{
6565
return this->groupType;
6666
}
6767

68-
const QString &ActionDefinitionItem::getShortcut(void) const
68+
const QString &ActionDefinitionItem::getShortcut() const
6969
{
7070
return this->shortCut;
7171
}

range/Range/src/action_definition_item.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ typedef enum _ActionType
150150

151151
class Action;
152152

153-
typedef void (Action::*PointerToMemberFunction)(void);
153+
typedef void (Action::*PointerToMemberFunction)();
154154

155155
class ActionDefinitionItem
156156
{
@@ -179,7 +179,7 @@ class ActionDefinitionItem
179179
const QString &desc = QString(),
180180
const QString &shortCut = QString(),
181181
const QString &icon = QString(),
182-
PointerToMemberFunction slot = 0);
182+
PointerToMemberFunction slot = nullptr);
183183

184184
//! Copy constructor.
185185
ActionDefinitionItem(const ActionDefinitionItem &actionDefinitionItem);
@@ -191,13 +191,13 @@ class ActionDefinitionItem
191191
ActionDefinitionItem &operator =(const ActionDefinitionItem &actionDefinitionItem);
192192

193193
//! Return action type.
194-
ActionType getType(void) const;
194+
ActionType getType() const;
195195

196196
//! Return action group type.
197-
ActionGroupType getGroupType(void) const;
197+
ActionGroupType getGroupType() const;
198198

199199
//! Return const reference to shortcut.
200-
const QString &getShortcut(void) const;
200+
const QString &getShortcut() const;
201201

202202
//! Return action group name.
203203
static QString getGroupName(ActionGroupType groupType);

range/Range/src/bc_manager_tree.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ typedef enum _BoundaryConditionTreeColumn
2323
BC_TREE_N_COLUMNS
2424
} BoundaryConditionTreeColumn;
2525

26-
BCManagerTree::BCManagerTree(QObject *parent) :
27-
QTreeWidget((QWidget*)parent),
26+
BCManagerTree::BCManagerTree(QWidget *parent) :
27+
QTreeWidget(parent),
2828
doNotPopulate(false)
2929
{
3030
this->setSelectionMode(QAbstractItemView::SingleSelection);

range/Range/src/bc_manager_tree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class BCManagerTree : public QTreeWidget
3333
public:
3434

3535
//! Constructor.
36-
explicit BCManagerTree(QObject *parent = nullptr);
36+
explicit BCManagerTree(QWidget *parent = nullptr);
3737

3838
protected:
3939

range/Range/src/draw_engine_circle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ DrawEngineCircle::DrawEngineCircle(QObject *parent) :
4949
this->updateModel();
5050
}
5151

52-
RModelRaw DrawEngineCircle::generate(void) const
52+
RModelRaw DrawEngineCircle::generate() const
5353
{
5454
RModelRaw modelRaw;
5555

range/Range/src/draw_engine_circle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DrawEngineCircle : public DrawEngineObject
2626
protected:
2727

2828
//! Generate RAW model from input parameters.
29-
virtual RModelRaw generate(void) const;
29+
virtual RModelRaw generate() const;
3030

3131
};
3232

range/Range/src/draw_engine_cylinder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ DrawEngineCylinder::DrawEngineCylinder(QObject *parent) :
6060
this->updateModel();
6161
}
6262

63-
RModelRaw DrawEngineCylinder::generate(void) const
63+
RModelRaw DrawEngineCylinder::generate() const
6464
{
6565
RModelRaw modelRaw;
6666

range/Range/src/draw_engine_cylinder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DrawEngineCylinder : public DrawEngineObject
2626
protected:
2727

2828
//! Generate RAW model from input parameters.
29-
virtual RModelRaw generate(void) const;
29+
virtual RModelRaw generate() const;
3030

3131
};
3232

0 commit comments

Comments
 (0)