diff options
author | Aleks Kissinger <aleks0@gmail.com> | 2018-10-01 16:19:21 +0200 |
---|---|---|
committer | Aleks Kissinger <aleks0@gmail.com> | 2018-10-01 16:19:21 +0200 |
commit | e7a10091b64ddeb1d3e21e3f36abbf412021c815 (patch) | |
tree | fffe201f56a3c294cf34e4e11304317becca4504 /src/data | |
parent | f448114bc7eaa9b99780c108d5172f649c626a88 (diff) |
fixed many warnings
Diffstat (limited to 'src/data')
-rw-r--r-- | src/data/edgestyle.cpp | 6 | ||||
-rw-r--r-- | src/data/graph.cpp | 2 | ||||
-rw-r--r-- | src/data/graphelementdata.cpp | 8 | ||||
-rw-r--r-- | src/data/graphelementdata.h | 5 | ||||
-rw-r--r-- | src/data/tikzparser.y | 2 |
5 files changed, 14 insertions, 9 deletions
diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp index 275393e..8f3008f 100644 --- a/src/data/edgestyle.cpp +++ b/src/data/edgestyle.cpp @@ -71,6 +71,8 @@ QPen EdgeStyle::pen() const pat << 1.0 << 1.0;
p.setDashPattern(pat);
break;
+ case Solid:
+ break;
}
return p;
@@ -114,6 +116,8 @@ QIcon EdgeStyle::icon() const case Flat:
painter.drawLine(90,40,90,60);
break;
+ case NoTip:
+ break;
}
switch (arrowTail()) {
@@ -124,6 +128,8 @@ QIcon EdgeStyle::icon() const case Flat:
painter.drawLine(10,40,10,60);
break;
+ case NoTip:
+ break;
}
diff --git a/src/data/graph.cpp b/src/data/graph.cpp index b63289b..bba2061 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -341,7 +341,7 @@ void Graph::reflectNodes(QSet<Node*> nds, bool horizontal) void Graph::rotateNodes(QSet<Node*> nds, bool clockwise)
{
- QRectF bds = boundsForNodes(nds);
+ //QRectF bds = boundsForNodes(nds);
// QPointF ctr = bds.center();
// ctr.setX((float)floor(ctr.x() * 4.0f) / 4.0f);
// ctr.setY((float)floor(ctr.y() * 4.0f) / 4.0f);
diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 66ef16f..25ba08e 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -118,9 +118,9 @@ QVariant GraphElementData::data(const QModelIndex &index, int role) const QString s = (index.column() == 0) ? p.key() : p.value();
return QVariant(s);
}
- } else {
- return QVariant();
}
+
+ return QVariant();
}
QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const
@@ -133,12 +133,12 @@ QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, return QVariant();
}
-QModelIndex GraphElementData::index(int row, int column, const QModelIndex &parent) const
+QModelIndex GraphElementData::index(int row, int column, const QModelIndex &) const
{
return createIndex(row, column, (void*)0);
}
-QModelIndex GraphElementData::parent(const QModelIndex &index) const
+QModelIndex GraphElementData::parent(const QModelIndex &) const
{
// there is no nesting, so always return an invalid index
return QModelIndex();
diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index e57cf49..acaada7 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -48,9 +48,8 @@ public: QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const override;
- QModelIndex index(int row, int column,
- const QModelIndex &parent = QModelIndex()) const override;
- QModelIndex parent(const QModelIndex &index) const override;
+ QModelIndex index(int row, int column, const QModelIndex &) const override;
+ QModelIndex parent(const QModelIndex &) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &) const override;
diff --git a/src/data/tikzparser.y b/src/data/tikzparser.y index 3dfb66f..4473107 100644 --- a/src/data/tikzparser.y +++ b/src/data/tikzparser.y @@ -69,7 +69,7 @@ #define assembler yyget_extra(scanner)
/* pass errors off to the assembler */
-void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) {
+void yyerror(YYLTYPE *yylloc, void * /*scanner*/, const char *str) {
// TODO: implement reportError()
//assembler->reportError(str, yylloc);
qDebug() << "\nparse error: " << str << " line:" << yylloc->first_line;
|