aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgerlach2012-11-08 17:20:28 -0600
committerdgerlach2012-11-08 17:20:28 -0600
commitd13390879503aaf8cf76450ff4ab90017c4bb7ad (patch)
tree09888d33b13cffa58f836e0ba6f9df57c1bad5f2
parent6ff431ce872fe4f190dc719719699bd9f001635d (diff)
downloadthermostat-demo-d13390879503aaf8cf76450ff4ab90017c4bb7ad.tar.gz
thermostat-demo-d13390879503aaf8cf76450ff4ab90017c4bb7ad.tar.xz
thermostat-demo-d13390879503aaf8cf76450ff4ab90017c4bb7ad.zip
all files: removed debug output
-rw-r--r--globalsettings.cpp8
-rw-r--r--qss/thermostatdemo.qss2
-rw-r--r--remoteaccessmanager.cpp10
-rw-r--r--webdataengine/openweathermapdataengine.cpp10
4 files changed, 8 insertions, 22 deletions
diff --git a/globalsettings.cpp b/globalsettings.cpp
index 2851254..0bd4aa5 100644
--- a/globalsettings.cpp
+++ b/globalsettings.cpp
@@ -76,13 +76,7 @@ bool GlobalSettings::load()
76 setTimeFormat(static_cast<GlobalSettings::TimeFormat>(settingsObject.value("time-format", GlobalSettings::TimeFormat12h).toInt())); 76 setTimeFormat(static_cast<GlobalSettings::TimeFormat>(settingsObject.value("time-format", GlobalSettings::TimeFormat12h).toInt()));
77 setDataPath(QFileInfo(settingsObject.fileName()).absolutePath()); 77 setDataPath(QFileInfo(settingsObject.fileName()).absolutePath());
78 78
79 qDebug() << "Settings loaded..."; 79 //qDebug() << "Data Path: " << dataPath();
80 qDebug() << "Proxy Host: " << proxyHost();
81 qDebug() << "Proxy Port: " << proxyPort();
82 qDebug() << "Current City: " << currentCity();
83 qDebug() << "Temperature Format: " << temperatureFormat();
84 qDebug() << "Time Format: " << timeFormat();
85 qDebug() << "Data Path: " << dataPath();
86 80
87 if(settingsObject.status() == QSettings::NoError) 81 if(settingsObject.status() == QSettings::NoError)
88 return true; 82 return true;
diff --git a/qss/thermostatdemo.qss b/qss/thermostatdemo.qss
index bbd5d97..bd784e3 100644
--- a/qss/thermostatdemo.qss
+++ b/qss/thermostatdemo.qss
@@ -5,7 +5,6 @@ WeatherWidget,ThermostatWidget,OptionsWidget {
5 border: 2px groove gray; 5 border: 2px groove gray;
6 border-radius: 10px; 6 border-radius: 10px;
7 padding: 2px 4px; 7 padding: 2px 4px;
8 qproperty-alignment: AlignCenter;
9} 8}
10/* 9/*
11OptionsWidget { 10OptionsWidget {
@@ -102,7 +101,6 @@ OptionsWidget > QPushButton {
102#dateButton { 101#dateButton {
103 background: black; 102 background: black;
104 color: white; 103 color: white;
105 qproperty-alignment: AlignCenter;
106} 104}
107 105
108AwayScreen { 106AwayScreen {
diff --git a/remoteaccessmanager.cpp b/remoteaccessmanager.cpp
index 7655a41..5eebdef 100644
--- a/remoteaccessmanager.cpp
+++ b/remoteaccessmanager.cpp
@@ -38,8 +38,8 @@ RemoteAccessManager::~RemoteAccessManager()
38 38
39void RemoteAccessManager::start() 39void RemoteAccessManager::start()
40{ 40{
41 qDebug() << m_tcpServer->listen(QHostAddress::Any, m_listenPort); 41 m_tcpServer->listen(QHostAddress::Any, m_listenPort);
42 qDebug() << m_tcpServer->errorString(); 42 m_tcpServer->errorString();
43 connect(m_tcpServer, SIGNAL(newConnection()), this, SLOT(handleIncomingConnection())); 43 connect(m_tcpServer, SIGNAL(newConnection()), this, SLOT(handleIncomingConnection()));
44} 44}
45 45
@@ -174,12 +174,6 @@ void RemoteAccessManager::processIncomingConnection()
174 174
175 optimizedData = data; 175 optimizedData = data;
176 176
177 qDebug() << (data["weatherCurrent"] == m_oldData["weatherCurrent"]);
178 qDebug() << (data["weatherCurrent"]);
179 qDebug() << m_oldData["weatherCurrent"];
180
181
182
183 if(data["weatherCurrent"] == m_oldData["weatherCurrent"]) 177 if(data["weatherCurrent"] == m_oldData["weatherCurrent"])
184 optimizedData.remove("weatherCurrent"); 178 optimizedData.remove("weatherCurrent");
185 if(data["weatherForecast"] == m_oldData["weatherForecast"]) 179 if(data["weatherForecast"] == m_oldData["weatherForecast"])
diff --git a/webdataengine/openweathermapdataengine.cpp b/webdataengine/openweathermapdataengine.cpp
index a010f6e..213c97f 100644
--- a/webdataengine/openweathermapdataengine.cpp
+++ b/webdataengine/openweathermapdataengine.cpp
@@ -105,7 +105,7 @@ void OpenWeatherMapDataEngine::dispatchWeatherDataRequests()
105 105
106 //next send request for current weather 106 //next send request for current weather
107 QString forecastWeatherURL = "http://openweathermap.org/data/2.1/forecast/city/"+QString::number(m_cityId); 107 QString forecastWeatherURL = "http://openweathermap.org/data/2.1/forecast/city/"+QString::number(m_cityId);
108 qDebug() << "Forecast url: " << forecastWeatherURL; 108
109 request.setUrl(QUrl(forecastWeatherURL)); 109 request.setUrl(QUrl(forecastWeatherURL));
110 110
111 //set up timer to check for network timeout 111 //set up timer to check for network timeout
@@ -356,7 +356,7 @@ bool OpenWeatherMapDataEngine::writeToCache()
356 356
357 if(!result) 357 if(!result)
358 { 358 {
359 qDebug() << "Cannot open cache file for writing!"; 359 //qDebug() << "Cannot open cache file for writing!";
360 return false; 360 return false;
361 } 361 }
362 362
@@ -369,7 +369,7 @@ bool OpenWeatherMapDataEngine::writeToCache()
369 369
370 if(cacheFile.error() != QFile::NoError) 370 if(cacheFile.error() != QFile::NoError)
371 { 371 {
372 qDebug() << "Cannot write to cache file!"; 372 //qDebug() << "Cannot write to cache file!";
373 return false; 373 return false;
374 } 374 }
375 375
@@ -401,7 +401,7 @@ bool OpenWeatherMapDataEngine::readFromCache(QString alternateCacheFile)
401 401
402 if(!result) 402 if(!result)
403 { 403 {
404 qDebug() << "XMLCACHE: Cannot open cache file for reading!"; 404 //qDebug() << "XMLCACHE: Cannot open cache file for reading!";
405 return false; 405 return false;
406 } 406 }
407 407
@@ -419,7 +419,7 @@ bool OpenWeatherMapDataEngine::readFromCache(QString alternateCacheFile)
419 //we can at least assume if the size is zero, something is not right. 419 //we can at least assume if the size is zero, something is not right.
420 if(cacheFile.error() != QFile::NoError) 420 if(cacheFile.error() != QFile::NoError)
421 { 421 {
422 qDebug() << "XMLCACHE: No data loaded..."; 422 //qDebug() << "XMLCACHE: No data loaded...";
423 return false; 423 return false;
424 } 424 }
425 425