t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CanConnectionModel: Remove superflous breaks after return

Browse Source 
Clang complained about them.
This commit is contained in:
Andre Hartmann
2017-11-26 16:26:25 +01:00
parent d93c58725c
commit cfc024f98a
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/canconnectionmodel.cpp
+2 -18
View File
@@ -23,28 +23,20 @@ QVariant CANConnectionModel::headerData(int section, Qt::Orientation orientation
{ {
case 0: case 0:
return QString(tr("Bus")); return QString(tr("Bus"));
break;
case 1: case 1:
return QString(tr("Type")); return QString(tr("Type"));
break;
case 2: case 2:
return QString(tr("Port")); return QString(tr("Port"));
break;
case 3: case 3:
return QString(tr("Speed")); return QString(tr("Speed"));
break;
case 4: case 4:
return QString(tr("Listen Only")); return QString(tr("Listen Only"));
break;
case 5: case 5:
return QString(tr("Single Wire")); return QString(tr("Single Wire"));
break;
case 6: case 6:
return QString(tr("Active")); return QString(tr("Active"));
break;
case 7: case 7:
return QString(tr("Status")); return QString(tr("Status"));
break;
} }
} }
@@ -94,19 +86,15 @@ Qt::ItemFlags CANConnectionModel::flags(const QModelIndex &index) const
{ {
case 3: //speed case 3: //speed
if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled; if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled;
else return Qt::ItemFlag::NoItemFlags; return Qt::ItemFlag::NoItemFlags;
break;
case 4: //listen only case 4: //listen only
case 5: //single wire case 5: //single wire
if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable; if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable;
else return Qt::ItemFlag::NoItemFlags; return Qt::ItemFlag::NoItemFlags;
break;
case 6: //enabled case 6: //enabled
return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable; return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable;
break;
default: default:
return Qt::ItemFlag::ItemIsEnabled; return Qt::ItemFlag::ItemIsEnabled;
break;
} }
} }
@@ -164,7 +152,6 @@ QVariant CANConnectionModel::data(const QModelIndex &index, int role) const
case 0: //bus case 0: //bus
//return QString::number(busId); //return QString::number(busId);
return QString::number(index.row()); return QString::number(index.row());
break;
case 1: //type case 1: //type
if (conn_p) if (conn_p)
switch (conn_p->getType()) { switch (conn_p->getType()) {
@@ -200,13 +187,10 @@ QVariant CANConnectionModel::data(const QModelIndex &index, int role) const
{ {
case 4: case 4:
return (bus.listenOnly) ? Qt::Checked : Qt::Unchecked; return (bus.listenOnly) ? Qt::Checked : Qt::Unchecked;
break;
case 5: case 5:
return (bus.singleWire) ? Qt::Checked : Qt::Unchecked; return (bus.singleWire) ? Qt::Checked : Qt::Unchecked;
break;
case 6: case 6:
return (bus.active) ? Qt::Checked : Qt::Unchecked; return (bus.active) ? Qt::Checked : Qt::Unchecked;
break;
} }
} }