mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove biggerString() functions

Browse source 
The TankInfoModel and WeightInfoModel had biggerString() functions
to determine the correct column widths for the tank- and weight-type
columns. The users were removed around 2013. Remove these functions
and the corresponding member variable.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-04-27 16:40:55 +02:00 • committed by Dirk Hohndel
parent ef76905590
commit 4f0fd86d35
4 changed files with 10 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
qt-models/tankinfomodel.cpp
View file

@ -10,11 +10,6 @@ TankInfoModel *TankInfoModel::instance()
return &self; return &self;
} }
const QString &TankInfoModel::biggerString() const
{
return biggerEntry;
}
bool TankInfoModel::insertRows(int, int count, const QModelIndex &parent) bool TankInfoModel::insertRows(int, int count, const QModelIndex &parent)
{ {
beginInsertRows(parent, rowCount(), rowCount()); beginInsertRows(parent, rowCount(), rowCount());
@ -91,11 +86,8 @@ TankInfoModel::TankInfoModel() : rows(-1)
{ {
setHeaderDataStrings(QStringList() << tr("Description") << tr("ml") << tr("bar")); setHeaderDataStrings(QStringList() << tr("Description") << tr("ml") << tr("bar"));
struct tank_info_t *info = tank_info; struct tank_info_t *info = tank_info;
for (info = tank_info; info->name && info < tank_info + MAX_TANK_INFO; info++, rows++) { for (info = tank_info; info->name && info < tank_info + MAX_TANK_INFO; info++, rows++)
QString infoName = gettextFromC::tr(info->name); ;
if (infoName.count() > biggerEntry.count())
biggerEntry = infoName;
}
if (rows > -1) { if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows); beginInsertRows(QModelIndex(), 0, rows);
@ -111,7 +103,8 @@ void TankInfoModel::update()
rows = -1; rows = -1;
} }
struct tank_info_t *info = tank_info; struct tank_info_t *info = tank_info;
for (info = tank_info; info->name && info < tank_info + MAX_TANK_INFO; info++, rows++); for (info = tank_info; info->name && info < tank_info + MAX_TANK_INFO; info++, rows++)
;
if (rows > -1) { if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows); beginInsertRows(QModelIndex(), 0, rows);

2
qt-models/tankinfomodel.h
View file

@ -22,7 +22,6 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
const QString &biggerString() const;
void clear(); void clear();
public public
slots: slots:
@ -30,7 +29,6 @@ slots:
private: private:
int rows; int rows;
QString biggerEntry;
}; };
#endif #endif

22
qt-models/weightsysteminfomodel.cpp
View file

@ -71,20 +71,12 @@ int WSInfoModel::rowCount(const QModelIndex&) const
return rows + 1; return rows + 1;
} }
const QString &WSInfoModel::biggerString() const
{
return biggerEntry;
}
WSInfoModel::WSInfoModel() : rows(-1) WSInfoModel::WSInfoModel() : rows(-1)
{ {
setHeaderDataStrings(QStringList() << tr("Description") << tr("kg")); setHeaderDataStrings(QStringList() << tr("Description") << tr("kg"));
struct ws_info_t *info; struct ws_info_t *info;
for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++) { for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
QString wsInfoName = gettextFromC::tr(info->name); ;
if (wsInfoName.count() > biggerEntry.count())
biggerEntry = wsInfoName;
}
if (rows > -1) { if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows); beginInsertRows(QModelIndex(), 0, rows);
@ -98,11 +90,8 @@ void WSInfoModel::updateInfo()
beginRemoveRows(QModelIndex(), 0, this->rows); beginRemoveRows(QModelIndex(), 0, this->rows);
endRemoveRows(); endRemoveRows();
rows = -1; rows = -1;
for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++) { for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
QString wsInfoName = gettextFromC::tr(info->name); ;
if (wsInfoName.count() > biggerEntry.count())
biggerEntry = wsInfoName;
}
if (rows > -1) { if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows); beginInsertRows(QModelIndex(), 0, rows);
@ -118,7 +107,8 @@ void WSInfoModel::update()
rows = -1; rows = -1;
} }
struct ws_info_t *info; struct ws_info_t *info;
for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++); for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
;
if (rows > -1) { if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows); beginInsertRows(QModelIndex(), 0, rows);

1
qt-models/weightsysteminfomodel.h
View file

@ -20,7 +20,6 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
const QString &biggerString() const;
void clear(); void clear();
void update(); void update();
void updateInfo(); void updateInfo();