mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge pull request #1187 from csoler/master
merge of reviewed parts of PR1103
This commit is contained in:
commit
4dfeab2781
@ -186,7 +186,8 @@ class RsGixsReputation
|
||||
{
|
||||
public:
|
||||
// get Reputation.
|
||||
virtual RsReputations::ReputationLevel overallReputationLevel(const RsGxsId& id,uint32_t *identity_flags=NULL) = 0;
|
||||
virtual RsReputations::ReputationLevel overallReputationLevel(const RsGxsId& id,uint32_t *identity_flags=NULL) = 0;
|
||||
virtual ~RsGixsReputation(){}
|
||||
};
|
||||
|
||||
/*** This Class pulls all the GXS Interfaces together ****/
|
||||
@ -210,6 +211,7 @@ virtual ~RsGxsIdExchange() { return; }
|
||||
class RsGcxs
|
||||
{
|
||||
public:
|
||||
virtual ~RsGcxs(){}
|
||||
|
||||
/* GXS Interface - for working out who can receive */
|
||||
virtual bool isLoaded(const RsGxsCircleId &circleId) = 0;
|
||||
|
@ -35,6 +35,7 @@
|
||||
class PgpAuxUtils
|
||||
{
|
||||
public:
|
||||
virtual ~PgpAuxUtils(){}
|
||||
|
||||
virtual const RsPgpId &getPGPOwnId() = 0;
|
||||
virtual RsPgpId getPGPId(const RsPeerId& sslid) = 0;
|
||||
|
@ -84,10 +84,9 @@
|
||||
//static const unsigned int ROLE_SORT = Qt::UserRole + 1 ;
|
||||
|
||||
/** Constructor */
|
||||
NetworkDialog::NetworkDialog(QWidget *parent)
|
||||
NetworkDialog::NetworkDialog(QWidget */*parent*/)
|
||||
{
|
||||
/* Invoke the Qt Designer generated object setup routine */
|
||||
Q_UNUSED(parent);
|
||||
ui.setupUi(this);
|
||||
|
||||
connect( ui.filterLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterItems(QString)));
|
||||
@ -160,15 +159,15 @@ void NetworkDialog::changeEvent(QEvent *e)
|
||||
void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ )
|
||||
{
|
||||
|
||||
QModelIndexList l = ui.connectTreeWidget->selectionModel()->selection().indexes();
|
||||
if(l.empty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
QModelIndexList l = ui.connectTreeWidget->selectionModel()->selection().indexes();
|
||||
if(l.empty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
QMenu *contextMnu = new QMenu;
|
||||
|
||||
RsPgpId peer_id(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()) ;
|
||||
RsPgpId peer_id(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()) ;
|
||||
|
||||
// That's what context menus are made for
|
||||
RsPeerDetails detail;
|
||||
|
@ -10,6 +10,7 @@ public:
|
||||
: mPeerId(val), mTestHub(hub){
|
||||
|
||||
}
|
||||
virtual ~NotifyWithPeerId(){}
|
||||
|
||||
void notifyNewMessages(std::vector<RsNxsMsg*>& messages)
|
||||
{
|
||||
|
@ -166,7 +166,9 @@ template<class ItemClass,class ItemSerialiser> int test_RsItem()
|
||||
rsfi.print(std::cerr,0) ;
|
||||
}
|
||||
if (outfi)
|
||||
{
|
||||
EXPECT_TRUE(*outfi == rsfi) ;
|
||||
}
|
||||
|
||||
|
||||
sersize2 = MAX_BUFSIZE;
|
||||
@ -232,7 +234,9 @@ template<class ItemClass,class ItemSerialiser> int test_RsItem(uint16_t servtype
|
||||
EXPECT_TRUE(outfi != NULL);
|
||||
|
||||
if (outfi)
|
||||
{
|
||||
EXPECT_TRUE(*outfi == rsfi) ;
|
||||
}
|
||||
|
||||
sersize2 = MAX_BUFSIZE;
|
||||
bool done2 = srl.serialise(outfi, (void *) &(buffer[16*8]), &sersize2);
|
||||
|
Loading…
Reference in New Issue
Block a user