neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #6317

Browse Source
This commit is contained in:
Jeff Garzik 2015-09-16 09:40:53 -04:00
commit ca5e2a1864
Failed to extract signature
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -1,5 +1,5 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) 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_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 11) define(_CLIENT_VERSION_MINOR, 11)
define(_CLIENT_VERSION_REVISION, 99) define(_CLIENT_VERSION_REVISION, 99)
@ -138,8 +138,7 @@ AC_ARG_ENABLE([glibc-back-compat],
[use_glibc_compat=no]) [use_glibc_compat=no])
AC_ARG_ENABLE([zmq], AC_ARG_ENABLE([zmq],
[AC_HELP_STRING([--disable-zmq], [AS_HELP_STRING([--disable-zmq],[Disable ZMQ notifications])],
[Disable ZMQ notifications])],
[use_zmq=$enableval], [use_zmq=$enableval],
[use_zmq=yes]) [use_zmq=yes])

19
src/qt/peertablemodel.cpp
View File

@ -8,7 +8,6 @@
#include "guiconstants.h" #include "guiconstants.h"
#include "guiutil.h" #include "guiutil.h"
#include "net.h"
#include "sync.h" #include "sync.h"
#include <QDebug> #include <QDebug>
@ -96,18 +95,17 @@ public:
mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++)); mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));
} }
int size() int size() const
{ {
return cachedNodeStats.size(); return cachedNodeStats.size();
} }
CNodeCombinedStats *index(int idx) CNodeCombinedStats *index(int idx)
{ {
if(idx >= 0 && idx < cachedNodeStats.size()) { if (idx >= 0 && idx < cachedNodeStats.size())
return &cachedNodeStats[idx]; 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) { } else if (role == Qt::TextAlignmentRole) {
if (index.column() == Ping) if (index.column() == Ping)
return (int)(Qt::AlignRight | Qt::AlignVCenter); return (QVariant)(Qt::AlignRight | Qt::AlignVCenter);
} }
return QVariant(); return QVariant();
@ -204,13 +202,8 @@ QModelIndex PeerTableModel::index(int row, int column, const QModelIndex &parent
CNodeCombinedStats *data = priv->index(row); CNodeCombinedStats *data = priv->index(row);
if (data) if (data)
{
return createIndex(row, column, data); return createIndex(row, column, data);
} return QModelIndex();
else
{
return QModelIndex();
}
} }
const CNodeCombinedStats *PeerTableModel::getNodeStats(int idx) const CNodeCombinedStats *PeerTableModel::getNodeStats(int idx)

1
src/qt/rpcconsole.cpp
View File

@ -7,7 +7,6 @@
#include "clientmodel.h" #include "clientmodel.h"
#include "guiutil.h" #include "guiutil.h"
#include "peertablemodel.h"
#include "platformstyle.h" #include "platformstyle.h"
#include "chainparams.h" #include "chainparams.h"