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

Don't redeclare variables of the same name

Browse source 
This isn't broken, but it's confusing.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-02-12 13:24:40 -08:00
parent c86822c2f4
commit af5ad2033d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/printlayout.cpp
View file

@ -326,7 +326,7 @@ void PrintLayout::printTable()
int accW = 0; int accW = 0;
int cols = model.columns; int cols = model.columns;
int tableW = table.width(); int tableW = table.width();
for (int i = 0; i < model.columns; i++) { for (i = 0; i < model.columns; i++) {
int pw = qCeil((qreal)(tablePrintColumnWidths.at(i) * table.width()) / 100.0); int pw = qCeil((qreal)(tablePrintColumnWidths.at(i) * table.width()) / 100.0);
accW += pw; accW += pw;
if (i == cols - 1 && accW > tableW) /* adjust last column */ if (i == cols - 1 && accW > tableW) /* adjust last column */
@ -354,7 +354,7 @@ void PrintLayout::printTable()
for (unsigned int pass = 0; pass < sizeof(passes) / sizeof(passes[0]); pass++) { for (unsigned int pass = 0; pass < sizeof(passes) / sizeof(passes[0]); pass++) {
progress = headings = accH = 0; progress = headings = accH = 0;
total = model.rows - lastAccIndex; total = model.rows - lastAccIndex;
for (int i = lastAccIndex; i < model.rows; i++) { for (i = lastAccIndex; i < model.rows; i++) {
rowH = table.rowHeight(i); rowH = table.rowHeight(i);
accH += rowH; accH += rowH;
if (isHeading) { if (isHeading) {
@ -386,7 +386,7 @@ void PrintLayout::printTable()
painter.scale(scaleX, scaleY); painter.scale(scaleX, scaleY);
total = pageIndexes.size() - 1; total = pageIndexes.size() - 1;
progress = 0; progress = 0;
for (int i = 0; i < total; i++) { for (i = 0; i < total; i++) {
if (i > 0) if (i > 0)
printer->newPage(); printer->newPage();
QRegion region(0, pageIndexes.at(i) - 1, QRegion region(0, pageIndexes.at(i) - 1,

8
qt-ui/profilegraphics.cpp
View file

@ -145,7 +145,7 @@ void ProfileGraphicsView::contextMenuEvent(QContextMenuEvent* event)
EventItem *item = dynamic_cast<EventItem*>(i); EventItem *item = dynamic_cast<EventItem*>(i);
if (!item) if (!item)
continue; continue;
QAction *action = new QAction(&m); action = new QAction(&m);
action->setText(tr("Remove Event")); action->setText(tr("Remove Event"));
action->setData(QVariant::fromValue<void*>(item)); // so we know what to remove. action->setData(QVariant::fromValue<void*>(item)); // so we know what to remove.
connect(action, SIGNAL(triggered(bool)), this, SLOT(removeEvent())); connect(action, SIGNAL(triggered(bool)), this, SLOT(removeEvent()));
@ -1192,11 +1192,11 @@ void ProfileGraphicsView::plot_depth_profile()
item->setPen(pen); item->setPen(pen);
scene()->addItem(item); scene()->addItem(item);
struct text_render_options tro = {DEPTH_TEXT_SIZE, MEAN_DEPTH, LEFT, TOP}; struct text_render_options depth_tro = {DEPTH_TEXT_SIZE, MEAN_DEPTH, LEFT, TOP};
QString depthLabel = get_depth_string(gc.pi.meandepth, true, true); QString depthLabel = get_depth_string(gc.pi.meandepth, true, true);
plot_text(&tro, QPointF(gc.leftx, gc.pi.meandepth), depthLabel, item); plot_text(&depth_tro, QPointF(gc.leftx, gc.pi.meandepth), depthLabel, item);
tro.hpos = RIGHT; tro.hpos = RIGHT;
plot_text(&tro, QPointF(gc.pi.entry[gc.pi.nr - 1].sec, gc.pi.meandepth), depthLabel, item); plot_text(&depth_tro, QPointF(gc.pi.entry[gc.pi.nr - 1].sec, gc.pi.meandepth), depthLabel, item);
} }
#if 0 #if 0