Merge pull request zcash#6317

Jeff Garzik · Jeff Garzik · commit ca5e2a18648c · 2015-09-16T09:40:53.000-04:00
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
-AC_PREREQ([2.60])
+AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 11)
 define(_CLIENT_VERSION_REVISION, 99)
@@ -138,8 +138,7 @@ AC_ARG_ENABLE([glibc-back-compat],
   [use_glibc_compat=no])
 
 AC_ARG_ENABLE([zmq],
-  [AC_HELP_STRING([--disable-zmq],
-  [Disable ZMQ notifications])],
+  [AS_HELP_STRING([--disable-zmq],[Disable ZMQ notifications])],
   [use_zmq=$enableval],
   [use_zmq=yes])
 
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
@@ -8,7 +8,6 @@
 #include "guiconstants.h"
 #include "guiutil.h"
 
-#include "net.h"
 #include "sync.h"
 
 #include <QDebug>
@@ -96,18 +95,17 @@ class PeerTablePriv
             mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));
     }
 
-    int size()
+    int size() const
     {
         return cachedNodeStats.size();
     }
 
     CNodeCombinedStats *index(int idx)
     {
-        if(idx >= 0 && idx < cachedNodeStats.size()) {
+        if (idx >= 0 && idx < cachedNodeStats.size())
             return &cachedNodeStats[idx];
-        } else {
-            return 0;
-        }
+
+        return 0;
     }
 };
 
@@ -171,7 +169,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const
         }
     } else if (role == Qt::TextAlignmentRole) {
         if (index.column() == Ping)
-            return (int)(Qt::AlignRight | Qt::AlignVCenter);
+            return (QVariant)(Qt::AlignRight | Qt::AlignVCenter);
     }
 
     return QVariant();
@@ -204,13 +202,8 @@ QModelIndex PeerTableModel::index(int row, int column, const QModelIndex &parent
     CNodeCombinedStats *data = priv->index(row);
 
     if (data)
-    {
         return createIndex(row, column, data);
-    }
-    else
-    {
-        return QModelIndex();
-    }
+    return QModelIndex();
 }
 
 const CNodeCombinedStats *PeerTableModel::getNodeStats(int idx)
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -7,7 +7,6 @@
 
 #include "clientmodel.h"
 #include "guiutil.h"
-#include "peertablemodel.h"
 #include "platformstyle.h"
 
 #include "chainparams.h"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`#include "guiconstants.h"`
`9`	`9`	`#include "guiutil.h"`
`10`	`10`
`11`		`-#include "net.h"`
`12`	`11`	`#include "sync.h"`
`13`	`12`
`14`	`13`	`#include <QDebug>`
`@@ -96,18 +95,17 @@ class PeerTablePriv`
`96`	`95`	`mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));`
`97`	`96`	`}`
`98`	`97`
`99`		`- int size()`
	`98`	`+ int size() const`
`100`	`99`	`{`
`101`	`100`	`return cachedNodeStats.size();`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`CNodeCombinedStats *index(int idx)`
`105`	`104`	`{`
`106`		`- if(idx >= 0 && idx < cachedNodeStats.size()) {`
	`105`	`+ if (idx >= 0 && idx < cachedNodeStats.size())`
`107`	`106`	`return &cachedNodeStats[idx];`
`108`		`- } else {`
`109`		`- return 0;`
`110`		`- }`
	`107`	`+`
	`108`	`+ return 0;`
`111`	`109`	`}`
`112`	`110`	`};`
`113`	`111`
`@@ -171,7 +169,7 @@ QVariant PeerTableModel::data(const QModelIndex &index, int role) const`
`171`	`169`	`}`
`172`	`170`	`} else if (role == Qt::TextAlignmentRole) {`
`173`	`171`	`if (index.column() == Ping)`
`174`		`- return (int)(Qt::AlignRight \| Qt::AlignVCenter);`
	`172`	`+ return (QVariant)(Qt::AlignRight \| Qt::AlignVCenter);`
`175`	`173`	`}`
`176`	`174`
`177`	`175`	`return QVariant();`
`@@ -204,13 +202,8 @@ QModelIndex PeerTableModel::index(int row, int column, const QModelIndex &parent`
`204`	`202`	`CNodeCombinedStats *data = priv->index(row);`
`205`	`203`
`206`	`204`	`if (data)`
`207`		`- {`
`208`	`205`	`return createIndex(row, column, data);`
`209`		`- }`
`210`		`- else`
`211`		`- {`
`212`		`- return QModelIndex();`
`213`		`- }`
	`206`	`+ return QModelIndex();`
`214`	`207`	`}`
`215`	`208`
`216`	`209`	`const CNodeCombinedStats *PeerTableModel::getNodeStats(int idx)`