From 9fabc0bd3cb496dc77c872993ea2b54cbd2e71bf Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 21 Feb 2012 19:06:08 +0100 Subject: globals in extra class, new javascript interface classes for fbgui and ndgui, various cleanups in ndgui... --- src/fbgui/interfaceconfiguration.cpp | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'src/fbgui/interfaceconfiguration.cpp') diff --git a/src/fbgui/interfaceconfiguration.cpp b/src/fbgui/interfaceconfiguration.cpp index d9d72df..37dd3f9 100644 --- a/src/fbgui/interfaceconfiguration.cpp +++ b/src/fbgui/interfaceconfiguration.cpp @@ -1,5 +1,5 @@ /** - * @class interfaceconfiguration + * @class InterfaceConfiguration * * @brief reads and stores a interface configuration. * @@ -19,11 +19,10 @@ using namespace log4cxx; using namespace log4cxx::helpers; LoggerPtr ndifLogger(Logger::getLogger("fbgui.nd.ifconf")); -interfaceconfiguration::interfaceconfiguration() { - _tag = "[nd:InterfaceConfiguration]"; +InterfaceConfiguration::InterfaceConfiguration() { } -interfaceconfiguration::~interfaceconfiguration() { +InterfaceConfiguration::~InterfaceConfiguration() { // TODO Auto-generated destructor stub } @@ -37,14 +36,14 @@ interfaceconfiguration::~interfaceconfiguration() { * @param pathToConfig * contains the path to the configuration file. */ -bool interfaceconfiguration::readConfigOutOfFile(QString pathToConfig) { +bool InterfaceConfiguration::readConfigOutOfFile(QString pathToConfig) { QFile file(pathToConfig); if (file.exists()) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - LOG4CXX_DEBUG(ndifLogger, _tag << "couldn't open file:" << pathToConfig); + LOG4CXX_DEBUG(ndifLogger, "Couldn't open file:" << pathToConfig); return false; } - LOG4CXX_DEBUG(ndifLogger, _tag << "read config file"); + LOG4CXX_DEBUG(ndifLogger, "read config file"); while (!file.atEnd()) { QString line(file.readLine()); QStringList splitedLine = line.split("="); @@ -81,67 +80,67 @@ bool interfaceconfiguration::readConfigOutOfFile(QString pathToConfig) { } else if (name.compare("DHCPCHADDR") == 0) { this->dhcpchaddr = values; } else { - LOG4CXX_DEBUG(ndifLogger, _tag << "read unknown name" << name << values); + LOG4CXX_DEBUG(ndifLogger, "read unknown name" << name << values); } } } else { - LOG4CXX_DEBUG(ndifLogger, _tag << "file doesn't exist:" << pathToConfig); + LOG4CXX_DEBUG(ndifLogger, "file doesn't exist:" << pathToConfig); return false; } return true; } -QString interfaceconfiguration::getBroadcast() { +QString InterfaceConfiguration::getBroadcast() { return broadcast; } -QString interfaceconfiguration::getClientid() { +QString InterfaceConfiguration::getClientid() { return clientid; } -QString interfaceconfiguration::getDhcpchaddr() { +QString InterfaceConfiguration::getDhcpchaddr() { return dhcpchaddr; } -QString interfaceconfiguration::getDhcpsid() { +QString InterfaceConfiguration::getDhcpsid() { return dhcpsid; } -QString interfaceconfiguration::getDnssearch() { +QString InterfaceConfiguration::getDnssearch() { return dnssearch; } -QString interfaceconfiguration::getDnsservers() { +QString InterfaceConfiguration::getDnsservers() { return dnsservers; } -QString interfaceconfiguration::getGateways() { +QString InterfaceConfiguration::getGateways() { return gateways; } -QString interfaceconfiguration::getGateway() { +QString InterfaceConfiguration::getGateway() { return gateway; } -QString interfaceconfiguration::getHostname() { +QString InterfaceConfiguration::getHostname() { return hostname; } -QString interfaceconfiguration::getInterface() { +QString InterfaceConfiguration::getInterface() { return interface; } -QString interfaceconfiguration::getIpAddress() { +QString InterfaceConfiguration::getIpAddress() { return ipAddress; } -QString interfaceconfiguration::getNetmask() { +QString InterfaceConfiguration::getNetmask() { return netmask; } -QString interfaceconfiguration::getNetwork() { +QString InterfaceConfiguration::getNetwork() { return network; } -QString interfaceconfiguration::getRoutes() { +QString InterfaceConfiguration::getRoutes() { return routes; } -- cgit v1.2.3-55-g7522