ce29dc775650 — Chris Cannam 3 years ago
Fix compiler warnings
M src/changesetdetailitem.cpp +2 -12
@@ 65,14 65,13 @@ ChangesetDetailItem::itemChange(Graphics
 
 void
 ChangesetDetailItem::paint(QPainter *paint,
-			   const QStyleOptionGraphicsItem *option,
-			   QWidget *w)
+			   const QStyleOptionGraphicsItem *,
+			   QWidget *)
 {
     paint->save();
     
     ColourSet *colourSet = ColourSet::instance();
     QColor branchColour = colourSet->getColourFor(m_changeset->branch());
-    QColor userColour = colourSet->getColourFor(m_changeset->author());
 
     QTransform t = paint->worldTransform();
     float scale = std::min(t.m11(), t.m22());

          
@@ 105,15 104,6 @@ ChangesetDetailItem::paint(QPainter *pai
     pts.push_back(QPointF(0, height/3 - 5));
     paint->drawPolygon(QPolygonF(pts));
 
-/*
-    paint->setBrush(branchColour);
-    QVector<QPointF> pts;
-    pts.push_back(QPointF(width/2 - 5, 0));
-    pts.push_back(QPointF(width/2 + 5, 0));
-    pts.push_back(QPointF(width/2, -10));
-    pts.push_back(QPointF(width/2 - 5, 0));
-    paint->drawPolygon(QPolygonF(pts));
-*/
     m_doc->drawContents(paint, r);
 
     paint->restore();

          
M src/changesetitem.cpp +0 -1
@@ 513,7 513,6 @@ ChangesetItem::paintSimple(QPainter *pai
 	f.setPixelSize(ps);
     }
 
-    bool showText = (scale >= 0.2);
     bool showProperLines = (scale >= 0.1);
 
     if (!showProperLines) {

          
M src/historywidget.cpp +0 -2
@@ 219,8 219,6 @@ void HistoryWidget::layoutAll()
     setChangesetParents();
 
     ChangesetScene *scene = new ChangesetScene();
-    ChangesetItem *tipItem = 0;
-
     QGraphicsScene *oldScene = m_panned->scene();
 
     m_panned->setScene(0);

          
M src/mainwindow.cpp +3 -6
@@ 858,7 858,7 @@ void MainWindow::hgIgnoreFiles(QStringLi
     hgRefresh();
 }
 
-void MainWindow::hgUnIgnoreFiles(QStringList files)
+void MainWindow::hgUnIgnoreFiles(QStringList)
 {
     // Not implemented: edit the .hgignore instead
     hgEditIgnore();

          
@@ 2048,7 2048,7 @@ void MainWindow::reportAuthFailed(QStrin
          output);
 }
 
-void MainWindow::commandStarting(HgAction action)
+void MainWindow::commandStarting(HgAction)
 {
     m_commandSequenceInProgress = true;
 }

          
@@ 2591,7 2591,7 @@ void MainWindow::commandCompleted(HgActi
     }
 }
 
-void MainWindow::commandCancelled(HgAction cancelledAction)
+void MainWindow::commandCancelled(HgAction)
 {
     // Originally I had this checking whether the cancelled action was
     // a network one and, if so, calling hgQueryPaths to update the

          
@@ 3115,9 3115,6 @@ void MainWindow::createToolBars()
     spacerBefore = spacerAfter = "  ";
 #endif
 
-    bool spacingReqd = false;
-    QString spacer = "";
-
     m_repoToolBar = addToolBar(tr("Remote"));
     m_repoToolBar->setIconSize(QSize(sz, sz));
     if (spacerBefore != "") {

          
M src/multichoicedialog.cpp +2 -2
@@ 221,14 221,14 @@ MultiChoiceDialog::browse()
 }
 
 void
-MultiChoiceDialog::urlChanged(const QString &s)
+MultiChoiceDialog::urlChanged(const QString &)
 {
     updateOkButton();
     updateFileComboFromURL();
 }
 
 void
-MultiChoiceDialog::fileChanged(const QString &s)
+MultiChoiceDialog::fileChanged(const QString &)
 {
     updateOkButton();
 }

          
M src/panned.cpp +5 -1
@@ 88,7 88,7 @@ Panned::paintEvent(QPaintEvent *e)
 }
 
 void
-Panned::drawForeground(QPainter *paint, const QRectF &)
+Panned::drawForeground(QPainter *, const QRectF &)
 {
     QPointF nearpt = mapToScene(0, 0);
     QPointF farpt = mapToScene(width(), height());

          
@@ 222,6 222,10 @@ Panned::updateDragDirection(QPoint pos)
             m_dragDirection = FreeDrag;
         }
         break;
+
+    case FreeDrag:
+        // stick with it
+        break;
     };
 }