Permalink
Browse files

Merge pull request #6317

  • Loading branch information...
Jeff Garzik
Jeff Garzik committed Sep 16, 2015
2 parents 13b8282 + 92684bb commit ca5e2a18648cdc0f2a756e7d549f509adce25b00
Showing with 8 additions and 17 deletions.
  1. +2 −3 configure.ac
  2. +6 −13 src/qt/peertablemodel.cpp
  3. +0 −1 src/qt/rpcconsole.cpp
View
@@ -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])
View
@@ -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)
View
@@ -7,7 +7,6 @@
#include "clientmodel.h"
#include "guiutil.h"
-#include "peertablemodel.h"
#include "platformstyle.h"
#include "chainparams.h"

0 comments on commit ca5e2a1

Please sign in to comment.