rename NodeList DomainInfo to DomainHandler

Stephen Birarda committed 12 years ago

Commit 62041d91 parent caf247311 files · +52 −52Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+3−3

@@ -228,8 +228,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 227 unmodified lines
228		228
229	audioThread->start();	229	audioThread->start();
230		230
231	connect(&nodeList->getDomainInfo(), SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));	231	connect(&nodeList->getDomainHandler(), SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));
232	connect(&nodeList->getDomainInfo(), SIGNAL(connectedToDomain(const QString&)), SLOT(connectedToDomain(const QString&)));	232	connect(&nodeList->getDomainHandler(), SIGNAL(connectedToDomain(const QString&)), SLOT(connectedToDomain(const QString&)));
233		233
234	connect(nodeList, &NodeList::nodeAdded, this, &Application::nodeAdded);	234	connect(nodeList, &NodeList::nodeAdded, this, &Application::nodeAdded);
235	connect(nodeList, &NodeList::nodeKilled, this, &Application::nodeKilled);	235	connect(nodeList, &NodeList::nodeKilled, this, &Application::nodeKilled);
@@ -3279,7 +3279,7 @@ void Application::updateWindowTitle(){ · 3043 unmodified lines
3279		3279
3280	QString username = AccountManager::getInstance().getUsername();	3280	QString username = AccountManager::getInstance().getUsername();
3281	QString title = QString() + (!username.isEmpty() ? username + " " : QString()) + nodeList->getSessionUUID().toString()	3281	QString title = QString() + (!username.isEmpty() ? username + " " : QString()) + nodeList->getSessionUUID().toString()
3282	+ " @ " + nodeList->getDomainInfo().getHostname() + buildVersion;	3282	+ " @ " + nodeList->getDomainHandler().getHostname() + buildVersion;
3283		3283
3284	qDebug("Application title set to: %s", title.toStdString().c_str());	3284	qDebug("Application title set to: %s", title.toStdString().c_str());
3285	_window->setWindowTitle(title);	3285	_window->setWindowTitle(title);