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

Change ws_info and tank_info types

Browse source 
This is correct C. But debuggers in C++ mode are broken and can't display
the global variables. While I hate having to do this change, I hate not
being able to debug my software because of broken tools even more.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-09-10 11:44:49 -07:00
parent e91ac60f49
commit e7fd45c7ef
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dive.h
View file

@ -732,17 +732,17 @@ struct event *get_next_event(struct event *event, char *name);
* dialog * dialog
*/ */
struct tank_info { struct tank_info_t {
const char *name; const char *name;
int cuft, ml, psi, bar; int cuft, ml, psi, bar;
}; };
extern struct tank_info tank_info[100]; extern struct tank_info_t tank_info[100];
struct ws_info { struct ws_info_t {
const char *name; const char *name;
int grams; int grams;
}; };
extern struct ws_info ws_info[100]; extern struct ws_info_t ws_info[100];
extern bool cylinder_nodata(cylinder_t *cyl); extern bool cylinder_nodata(cylinder_t *cyl);
extern bool cylinder_none(void *_data); extern bool cylinder_none(void *_data);

6
equipment.c
View file

@ -831,7 +831,7 @@ static void record_weightsystem_changes(weightsystem_t *ws, struct ws_widget *we
* we should pick up any other names from the dive * we should pick up any other names from the dive
* logs directly. * logs directly.
*/ */
struct tank_info tank_info[100] = { struct tank_info_t tank_info[100] = {
/* Need an empty entry for the no-cylinder case */ /* Need an empty entry for the no-cylinder case */
{ "", }, { "", },
@ -925,7 +925,7 @@ bad_tank_info:
* We hardcode the most common weight system types * We hardcode the most common weight system types
* This is a bit odd as the weight system types don't usually encode weight * This is a bit odd as the weight system types don't usually encode weight
*/ */
struct ws_info ws_info[100] = { struct ws_info_t ws_info[100] = {
{ N_("integrated"), 0 }, { N_("integrated"), 0 },
{ N_("belt"), 0 }, { N_("belt"), 0 },
{ N_("ankle"), 0 }, { N_("ankle"), 0 },
@ -937,7 +937,7 @@ struct ws_info ws_info[100] = {
static void fill_ws_list(GtkListStore *store) static void fill_ws_list(GtkListStore *store)
{ {
GtkTreeIter iter; GtkTreeIter iter;
struct ws_info *info = ws_info; struct ws_info_t *info = ws_info;
while (info->name) { while (info->name) {
gtk_list_store_append(store, &iter); gtk_list_store_append(store, &iter);

18
qt-ui/models.cpp
View file

@ -549,7 +549,7 @@ bool WSInfoModel::insertRows(int row, int count, const QModelIndex& parent)
bool WSInfoModel::setData(const QModelIndex& index, const QVariant& value, int role) bool WSInfoModel::setData(const QModelIndex& index, const QVariant& value, int role)
{ {
struct ws_info *info = &ws_info[index.row()]; struct ws_info_t *info = &ws_info[index.row()];
switch(index.column()) { switch(index.column()) {
case DESCRIPTION: case DESCRIPTION:
info->name = strdup(value.toByteArray().data()); info->name = strdup(value.toByteArray().data());
@ -577,7 +577,7 @@ QVariant WSInfoModel::data(const QModelIndex& index, int role) const
if (!index.isValid()) { if (!index.isValid()) {
return ret; return ret;
} }
struct ws_info *info = &ws_info[index.row()]; struct ws_info_t *info = &ws_info[index.row()];
int gr = info->grams; int gr = info->grams;
switch(role){ switch(role){
@ -636,7 +636,7 @@ const QString& WSInfoModel::biggerString() const
WSInfoModel::WSInfoModel() : QAbstractTableModel(), rows(-1) WSInfoModel::WSInfoModel() : QAbstractTableModel(), rows(-1)
{ {
struct ws_info *info = ws_info; struct ws_info_t *info = ws_info;
for (info = ws_info; info->name; info++, rows++){ for (info = ws_info; info->name; info++, rows++){
QString wsInfoName(info->name); QString wsInfoName(info->name);
if( wsInfoName.count() > biggerEntry.count()){ if( wsInfoName.count() > biggerEntry.count()){
@ -652,7 +652,7 @@ WSInfoModel::WSInfoModel() : QAbstractTableModel(), rows(-1)
void WSInfoModel::updateInfo() void WSInfoModel::updateInfo()
{ {
struct ws_info *info = ws_info; struct ws_info_t *info = ws_info;
beginRemoveRows(QModelIndex(), 0, this->rows); beginRemoveRows(QModelIndex(), 0, this->rows);
endRemoveRows(); endRemoveRows();
for (info = ws_info; info->name; info++, rows++){ for (info = ws_info; info->name; info++, rows++){
@ -675,7 +675,7 @@ void WSInfoModel::update()
endRemoveRows(); endRemoveRows();
rows = -1; rows = -1;
} }
struct ws_info *info = ws_info; struct ws_info_t *info = ws_info;
for (info = ws_info; info->name; info++, rows++); for (info = ws_info; info->name; info++, rows++);
if (rows > -1) { if (rows > -1) {
@ -705,7 +705,7 @@ bool TankInfoModel::insertRows(int row, int count, const QModelIndex& parent)
bool TankInfoModel::setData(const QModelIndex& index, const QVariant& value, int role) bool TankInfoModel::setData(const QModelIndex& index, const QVariant& value, int role)
{ {
struct tank_info *info = &tank_info[index.row()]; struct tank_info_t *info = &tank_info[index.row()];
switch(index.column()) { switch(index.column()) {
case DESCRIPTION: case DESCRIPTION:
info->name = strdup(value.toByteArray().data()); info->name = strdup(value.toByteArray().data());
@ -740,7 +740,7 @@ QVariant TankInfoModel::data(const QModelIndex& index, int role) const
return defaultModelFont(); return defaultModelFont();
} }
if (role == Qt::DisplayRole || role == Qt::EditRole) { if (role == Qt::DisplayRole || role == Qt::EditRole) {
struct tank_info *info = &tank_info[index.row()]; struct tank_info_t *info = &tank_info[index.row()];
int ml = info->ml; int ml = info->ml;
double bar = (info->psi) ? psi_to_bar(info->psi) : info->bar; double bar = (info->psi) ? psi_to_bar(info->psi) : info->bar;
@ -797,7 +797,7 @@ int TankInfoModel::rowCount(const QModelIndex& parent) const
TankInfoModel::TankInfoModel() : QAbstractTableModel(), rows(-1) TankInfoModel::TankInfoModel() : QAbstractTableModel(), rows(-1)
{ {
struct tank_info *info = tank_info; struct tank_info_t *info = tank_info;
for (info = tank_info; info->name; info++, rows++){ for (info = tank_info; info->name; info++, rows++){
QString infoName(info->name); QString infoName(info->name);
if (infoName.count() > biggerEntry.count()){ if (infoName.count() > biggerEntry.count()){
@ -818,7 +818,7 @@ void TankInfoModel::update()
endRemoveRows(); endRemoveRows();
rows = -1; rows = -1;
} }
struct tank_info *info = tank_info; struct tank_info_t *info = tank_info;
for (info = tank_info; info->name; info++, rows++); for (info = tank_info; info->name; info++, rows++);
if (rows > -1) { if (rows > -1) {