[dennco] alpha 2.0. wrap up

diff --git a/Source/layer1/TKContainer.cpp b/Source/layer1/TKContainer.cpp
index f45621d..e001b25 100644 (file)
--- a/Source/layer1/TKContainer.cpp
+++ b/Source/layer1/TKContainer.cpp
@@ -340,7 +340,7 @@ TKCell* TKContainer::getInputInterfaceCell(std::string theFQNName)
 TKCell* TKContainer::getOutputInterfaceCell(std::string theFQNName)
 {
     TKCellMap::iterator ito = mOutInterfaceCells.find(theFQNName);
-    if (ito == mInpInterfaceCells.end())
+    if (ito == mOutInterfaceCells.end())
     {
         return NULL;
     }

diff --git a/Source/layer1/TKContainer.h b/Source/layer1/TKContainer.h
index da4ee78..c9a2c80 100644 (file)
--- a/Source/layer1/TKContainer.h
+++ b/Source/layer1/TKContainer.h
@@ -83,8 +83,8 @@ public:
     virtual TKAxonTerminal* axonTerminalFactory(TKAxon *theOwner) = 0;
     virtual TKCellCode*     cellCodeFactory(std::string name, std::string cellapi, std::string code) = 0;
 
-    virtual void            beganParsePage(const char *docRoot, const char *path) {}
-    virtual void            endedParsePage(const char *docRoot, const char *path) {}
+    virtual void            beganParsePage(const char *docRoot, const char *path) { (void)docRoot; (void)path; }
+    virtual void            endedParsePage(const char *docRoot, const char *path) { (void)docRoot; (void)path; }
 
 protected:
     TKContainer();

diff --git a/Source/layer1/TKReceptor.h b/Source/layer1/TKReceptor.h
index 5efb02c..fc2432b 100644 (file)
--- a/Source/layer1/TKReceptor.h
+++ b/Source/layer1/TKReceptor.h
@@ -20,7 +20,7 @@
 #ifndef __INCLUDE_TKRECEPTOR__
 #define __INCLUDE_TKRECEPTOR__
 
-#include "math.h"
+#include <limits>
 
 class TKCell;
 class TKAxonTerminal;
@@ -28,7 +28,7 @@ class TKAxonTerminal;
 class TKReceptor
 {
 public:
-    TKReceptor(TKCell *theOwner) : mOwner(theOwner), mTerminal(0), mValue(NAN) {}
+    TKReceptor(TKCell *theOwner) : mOwner(theOwner), mTerminal(0), mValue(std::numeric_limits<float>::quiet_NaN()) {}
     virtual ~TKReceptor() {}
 
     void        setTarget(TKAxonTerminal *theTerminal);

diff --git a/Source/layer1/platform/qt/QtTKConsole.cpp b/Source/layer1/platform/qt/QtTKConsole.cpp
index 60afa78..81d6c89 100644 (file)
--- a/Source/layer1/platform/qt/QtTKConsole.cpp
+++ b/Source/layer1/platform/qt/QtTKConsole.cpp
@@ -33,5 +33,7 @@ void TKConsole::vDebugPrintf(const char *fmt, va_list ap)
 #ifdef DEBUG
     QString msg = QString().vsprintf(fmt,ap);
     qDebug() << "DEBUG:" << msg << endl;
+#else
+    (void)fmt; (void)ap;
 #endif
 }

diff --git a/Source/layer2/platform/qt/qtdnxmlimpl.cpp b/Source/layer2/platform/qt/qtdnxmlimpl.cpp
index f8d56dd..af62ab7 100644 (file)
--- a/Source/layer2/platform/qt/qtdnxmlimpl.cpp
+++ b/Source/layer2/platform/qt/qtdnxmlimpl.cpp
@@ -102,6 +102,8 @@ bool QtXMLHandler::endDocument()
 
 bool QtXMLHandler::startElement(const QString & namespaceURI, const QString & localName, const QString & qName, const QXmlAttributes & atts )
 {
+    (void)namespaceURI; (void)localName;
+
     if (mRootElement  == NULL)
     {
         mRootElement = new DNXMLElement(qName.toStdString());
@@ -143,6 +145,8 @@ bool QtXMLHandler::startElement(const QString & namespaceURI, const QString & lo
 
 bool QtXMLHandler::endElement (const QString & namespaceURI, const QString & localName, const QString & qName )
 {
+    (void)namespaceURI; (void)localName; (void)qName;
+
     mCurrentElement = mCurrentElement->outer;
     return true;
 }

diff --git a/Source/layer3/DNEngine.cpp b/Source/layer3/DNEngine.cpp
index 7d826be..9bb9895 100644 (file)
--- a/Source/layer3/DNEngine.cpp
+++ b/Source/layer3/DNEngine.cpp
@@ -266,7 +266,7 @@ bool DNEngine::parseSettingFile(const char *contentRoot)
 
         if (tickIntervalSignal <= 0)
         {
-            tickIntervalSignal = tickIntervalFull / 5.0;
+            tickIntervalSignal = tickIntervalFull / 5.0f;
         }
         if (tickIntervalInput <= 0)
         {
@@ -443,7 +443,7 @@ float DNEngine::doClientGetRequest(const char* path)
 
 bool DNEngine::doClientSetRequest(const char* path, const char* value)
 {
-    return doClientSetRequest(path, atof(value));
+    return doClientSetRequest(path, (float)atof(value));
 }
 
 bool DNEngine::doClientSetRequest(const char* path, float value)
@@ -485,6 +485,8 @@ std::string DNEngine::getUIPath()
 //static
 void DNEngine::callbackSerialPortClosed(DNEngine *engine)
 {
+    (void)engine;
+
     //TODO
 }
 

diff --git a/Source/layer3/QtDennco/mainwindow.cpp b/Source/layer3/QtDennco/mainwindow.cpp
index 1f3eed7..7387259 100644 (file)
--- a/Source/layer3/QtDennco/mainwindow.cpp
+++ b/Source/layer3/QtDennco/mainwindow.cpp
@@ -323,6 +323,8 @@ void MainWindow::vDebugPrintf(const char *fmt, va_list ap)
 #ifdef DEBUG
     QString msg = QString().vsprintf(fmt,ap);
     qDebug() << "DEBUG:" << msg << endl;
+#else
+    (void)fmt; (void)ap;
 #endif
 }
 

diff --git a/Source/layer3/platform/qt/qtsimplehttpserverimpl.cpp b/Source/layer3/platform/qt/qtsimplehttpserverimpl.cpp
index e3a7599..28c7daa 100644 (file)
--- a/Source/layer3/platform/qt/qtsimplehttpserverimpl.cpp
+++ b/Source/layer3/platform/qt/qtsimplehttpserverimpl.cpp
@@ -20,6 +20,8 @@
 
 DNServerHTTPImpl *DNServerHTTPImpl::create(DNServerHTTP *owner, DNClientRequestHandler handler)
 {
+    (void)owner; (void)handler;
+
     //TODO
     return NULL;
 }

diff --git a/Source/versioninfo.h b/Source/versioninfo.h
index 0e16696..153681a 100644 (file)
--- a/Source/versioninfo.h
+++ b/Source/versioninfo.h
@@ -1,7 +1,7 @@
 #ifndef VERSIONINFO_H
 #define VERSIONINFO_H
 
-#define CONTAINER_VERSION   "alpha 1.2"
-#define ENGINE_VERSION      "alpha 1.2"
+#define CONTAINER_VERSION   "alpha 2.0"
+#define ENGINE_VERSION      "alpha 2.0"
 
 #endif // VERSIONINFO_H