[dennco] refactored the directory structure. Now directory layer1 and layer2 are...

diff --git a/Source/Source.pro b/Source/Source.pro
index 734943e..46c7cc8 100644 (file)
--- a/Source/Source.pro
+++ b/Source/Source.pro
@@ -11,123 +11,122 @@ TEMPLATE = app
 
 DESTDIR = ../bin
 
-INCLUDEPATH += QtScript QtDennco platform/qt ../Thirdparty/qt/qserialdevice-qserialdevice/include
+INCLUDEPATH += layer1 layer2 layer3 layer3/QtScript layer3/QtDennco layer1/platform/qt layer2/platform/qt layer3/platform/qt ../Thirdparty/qt/qserialdevice-qserialdevice/include
 
-SOURCES += QtDennco/mainwindow.cpp \
-    QtDennco/main.cpp \
-    TKUICell.cpp \
-    TKReceptor.cpp \
-    TKLog.cpp \
-    TKLock.cpp \
-    TKDebug.cpp \
-    TKContainer.cpp \
-    TKCellCodeInstance.cpp \
-    TKCellCode.cpp \
-    TKCell.cpp \
-    TKAxonTerminal.cpp \
-    TKAxon.cpp \
-    DNXMLElement.cpp \
-    DNXML.cpp \
-    DNUtils.cpp \
-    DNTimeKeeper.cpp \
-    DNFileList.cpp \
-    DNEngine.cpp \
-    DNDirectory.cpp \
-    DNContainerBuilder.cpp \
-    DNAlert.cpp \
-    QtScript/dnqscellbase.cpp \
-    QtScript/dnqsbasiccell.cpp \
-    QtScript/dnqscellcode.cpp \
-    QtScript/dnqscellcodeinstance.cpp \
-    QtScript/dnqscontainer.cpp \
-    platform/qt/qttklockimpl.cpp \
-    platform/qt/qtdndirectoryimpl.cpp \
-    platform/qt/qtdnalertimpl.cpp \
-    platform/qt/qtsimplehttpserverimpl.cpp \
-    platform/qt/qtdntimekeeperimpl.cpp \
-    platform/qt/qtdnxmlimpl.cpp \
-    platform/qt/QtTKConsole.cpp \
-    DNGlobal.cpp \
-    DNThread.cpp \
-    platform/qt/qtdnthreadimpl.cpp \
-    QtDennco/dnwebinterface.cpp \
-    QtScript/dnqsinputcell.cpp \
-    QtScript/dnqsoutputcell.cpp \
-    platform/qt/qtdnstorageimpl.cpp \
-    DNStorage.cpp \
-    QtScript/dnqsbasicstoragecell.cpp \
-    DNServerHTTP.cpp \
-    DNServerSerialPort.cpp \
-    DNSerialPort.cpp \
-    platform/qt/qtdnserialportimpl.cpp \
-    DNSettings.cpp \
-    platform/qt/qtdnsettingsimpl.cpp
+SOURCES += \
+    layer1/TKLock.cpp \
+    layer1/TKDebug.cpp \
+    layer1/TKCellCodeInstance.cpp \
+    layer1/TKCellCode.cpp \
+    layer1/TKAxonTerminal.cpp \
+    layer1/DNStorage.cpp \
+    layer1/DNGlobal.cpp \
+    layer1/TKLog.cpp \
+    layer1/TKReceptor.cpp \
+    layer1/DNUtils.cpp \
+    layer1/TKAxon.cpp \
+    layer1/TKCell.cpp \
+    layer1/TKContainer.cpp \
+    layer1/platform/qt/qttklockimpl.cpp \
+    layer1/platform/qt/QtTKConsole.cpp \
+    layer1/platform/qt/qtdnstorageimpl.cpp \
+    layer2/DNXMLElement.cpp \
+    layer2/DNXML.cpp \
+    layer2/DNFileList.cpp \
+    layer2/DNDirectory.cpp \
+    layer2/DNContainerBuilder.cpp \
+    layer2/platform/qt/qtdndirectoryimpl.cpp \
+    layer2/platform/qt/qtdnxmlimpl.cpp \
+    layer3/DNAlert.cpp \
+    layer3/TKUICell.cpp \
+    layer3/DNTimeKeeper.cpp \
+    layer3/DNThread.cpp \
+    layer3/DNSerialPort.cpp \
+    layer3/DNServerSerialPort.cpp \
+    layer3/DNSettings.cpp \
+    layer3/DNEngine.cpp \
+    layer3/DNServerHTTP.cpp \
+    layer3/QtScript/dnqsoutputcell.cpp \
+    layer3/QtScript/dnqsinputcell.cpp \
+    layer3/QtScript/dnqscellcodeinstance.cpp \
+    layer3/QtScript/dnqscellbase.cpp \
+    layer3/QtScript/dnqsbasicstoragecell.cpp \
+    layer3/QtScript/dnqsbasiccell.cpp \
+    layer3/QtScript/dnqscellcode.cpp \
+    layer3/QtScript/dnqscontainer.cpp \
+    layer3/QtDennco/main.cpp \
+    layer3/QtDennco/dnwebinterface.cpp \
+    layer3/QtDennco/mainwindow.cpp \
+    layer3/platform/qt/qtsimplehttpserverimpl.cpp \
+    layer3/platform/qt/qtdnsettingsimpl.cpp \
+    layer3/platform/qt/qtdnalertimpl.cpp \
+    layer3/platform/qt/qtdntimekeeperimpl.cpp \
+    layer3/platform/qt/qtdnthreadimpl.cpp \
+    layer3/platform/qt/qtdnserialportimpl.cpp
 
+HEADERS  += \
+    layer1/TKLockImpl.h \
+    layer1/TKLock.h \
+    layer1/TKDebug.h \
+    layer1/TKCellCodeInstance.h \
+    layer1/DNStorage.h \
+    layer1/DNGlobal.h \
+    layer1/TKConsole.h \
+    layer1/TKLog.h \
+    layer1/DNUtils.h \
+    layer1/TKAxon.h \
+    layer1/TKCellCode.h \
+    layer1/TKContainer.h \
+    layer1/TKAxonTerminal.h \
+    layer1/TKCell.h \
+    layer1/TKReceptor.h \
+    layer1/platform/qt/qttklockimpl.h \
+    layer1/platform/qt/qtdnstorageimpl.h \
+    layer2/DNXMLImpl.h \
+    layer2/DNXMLElement.h \
+    layer2/DNXML.h \
+    layer2/DNFileList.h \
+    layer2/DNDirectoryImpl.h \
+    layer2/DNDirectory.h \
+    layer2/DNContainerBuilder.h \
+    layer2/platform/qt/qtdndirectoryimpl.h \
+    layer2/platform/qt/qtdnxmlimpl.h \
+    layer3/DNAlertImpl.h \
+    layer3/DNAlert.h \
+    layer3/TKUICell.h \
+    layer3/DNTimeKeeperImpl.h \
+    layer3/DNTimeKeeper.h \
+    layer3/DNThreadImpl.h \
+    layer3/dennco.h \
+    layer3/DNServerHTTP.h \
+    layer3/DNSerialPort.h \
+    layer3/DNSerialPortImpl.h \
+    layer3/DNServerSerialPort.h \
+    layer3/DNServerHTTPImpl.h \
+    layer3/DNThread.h \
+    layer3/DNServerBase.h \
+    layer3/DNSettingsImpl.h \
+    layer3/DNSettings.h \
+    layer3/DNEngine.h \
+    layer3/QtScript/dnqsoutputcell.h \
+    layer3/QtScript/dnqsinputcell.h \
+    layer3/QtScript/dnqscellcodeinstance.h \
+    layer3/QtScript/dnqscellbase.h \
+    layer3/QtScript/dnqsbasicstoragecell.h \
+    layer3/QtScript/dnqsbasiccell.h \
+    layer3/QtScript/dnqscellcode.h \
+    layer3/QtScript/dnqscontainer.h \
+    layer3/QtDennco/dnwebinterface.h \
+    layer3/QtDennco/mainwindow.h \
+    layer3/platform/qt/qtdnthreadimpl.h \
+    layer3/platform/qt/qtdnalertimpl.h \
+    layer3/platform/qt/qtsimplehttpserverimpl.h \
+    layer3/platform/qt/qtdnserialportimpl.h \
+    layer3/platform/qt/qtdntimekeeperimpl.h \
+    layer1/DNStorageImpl.h
 
-HEADERS  += QtDennco/mainwindow.h \
-    TKUICell.h \
-    TKReceptor.h \
-    TKLog.h \
-    TKLockImpl.h \
-    TKLock.h \
-    TKDebug.h \
-    TKContainer.h \
-    TKConsole.h \
-    TKCellCodeInstance.h \
-    TKCellCode.h \
-    TKCell.h \
-    TKAxonTerminal.h \
-    TKAxon.h \
-    DNXMLImpl.h \
-    DNXMLElement.h \
-    DNXML.h \
-    DNUtils.h \
-    DNTimeKeeperImpl.h \
-    DNTimeKeeper.h \
-    DNFileList.h \
-    DNEngine.h \
-    DNDirectoryImpl.h \
-    DNDirectory.h \
-    DNContainerBuilder.h \
-    DNAlertImpl.h \
-    DNAlert.h \
-    dennco.h \
-    QtScript/dnqscellbase.h \
-    QtScript/dnqsbasiccell.h \
-    QtScript/dnqscellcode.h \
-    QtScript/dnqscellcodeinstance.h \
-    QtScript/dnqscontainer.h \
-    versioninfo.h \
-    platform/qt/qttklockimpl.h \
-    platform/qt/qtdndirectoryimpl.h \
-    platform/qt/qtdnalertimpl.h \
-    platform/qt/qtsimplehttpserverimpl.h \
-    platform/qt/qtdntimekeeperimpl.h \
-    platform/qt/qtdnxmlimpl.h \
-    DNGlobal.h \
-    DNThread.h \
-    DNThreadImpl.h \
-    platform/qt/qtdnthreadimpl.h \
-    QtDennco/dnwebinterface.h \
-    QtScript/dnqsinputcell.h \
-    QtScript/dnqsoutputcell.h \
-    DNStorageImpl.h \
-    DNStorage.h \
-    platform/qt/qtdnstorageimpl.h \
-    QtScript/dnqsbasicstoragecell.h \
-    DNServerHTTP.h \
-    DNServerSerialPort.h \
-    DNServerBase.h \
-    DNSerialPort.h \
-    DNSerialPortImpl.h \
-    platform/qt/qtdnserialportimpl.h \
-    DNServerHTTPImpl.h \
-    DNSettings.h \
-    DNSettingsImpl.h
-
-FORMS    += QtDennco/mainwindow.ui
-FORMS    += QtDennco/portinfodialog.ui
-
+FORMS += layer3/QtDennco/mainwindow.ui
+FORMS += layer3/QtDennco/portinfodialog.ui
 
 CONFIG(debug,debug|release) {
     DEFINES+=DEBUG

diff --git a/Source/DNGlobal.cpp b/Source/layer1/DNGlobal.cpp
similarity index 100%
rename from Source/DNGlobal.cpp
rename to Source/layer1/DNGlobal.cpp

diff --git a/Source/DNGlobal.h b/Source/layer1/DNGlobal.h
similarity index 100%
rename from Source/DNGlobal.h
rename to Source/layer1/DNGlobal.h

diff --git a/Source/DNStorage.cpp b/Source/layer1/DNStorage.cpp
similarity index 100%
rename from Source/DNStorage.cpp
rename to Source/layer1/DNStorage.cpp

diff --git a/Source/DNStorage.h b/Source/layer1/DNStorage.h
similarity index 100%
rename from Source/DNStorage.h
rename to Source/layer1/DNStorage.h

diff --git a/Source/DNStorageImpl.h b/Source/layer1/DNStorageImpl.h
similarity index 100%
rename from Source/DNStorageImpl.h
rename to Source/layer1/DNStorageImpl.h

diff --git a/Source/DNUtils.cpp b/Source/layer1/DNUtils.cpp
similarity index 100%
rename from Source/DNUtils.cpp
rename to Source/layer1/DNUtils.cpp

diff --git a/Source/DNUtils.h b/Source/layer1/DNUtils.h
similarity index 100%
rename from Source/DNUtils.h
rename to Source/layer1/DNUtils.h

diff --git a/Source/TKAxon.cpp b/Source/layer1/TKAxon.cpp
similarity index 100%
rename from Source/TKAxon.cpp
rename to Source/layer1/TKAxon.cpp

diff --git a/Source/TKAxon.h b/Source/layer1/TKAxon.h
similarity index 100%
rename from Source/TKAxon.h
rename to Source/layer1/TKAxon.h

diff --git a/Source/TKAxonTerminal.cpp b/Source/layer1/TKAxonTerminal.cpp
similarity index 100%
rename from Source/TKAxonTerminal.cpp
rename to Source/layer1/TKAxonTerminal.cpp

diff --git a/Source/TKAxonTerminal.h b/Source/layer1/TKAxonTerminal.h
similarity index 100%
rename from Source/TKAxonTerminal.h
rename to Source/layer1/TKAxonTerminal.h

diff --git a/Source/TKCell.cpp b/Source/layer1/TKCell.cpp
similarity index 100%
rename from Source/TKCell.cpp
rename to Source/layer1/TKCell.cpp

diff --git a/Source/TKCell.h b/Source/layer1/TKCell.h
similarity index 100%
rename from Source/TKCell.h
rename to Source/layer1/TKCell.h

diff --git a/Source/TKCellCode.cpp b/Source/layer1/TKCellCode.cpp
similarity index 100%
rename from Source/TKCellCode.cpp
rename to Source/layer1/TKCellCode.cpp

diff --git a/Source/TKCellCode.h b/Source/layer1/TKCellCode.h
similarity index 100%
rename from Source/TKCellCode.h
rename to Source/layer1/TKCellCode.h

diff --git a/Source/TKCellCodeInstance.cpp b/Source/layer1/TKCellCodeInstance.cpp
similarity index 100%
rename from Source/TKCellCodeInstance.cpp
rename to Source/layer1/TKCellCodeInstance.cpp

diff --git a/Source/TKCellCodeInstance.h b/Source/layer1/TKCellCodeInstance.h
similarity index 100%
rename from Source/TKCellCodeInstance.h
rename to Source/layer1/TKCellCodeInstance.h

diff --git a/Source/TKConsole.h b/Source/layer1/TKConsole.h
similarity index 100%
rename from Source/TKConsole.h
rename to Source/layer1/TKConsole.h

diff --git a/Source/TKContainer.cpp b/Source/layer1/TKContainer.cpp
similarity index 100%
rename from Source/TKContainer.cpp
rename to Source/layer1/TKContainer.cpp

diff --git a/Source/TKContainer.h b/Source/layer1/TKContainer.h
similarity index 100%
rename from Source/TKContainer.h
rename to Source/layer1/TKContainer.h

diff --git a/Source/TKDebug.cpp b/Source/layer1/TKDebug.cpp
similarity index 100%
rename from Source/TKDebug.cpp
rename to Source/layer1/TKDebug.cpp

diff --git a/Source/TKDebug.h b/Source/layer1/TKDebug.h
similarity index 100%
rename from Source/TKDebug.h
rename to Source/layer1/TKDebug.h

diff --git a/Source/TKLock.cpp b/Source/layer1/TKLock.cpp
similarity index 100%
rename from Source/TKLock.cpp
rename to Source/layer1/TKLock.cpp

diff --git a/Source/TKLock.h b/Source/layer1/TKLock.h
similarity index 100%
rename from Source/TKLock.h
rename to Source/layer1/TKLock.h

diff --git a/Source/TKLockImpl.h b/Source/layer1/TKLockImpl.h
similarity index 100%
rename from Source/TKLockImpl.h
rename to Source/layer1/TKLockImpl.h

diff --git a/Source/TKLog.cpp b/Source/layer1/TKLog.cpp
similarity index 100%
rename from Source/TKLog.cpp
rename to Source/layer1/TKLog.cpp

diff --git a/Source/TKLog.h b/Source/layer1/TKLog.h
similarity index 100%
rename from Source/TKLog.h
rename to Source/layer1/TKLog.h

diff --git a/Source/TKReceptor.cpp b/Source/layer1/TKReceptor.cpp
similarity index 100%
rename from Source/TKReceptor.cpp
rename to Source/layer1/TKReceptor.cpp

diff --git a/Source/TKReceptor.h b/Source/layer1/TKReceptor.h
similarity index 100%
rename from Source/TKReceptor.h
rename to Source/layer1/TKReceptor.h

diff --git a/Source/platform/osx/OSXTKLockImpl.h b/Source/layer1/platform/osx/OSXTKLockImpl.h
similarity index 100%
rename from Source/platform/osx/OSXTKLockImpl.h
rename to Source/layer1/platform/osx/OSXTKLockImpl.h

diff --git a/Source/platform/osx/OSXTKLockImpl.mm b/Source/layer1/platform/osx/OSXTKLockImpl.mm
similarity index 100%
rename from Source/platform/osx/OSXTKLockImpl.mm
rename to Source/layer1/platform/osx/OSXTKLockImpl.mm

diff --git a/Source/platform/osx/TKConsole.mm b/Source/layer1/platform/osx/TKConsole.mm
similarity index 100%
rename from Source/platform/osx/TKConsole.mm
rename to Source/layer1/platform/osx/TKConsole.mm

diff --git a/Source/platform/qt/QtTKConsole.cpp b/Source/layer1/platform/qt/QtTKConsole.cpp
similarity index 100%
rename from Source/platform/qt/QtTKConsole.cpp
rename to Source/layer1/platform/qt/QtTKConsole.cpp

diff --git a/Source/platform/qt/qtdnstorageimpl.cpp b/Source/layer1/platform/qt/qtdnstorageimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdnstorageimpl.cpp
rename to Source/layer1/platform/qt/qtdnstorageimpl.cpp

diff --git a/Source/platform/qt/qtdnstorageimpl.h b/Source/layer1/platform/qt/qtdnstorageimpl.h
similarity index 100%
rename from Source/platform/qt/qtdnstorageimpl.h
rename to Source/layer1/platform/qt/qtdnstorageimpl.h

diff --git a/Source/platform/qt/qttklockimpl.cpp b/Source/layer1/platform/qt/qttklockimpl.cpp
similarity index 100%
rename from Source/platform/qt/qttklockimpl.cpp
rename to Source/layer1/platform/qt/qttklockimpl.cpp

diff --git a/Source/platform/qt/qttklockimpl.h b/Source/layer1/platform/qt/qttklockimpl.h
similarity index 100%
rename from Source/platform/qt/qttklockimpl.h
rename to Source/layer1/platform/qt/qttklockimpl.h

diff --git a/Source/DNContainerBuilder.cpp b/Source/layer2/DNContainerBuilder.cpp
similarity index 100%
rename from Source/DNContainerBuilder.cpp
rename to Source/layer2/DNContainerBuilder.cpp

diff --git a/Source/DNContainerBuilder.h b/Source/layer2/DNContainerBuilder.h
similarity index 100%
rename from Source/DNContainerBuilder.h
rename to Source/layer2/DNContainerBuilder.h

diff --git a/Source/DNDirectory.cpp b/Source/layer2/DNDirectory.cpp
similarity index 100%
rename from Source/DNDirectory.cpp
rename to Source/layer2/DNDirectory.cpp

diff --git a/Source/DNDirectory.h b/Source/layer2/DNDirectory.h
similarity index 100%
rename from Source/DNDirectory.h
rename to Source/layer2/DNDirectory.h

diff --git a/Source/DNDirectoryImpl.h b/Source/layer2/DNDirectoryImpl.h
similarity index 100%
rename from Source/DNDirectoryImpl.h
rename to Source/layer2/DNDirectoryImpl.h

diff --git a/Source/DNFileList.cpp b/Source/layer2/DNFileList.cpp
similarity index 100%
rename from Source/DNFileList.cpp
rename to Source/layer2/DNFileList.cpp

diff --git a/Source/DNFileList.h b/Source/layer2/DNFileList.h
similarity index 100%
rename from Source/DNFileList.h
rename to Source/layer2/DNFileList.h

diff --git a/Source/DNXML.cpp b/Source/layer2/DNXML.cpp
similarity index 100%
rename from Source/DNXML.cpp
rename to Source/layer2/DNXML.cpp

diff --git a/Source/DNXML.h b/Source/layer2/DNXML.h
similarity index 100%
rename from Source/DNXML.h
rename to Source/layer2/DNXML.h

diff --git a/Source/DNXMLElement.cpp b/Source/layer2/DNXMLElement.cpp
similarity index 100%
rename from Source/DNXMLElement.cpp
rename to Source/layer2/DNXMLElement.cpp

diff --git a/Source/DNXMLElement.h b/Source/layer2/DNXMLElement.h
similarity index 100%
rename from Source/DNXMLElement.h
rename to Source/layer2/DNXMLElement.h

diff --git a/Source/DNXMLImpl.h b/Source/layer2/DNXMLImpl.h
similarity index 100%
rename from Source/DNXMLImpl.h
rename to Source/layer2/DNXMLImpl.h

diff --git a/Source/platform/qt/qtdndirectoryimpl.cpp b/Source/layer2/platform/qt/qtdndirectoryimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdndirectoryimpl.cpp
rename to Source/layer2/platform/qt/qtdndirectoryimpl.cpp

diff --git a/Source/platform/qt/qtdndirectoryimpl.h b/Source/layer2/platform/qt/qtdndirectoryimpl.h
similarity index 100%
rename from Source/platform/qt/qtdndirectoryimpl.h
rename to Source/layer2/platform/qt/qtdndirectoryimpl.h

diff --git a/Source/platform/qt/qtdnxmlimpl.cpp b/Source/layer2/platform/qt/qtdnxmlimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdnxmlimpl.cpp
rename to Source/layer2/platform/qt/qtdnxmlimpl.cpp

diff --git a/Source/platform/qt/qtdnxmlimpl.h b/Source/layer2/platform/qt/qtdnxmlimpl.h
similarity index 100%
rename from Source/platform/qt/qtdnxmlimpl.h
rename to Source/layer2/platform/qt/qtdnxmlimpl.h

diff --git a/Source/DNAlert.cpp b/Source/layer3/DNAlert.cpp
similarity index 100%
rename from Source/DNAlert.cpp
rename to Source/layer3/DNAlert.cpp

diff --git a/Source/DNAlert.h b/Source/layer3/DNAlert.h
similarity index 100%
rename from Source/DNAlert.h
rename to Source/layer3/DNAlert.h

diff --git a/Source/DNAlertImpl.h b/Source/layer3/DNAlertImpl.h
similarity index 100%
rename from Source/DNAlertImpl.h
rename to Source/layer3/DNAlertImpl.h

diff --git a/Source/DNEngine.cpp b/Source/layer3/DNEngine.cpp
similarity index 100%
rename from Source/DNEngine.cpp
rename to Source/layer3/DNEngine.cpp

diff --git a/Source/DNEngine.h b/Source/layer3/DNEngine.h
similarity index 100%
rename from Source/DNEngine.h
rename to Source/layer3/DNEngine.h

diff --git a/Source/DNSerialPort.cpp b/Source/layer3/DNSerialPort.cpp
similarity index 100%
rename from Source/DNSerialPort.cpp
rename to Source/layer3/DNSerialPort.cpp

diff --git a/Source/DNSerialPort.h b/Source/layer3/DNSerialPort.h
similarity index 100%
rename from Source/DNSerialPort.h
rename to Source/layer3/DNSerialPort.h

diff --git a/Source/DNSerialPortImpl.h b/Source/layer3/DNSerialPortImpl.h
similarity index 100%
rename from Source/DNSerialPortImpl.h
rename to Source/layer3/DNSerialPortImpl.h

diff --git a/Source/DNServerBase.h b/Source/layer3/DNServerBase.h
similarity index 100%
rename from Source/DNServerBase.h
rename to Source/layer3/DNServerBase.h

diff --git a/Source/DNServerHTTP.cpp b/Source/layer3/DNServerHTTP.cpp
similarity index 100%
rename from Source/DNServerHTTP.cpp
rename to Source/layer3/DNServerHTTP.cpp

diff --git a/Source/DNServerHTTP.h b/Source/layer3/DNServerHTTP.h
similarity index 100%
rename from Source/DNServerHTTP.h
rename to Source/layer3/DNServerHTTP.h

diff --git a/Source/DNServerHTTPImpl.h b/Source/layer3/DNServerHTTPImpl.h
similarity index 100%
rename from Source/DNServerHTTPImpl.h
rename to Source/layer3/DNServerHTTPImpl.h

diff --git a/Source/DNServerSerialPort.cpp b/Source/layer3/DNServerSerialPort.cpp
similarity index 100%
rename from Source/DNServerSerialPort.cpp
rename to Source/layer3/DNServerSerialPort.cpp

diff --git a/Source/DNServerSerialPort.h b/Source/layer3/DNServerSerialPort.h
similarity index 100%
rename from Source/DNServerSerialPort.h
rename to Source/layer3/DNServerSerialPort.h

diff --git a/Source/DNSettings.cpp b/Source/layer3/DNSettings.cpp
similarity index 100%
rename from Source/DNSettings.cpp
rename to Source/layer3/DNSettings.cpp

diff --git a/Source/DNSettings.h b/Source/layer3/DNSettings.h
similarity index 100%
rename from Source/DNSettings.h
rename to Source/layer3/DNSettings.h

diff --git a/Source/DNSettingsImpl.h b/Source/layer3/DNSettingsImpl.h
similarity index 100%
rename from Source/DNSettingsImpl.h
rename to Source/layer3/DNSettingsImpl.h

diff --git a/Source/DNThread.cpp b/Source/layer3/DNThread.cpp
similarity index 100%
rename from Source/DNThread.cpp
rename to Source/layer3/DNThread.cpp

diff --git a/Source/DNThread.h b/Source/layer3/DNThread.h
similarity index 100%
rename from Source/DNThread.h
rename to Source/layer3/DNThread.h

diff --git a/Source/DNThreadImpl.h b/Source/layer3/DNThreadImpl.h
similarity index 100%
rename from Source/DNThreadImpl.h
rename to Source/layer3/DNThreadImpl.h

diff --git a/Source/DNTimeKeeper.cpp b/Source/layer3/DNTimeKeeper.cpp
similarity index 100%
rename from Source/DNTimeKeeper.cpp
rename to Source/layer3/DNTimeKeeper.cpp

diff --git a/Source/DNTimeKeeper.h b/Source/layer3/DNTimeKeeper.h
similarity index 100%
rename from Source/DNTimeKeeper.h
rename to Source/layer3/DNTimeKeeper.h

diff --git a/Source/DNTimeKeeperImpl.h b/Source/layer3/DNTimeKeeperImpl.h
similarity index 100%
rename from Source/DNTimeKeeperImpl.h
rename to Source/layer3/DNTimeKeeperImpl.h

diff --git a/Source/TKJSBasicCell.cpp b/Source/layer3/OSXJSScript/TKJSBasicCell.cpp
similarity index 100%
rename from Source/TKJSBasicCell.cpp
rename to Source/layer3/OSXJSScript/TKJSBasicCell.cpp

diff --git a/Source/TKJSBasicCell.h b/Source/layer3/OSXJSScript/TKJSBasicCell.h
similarity index 100%
rename from Source/TKJSBasicCell.h
rename to Source/layer3/OSXJSScript/TKJSBasicCell.h

diff --git a/Source/TKJSCellBase.cpp b/Source/layer3/OSXJSScript/TKJSCellBase.cpp
similarity index 100%
rename from Source/TKJSCellBase.cpp
rename to Source/layer3/OSXJSScript/TKJSCellBase.cpp

diff --git a/Source/TKJSCellBase.h b/Source/layer3/OSXJSScript/TKJSCellBase.h
similarity index 100%
rename from Source/TKJSCellBase.h
rename to Source/layer3/OSXJSScript/TKJSCellBase.h

diff --git a/Source/TKJSCellCode.cpp b/Source/layer3/OSXJSScript/TKJSCellCode.cpp
similarity index 100%
rename from Source/TKJSCellCode.cpp
rename to Source/layer3/OSXJSScript/TKJSCellCode.cpp

diff --git a/Source/TKJSCellCode.h b/Source/layer3/OSXJSScript/TKJSCellCode.h
similarity index 100%
rename from Source/TKJSCellCode.h
rename to Source/layer3/OSXJSScript/TKJSCellCode.h

diff --git a/Source/TKJSCellCodeInstance.cpp b/Source/layer3/OSXJSScript/TKJSCellCodeInstance.cpp
similarity index 100%
rename from Source/TKJSCellCodeInstance.cpp
rename to Source/layer3/OSXJSScript/TKJSCellCodeInstance.cpp

diff --git a/Source/TKJSCellCodeInstance.h b/Source/layer3/OSXJSScript/TKJSCellCodeInstance.h
similarity index 100%
rename from Source/TKJSCellCodeInstance.h
rename to Source/layer3/OSXJSScript/TKJSCellCodeInstance.h

diff --git a/Source/TKJSContainer.cpp b/Source/layer3/OSXJSScript/TKJSContainer.cpp
similarity index 100%
rename from Source/TKJSContainer.cpp
rename to Source/layer3/OSXJSScript/TKJSContainer.cpp

diff --git a/Source/TKJSContainer.h b/Source/layer3/OSXJSScript/TKJSContainer.h
similarity index 99%
rename from Source/TKJSContainer.h
rename to Source/layer3/OSXJSScript/TKJSContainer.h
index 71a36fd..2c8f605 100644 (file)
--- a/Source/TKJSContainer.h
+++ b/Source/layer3/OSXJSScript/TKJSContainer.h
@@ -57,4 +57,4 @@ private:
 };
 
 
-#endif
\ No newline at end of file
+#endif

diff --git a/Source/QtDennco/dnwebinterface.cpp b/Source/layer3/QtDennco/dnwebinterface.cpp
similarity index 100%
rename from Source/QtDennco/dnwebinterface.cpp
rename to Source/layer3/QtDennco/dnwebinterface.cpp

diff --git a/Source/QtDennco/dnwebinterface.h b/Source/layer3/QtDennco/dnwebinterface.h
similarity index 100%
rename from Source/QtDennco/dnwebinterface.h
rename to Source/layer3/QtDennco/dnwebinterface.h

diff --git a/Source/QtDennco/main.cpp b/Source/layer3/QtDennco/main.cpp
similarity index 100%
rename from Source/QtDennco/main.cpp
rename to Source/layer3/QtDennco/main.cpp

diff --git a/Source/QtDennco/mainwindow.cpp b/Source/layer3/QtDennco/mainwindow.cpp
similarity index 100%
rename from Source/QtDennco/mainwindow.cpp
rename to Source/layer3/QtDennco/mainwindow.cpp

diff --git a/Source/QtDennco/mainwindow.h b/Source/layer3/QtDennco/mainwindow.h
similarity index 100%
rename from Source/QtDennco/mainwindow.h
rename to Source/layer3/QtDennco/mainwindow.h

diff --git a/Source/QtDennco/mainwindow.ui b/Source/layer3/QtDennco/mainwindow.ui
similarity index 100%
rename from Source/QtDennco/mainwindow.ui
rename to Source/layer3/QtDennco/mainwindow.ui

diff --git a/Source/QtDennco/portinfodialog.ui b/Source/layer3/QtDennco/portinfodialog.ui
similarity index 100%
rename from Source/QtDennco/portinfodialog.ui
rename to Source/layer3/QtDennco/portinfodialog.ui

diff --git a/Source/QtScript/dnqsbasiccell.cpp b/Source/layer3/QtScript/dnqsbasiccell.cpp
similarity index 100%
rename from Source/QtScript/dnqsbasiccell.cpp
rename to Source/layer3/QtScript/dnqsbasiccell.cpp

diff --git a/Source/QtScript/dnqsbasiccell.h b/Source/layer3/QtScript/dnqsbasiccell.h
similarity index 100%
rename from Source/QtScript/dnqsbasiccell.h
rename to Source/layer3/QtScript/dnqsbasiccell.h

diff --git a/Source/QtScript/dnqsbasicstoragecell.cpp b/Source/layer3/QtScript/dnqsbasicstoragecell.cpp
similarity index 100%
rename from Source/QtScript/dnqsbasicstoragecell.cpp
rename to Source/layer3/QtScript/dnqsbasicstoragecell.cpp

diff --git a/Source/QtScript/dnqsbasicstoragecell.h b/Source/layer3/QtScript/dnqsbasicstoragecell.h
similarity index 100%
rename from Source/QtScript/dnqsbasicstoragecell.h
rename to Source/layer3/QtScript/dnqsbasicstoragecell.h

diff --git a/Source/QtScript/dnqscellbase.cpp b/Source/layer3/QtScript/dnqscellbase.cpp
similarity index 100%
rename from Source/QtScript/dnqscellbase.cpp
rename to Source/layer3/QtScript/dnqscellbase.cpp

diff --git a/Source/QtScript/dnqscellbase.h b/Source/layer3/QtScript/dnqscellbase.h
similarity index 100%
rename from Source/QtScript/dnqscellbase.h
rename to Source/layer3/QtScript/dnqscellbase.h

diff --git a/Source/QtScript/dnqscellcode.cpp b/Source/layer3/QtScript/dnqscellcode.cpp
similarity index 100%
rename from Source/QtScript/dnqscellcode.cpp
rename to Source/layer3/QtScript/dnqscellcode.cpp

diff --git a/Source/QtScript/dnqscellcode.h b/Source/layer3/QtScript/dnqscellcode.h
similarity index 100%
rename from Source/QtScript/dnqscellcode.h
rename to Source/layer3/QtScript/dnqscellcode.h

diff --git a/Source/QtScript/dnqscellcodeinstance.cpp b/Source/layer3/QtScript/dnqscellcodeinstance.cpp
similarity index 100%
rename from Source/QtScript/dnqscellcodeinstance.cpp
rename to Source/layer3/QtScript/dnqscellcodeinstance.cpp

diff --git a/Source/QtScript/dnqscellcodeinstance.h b/Source/layer3/QtScript/dnqscellcodeinstance.h
similarity index 100%
rename from Source/QtScript/dnqscellcodeinstance.h
rename to Source/layer3/QtScript/dnqscellcodeinstance.h

diff --git a/Source/QtScript/dnqscontainer.cpp b/Source/layer3/QtScript/dnqscontainer.cpp
similarity index 100%
rename from Source/QtScript/dnqscontainer.cpp
rename to Source/layer3/QtScript/dnqscontainer.cpp

diff --git a/Source/QtScript/dnqscontainer.h b/Source/layer3/QtScript/dnqscontainer.h
similarity index 100%
rename from Source/QtScript/dnqscontainer.h
rename to Source/layer3/QtScript/dnqscontainer.h

diff --git a/Source/QtScript/dnqsinputcell.cpp b/Source/layer3/QtScript/dnqsinputcell.cpp
similarity index 100%
rename from Source/QtScript/dnqsinputcell.cpp
rename to Source/layer3/QtScript/dnqsinputcell.cpp

diff --git a/Source/QtScript/dnqsinputcell.h b/Source/layer3/QtScript/dnqsinputcell.h
similarity index 100%
rename from Source/QtScript/dnqsinputcell.h
rename to Source/layer3/QtScript/dnqsinputcell.h

diff --git a/Source/QtScript/dnqsoutputcell.cpp b/Source/layer3/QtScript/dnqsoutputcell.cpp
similarity index 100%
rename from Source/QtScript/dnqsoutputcell.cpp
rename to Source/layer3/QtScript/dnqsoutputcell.cpp

diff --git a/Source/QtScript/dnqsoutputcell.h b/Source/layer3/QtScript/dnqsoutputcell.h
similarity index 100%
rename from Source/QtScript/dnqsoutputcell.h
rename to Source/layer3/QtScript/dnqsoutputcell.h

diff --git a/Source/TKUICell.cpp b/Source/layer3/TKUICell.cpp
similarity index 100%
rename from Source/TKUICell.cpp
rename to Source/layer3/TKUICell.cpp

diff --git a/Source/TKUICell.h b/Source/layer3/TKUICell.h
similarity index 100%
rename from Source/TKUICell.h
rename to Source/layer3/TKUICell.h

diff --git a/Source/dennco.h b/Source/layer3/dennco.h
similarity index 100%
rename from Source/dennco.h
rename to Source/layer3/dennco.h

diff --git a/Source/platform/osx/OSXDNAlert.h b/Source/layer3/platform/osx/OSXDNAlert.h
similarity index 100%
rename from Source/platform/osx/OSXDNAlert.h
rename to Source/layer3/platform/osx/OSXDNAlert.h

diff --git a/Source/platform/osx/OSXDNAlert.mm b/Source/layer3/platform/osx/OSXDNAlert.mm
similarity index 100%
rename from Source/platform/osx/OSXDNAlert.mm
rename to Source/layer3/platform/osx/OSXDNAlert.mm

diff --git a/Source/platform/osx/OSXDNDirectoryImpl.h b/Source/layer3/platform/osx/OSXDNDirectoryImpl.h
similarity index 100%
rename from Source/platform/osx/OSXDNDirectoryImpl.h
rename to Source/layer3/platform/osx/OSXDNDirectoryImpl.h

diff --git a/Source/platform/osx/OSXDNDirectoryImpl.mm b/Source/layer3/platform/osx/OSXDNDirectoryImpl.mm
similarity index 100%
rename from Source/platform/osx/OSXDNDirectoryImpl.mm
rename to Source/layer3/platform/osx/OSXDNDirectoryImpl.mm

diff --git a/Source/platform/osx/OSXDNSimpleHTTPServerImpl.h b/Source/layer3/platform/osx/OSXDNSimpleHTTPServerImpl.h
similarity index 100%
rename from Source/platform/osx/OSXDNSimpleHTTPServerImpl.h
rename to Source/layer3/platform/osx/OSXDNSimpleHTTPServerImpl.h

diff --git a/Source/platform/osx/OSXDNSimpleHTTPServerImpl.mm b/Source/layer3/platform/osx/OSXDNSimpleHTTPServerImpl.mm
similarity index 100%
rename from Source/platform/osx/OSXDNSimpleHTTPServerImpl.mm
rename to Source/layer3/platform/osx/OSXDNSimpleHTTPServerImpl.mm

diff --git a/Source/platform/osx/OSXDNTimeKeeperImpl.h b/Source/layer3/platform/osx/OSXDNTimeKeeperImpl.h
similarity index 100%
rename from Source/platform/osx/OSXDNTimeKeeperImpl.h
rename to Source/layer3/platform/osx/OSXDNTimeKeeperImpl.h

diff --git a/Source/platform/osx/OSXDNTimeKeeperImpl.mm b/Source/layer3/platform/osx/OSXDNTimeKeeperImpl.mm
similarity index 100%
rename from Source/platform/osx/OSXDNTimeKeeperImpl.mm
rename to Source/layer3/platform/osx/OSXDNTimeKeeperImpl.mm

diff --git a/Source/platform/osx/OSXDNXMLImpl.h b/Source/layer3/platform/osx/OSXDNXMLImpl.h
similarity index 100%
rename from Source/platform/osx/OSXDNXMLImpl.h
rename to Source/layer3/platform/osx/OSXDNXMLImpl.h

diff --git a/Source/platform/osx/OSXDNXMLImpl.mm b/Source/layer3/platform/osx/OSXDNXMLImpl.mm
similarity index 100%
rename from Source/platform/osx/OSXDNXMLImpl.mm
rename to Source/layer3/platform/osx/OSXDNXMLImpl.mm

diff --git a/Source/platform/osx/SimpleHTTPConnection.h b/Source/layer3/platform/osx/SimpleHTTPConnection.h
similarity index 100%
rename from Source/platform/osx/SimpleHTTPConnection.h
rename to Source/layer3/platform/osx/SimpleHTTPConnection.h

diff --git a/Source/platform/osx/SimpleHTTPConnection.mm b/Source/layer3/platform/osx/SimpleHTTPConnection.mm
similarity index 100%
rename from Source/platform/osx/SimpleHTTPConnection.mm
rename to Source/layer3/platform/osx/SimpleHTTPConnection.mm

diff --git a/Source/platform/osx/SimpleHTTPServer.h b/Source/layer3/platform/osx/SimpleHTTPServer.h
similarity index 100%
rename from Source/platform/osx/SimpleHTTPServer.h
rename to Source/layer3/platform/osx/SimpleHTTPServer.h

diff --git a/Source/platform/osx/SimpleHTTPServer.mm b/Source/layer3/platform/osx/SimpleHTTPServer.mm
similarity index 100%
rename from Source/platform/osx/SimpleHTTPServer.mm
rename to Source/layer3/platform/osx/SimpleHTTPServer.mm

diff --git a/Source/platform/osx/SimpleHTTPServerController.h b/Source/layer3/platform/osx/SimpleHTTPServerController.h
similarity index 100%
rename from Source/platform/osx/SimpleHTTPServerController.h
rename to Source/layer3/platform/osx/SimpleHTTPServerController.h

diff --git a/Source/platform/osx/SimpleHTTPServerController.mm b/Source/layer3/platform/osx/SimpleHTTPServerController.mm
similarity index 100%
rename from Source/platform/osx/SimpleHTTPServerController.mm
rename to Source/layer3/platform/osx/SimpleHTTPServerController.mm

diff --git a/Source/platform/qt/qtdnalertimpl.cpp b/Source/layer3/platform/qt/qtdnalertimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdnalertimpl.cpp
rename to Source/layer3/platform/qt/qtdnalertimpl.cpp

diff --git a/Source/platform/qt/qtdnalertimpl.h b/Source/layer3/platform/qt/qtdnalertimpl.h
similarity index 100%
rename from Source/platform/qt/qtdnalertimpl.h
rename to Source/layer3/platform/qt/qtdnalertimpl.h

diff --git a/Source/platform/qt/qtdnserialportimpl.cpp b/Source/layer3/platform/qt/qtdnserialportimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdnserialportimpl.cpp
rename to Source/layer3/platform/qt/qtdnserialportimpl.cpp

diff --git a/Source/platform/qt/qtdnserialportimpl.h b/Source/layer3/platform/qt/qtdnserialportimpl.h
similarity index 100%
rename from Source/platform/qt/qtdnserialportimpl.h
rename to Source/layer3/platform/qt/qtdnserialportimpl.h

diff --git a/Source/platform/qt/qtdnsettingsimpl.cpp b/Source/layer3/platform/qt/qtdnsettingsimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdnsettingsimpl.cpp
rename to Source/layer3/platform/qt/qtdnsettingsimpl.cpp

diff --git a/Source/platform/qt/qtdnthreadimpl.cpp b/Source/layer3/platform/qt/qtdnthreadimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdnthreadimpl.cpp
rename to Source/layer3/platform/qt/qtdnthreadimpl.cpp

diff --git a/Source/platform/qt/qtdnthreadimpl.h b/Source/layer3/platform/qt/qtdnthreadimpl.h
similarity index 100%
rename from Source/platform/qt/qtdnthreadimpl.h
rename to Source/layer3/platform/qt/qtdnthreadimpl.h

diff --git a/Source/platform/qt/qtdntimekeeperimpl.cpp b/Source/layer3/platform/qt/qtdntimekeeperimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtdntimekeeperimpl.cpp
rename to Source/layer3/platform/qt/qtdntimekeeperimpl.cpp

diff --git a/Source/platform/qt/qtdntimekeeperimpl.h b/Source/layer3/platform/qt/qtdntimekeeperimpl.h
similarity index 100%
rename from Source/platform/qt/qtdntimekeeperimpl.h
rename to Source/layer3/platform/qt/qtdntimekeeperimpl.h

diff --git a/Source/platform/qt/qtsimplehttpserverimpl.cpp b/Source/layer3/platform/qt/qtsimplehttpserverimpl.cpp
similarity index 100%
rename from Source/platform/qt/qtsimplehttpserverimpl.cpp
rename to Source/layer3/platform/qt/qtsimplehttpserverimpl.cpp

diff --git a/Source/platform/qt/qtsimplehttpserverimpl.h b/Source/layer3/platform/qt/qtsimplehttpserverimpl.h
similarity index 100%
rename from Source/platform/qt/qtsimplehttpserverimpl.h
rename to Source/layer3/platform/qt/qtsimplehttpserverimpl.h

diff --git a/Source/versioninfo.h b/Source/versioninfo.h
index a4eb642..de81b28 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.0"
-#define ENGINE_VERSION      "alpha 1.0"
+#define CONTAINER_VERSION   "alpha 1.1"
+#define ENGINE_VERSION      "alpha 1.1"
 
 #endif // VERSIONINFO_H