diff options
Diffstat (limited to 'qt-ui')
-rw-r--r-- | qt-ui/printlayout.cpp | 6 | ||||
-rw-r--r-- | qt-ui/profilegraphics.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index ec30b8369..d9a5a5c27 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -326,7 +326,7 @@ void PrintLayout::printTable() int accW = 0; int cols = model.columns; 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); accW += pw; 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++) { progress = headings = accH = 0; total = model.rows - lastAccIndex; - for (int i = lastAccIndex; i < model.rows; i++) { + for (i = lastAccIndex; i < model.rows; i++) { rowH = table.rowHeight(i); accH += rowH; if (isHeading) { @@ -386,7 +386,7 @@ void PrintLayout::printTable() painter.scale(scaleX, scaleY); total = pageIndexes.size() - 1; progress = 0; - for (int i = 0; i < total; i++) { + for (i = 0; i < total; i++) { if (i > 0) printer->newPage(); QRegion region(0, pageIndexes.at(i) - 1, diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp index 6ae765d7a..c63f7159d 100644 --- a/qt-ui/profilegraphics.cpp +++ b/qt-ui/profilegraphics.cpp @@ -145,7 +145,7 @@ void ProfileGraphicsView::contextMenuEvent(QContextMenuEvent* event) EventItem *item = dynamic_cast<EventItem*>(i); if (!item) continue; - QAction *action = new QAction(&m); + action = new QAction(&m); action->setText(tr("Remove Event")); action->setData(QVariant::fromValue<void*>(item)); // so we know what to remove. connect(action, SIGNAL(triggered(bool)), this, SLOT(removeEvent())); @@ -1192,11 +1192,11 @@ void ProfileGraphicsView::plot_depth_profile() item->setPen(pen); 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); - 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; - 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 |