dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Qt build to enable building against local static libraries, rename Network to NetworkWidget to avoid filesystem or object naming collision with Network.o in node/.

Browse source
This commit is contained in:
Adam Ierymenko 2013-12-12 15:47:00 -08:00
parent 239c9e46ea
commit 9ffda4f955
6 changed files with 104 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ZeroTierUI/mainwindow.cpp
View file

@ -1,6 +1,6 @@
#include "mainwindow.h"
#include "aboutwindow.h"
#include "network.h"
#include "networkwidget.h"
#include "ui_mainwindow.h"
#include <string>
@ -143,13 +143,13 @@ void MainWindow::customEvent(QEvent *event)
byNwid[l[2]] = l;
}
std::map< std::string,std::pair<int,Network *> > existingByNwid;
std::map< std::string,std::pair<int,NetworkWidget *> > existingByNwid;
for(int r=0;r<ui->networkListWidget->count();++r) {
Network *nw = (Network *)ui->networkListWidget->itemWidget(ui->networkListWidget->item(r));
NetworkWidget *nw = (NetworkWidget *)ui->networkListWidget->itemWidget(ui->networkListWidget->item(r));
existingByNwid[nw->networkId()] = std::make_pair(r,nw);
}
for(std::map< std::string,std::pair<int,Network *> >::iterator i(existingByNwid.begin());i!=existingByNwid.end();++i) {
for(std::map< std::string,std::pair<int,NetworkWidget *> >::iterator i(existingByNwid.begin());i!=existingByNwid.end();++i) {
if (byNwid.count(i->first)) {
std::vector<std::string> &l = byNwid[i->first];
i->second.second->setNetworkName(l[3]);
@ -165,7 +165,7 @@ void MainWindow::customEvent(QEvent *event)
for(std::map< std::string,std::vector<std::string> >::iterator i(byNwid.begin());i!=byNwid.end();++i) {
if (!existingByNwid.count(i->first)) {
std::vector<std::string> &l = i->second;
Network *nw = new Network((QWidget *)0,i->first);
NetworkWidget *nw = new NetworkWidget((QWidget *)0,i->first);
nw->setNetworkName(l[3]);
nw->setStatus(l[4],l[5]);
nw->setNetworkType(l[6]);