#2 project tree rearanged

Signed-off-by: kornicameister <[email protected]>
floreks · Mar 10, 2013 · 116652c · 116652c
1 parent 558ae40
commit 116652c
Show file tree

Hide file tree

Showing 40 changed files with 970 additions and 46 deletions.
diff --git a/src/Qubic.pro → qubic/src/Qubic.pro b/src/Qubic.pro → qubic/src/Qubic.pro
diff --git a/qubic/src/Qubic.pro.user.0000000 b/qubic/src/Qubic.pro.user.0000000
diff --git a/qubic/src/Qubic.pro.user.2.6pre1 b/qubic/src/Qubic.pro.user.2.6pre1
diff --git a/qubic/src/Qubic.pro.user.2806d0d b/qubic/src/Qubic.pro.user.2806d0d
diff --git a/qubic/src/Qubic.pro.user.845cea4 b/qubic/src/Qubic.pro.user.845cea4
diff --git a/src/QubicORM/ConfigurationModule/README.md → ...rc/QubicORM/ConfigurationModule/README.md b/src/QubicORM/ConfigurationModule/README.md → ...rc/QubicORM/ConfigurationModule/README.md
diff --git a/...igurationModule/qcconfigurationreader.cpp → ...igurationModule/qcconfigurationreader.cpp b/...igurationModule/qcconfigurationreader.cpp → ...igurationModule/qcconfigurationreader.cpp
diff --git a/...nfigurationModule/qcconfigurationreader.h → ...nfigurationModule/qcconfigurationreader.h b/...nfigurationModule/qcconfigurationreader.h → ...nfigurationModule/qcconfigurationreader.h
diff --git a/src/QubicORM/ConnectionModule/README.md → ...c/src/QubicORM/ConnectionModule/README.md b/src/QubicORM/ConnectionModule/README.md → ...c/src/QubicORM/ConnectionModule/README.md
diff --git a/.../ConnectionModule/qcconnectionmanager.cpp → .../ConnectionModule/qcconnectionmanager.cpp b/.../ConnectionModule/qcconnectionmanager.cpp → .../ConnectionModule/qcconnectionmanager.cpp
diff --git a/...RM/ConnectionModule/qcconnectionmanager.h → ...RM/ConnectionModule/qcconnectionmanager.h b/...RM/ConnectionModule/qcconnectionmanager.h → ...RM/ConnectionModule/qcconnectionmanager.h
diff --git a/src/QubicORM/QCSession → qubic/src/QubicORM/QCSession b/src/QubicORM/QCSession → qubic/src/QubicORM/QCSession
diff --git a/...bicORM/QubeModule/model/qubeinterface.cpp → ...bicORM/QubeModule/model/qubeinterface.cpp b/...bicORM/QubeModule/model/qubeinterface.cpp → ...bicORM/QubeModule/model/qubeinterface.cpp
@@ -2,7 +2,7 @@
 
 QC_BEGIN_NAMESPACE
 
-QubeInterface::QubeInterface(QubeModel *parent) :
+QubeInterface::QubeInterface(QObject *parent) :
     QObject(parent){
 }
 

diff --git a/...QubicORM/QubeModule/model/qubeinterface.h → ...QubicORM/QubeModule/model/qubeinterface.h b/...QubicORM/QubeModule/model/qubeinterface.h → ...QubicORM/QubeModule/model/qubeinterface.h
@@ -2,15 +2,15 @@
 #define QUBEINTERFACE_H
 
 #include "private/qubicorm.h"
+#include "qubemodel.h"
 #include <QSet>
 
 QC_BEGIN_NAMESPACE
 
-QC_USES(QubeModel)
 class QC_HIDE QubeInterface : public QObject {
     Q_OBJECT
 public:
-    explicit QubeInterface(QubeModel *parent = 0);
+    explicit QubeInterface(QObject *parent = 0);
 
     QSet<QPointer<QubeModel> >      all() = 0;
 

diff --git a/src/QubicORM/QubeModule/model/qubemodel.cpp → ...c/QubicORM/QubeModule/model/qubemodel.cpp b/src/QubicORM/QubeModule/model/qubemodel.cpp → ...c/QubicORM/QubeModule/model/qubemodel.cpp
@@ -1,6 +1,9 @@
 #include "qubemodel.h"
 
+QC_BEGIN_NAMESPACE
+
 QubeModel::QubeModel(QObject *parent) :
-    QObject(parent)
-{
+    QObject(parent){
 }
+
+QC_END_NAMESPACE
diff --git a/src/QubicORM/QubeModule/model/qubemodel.h → ...src/QubicORM/QubeModule/model/qubemodel.h b/src/QubicORM/QubeModule/model/qubemodel.h → ...src/QubicORM/QubeModule/model/qubemodel.h
@@ -2,20 +2,16 @@
 #define QUBEMODEL_H
 
 #include "private/qubicorm.h"
+#include "qubeinterface.h"
 
 QC_BEGIN_NAMESPACE
 
-QC_USES(QubeInterface)
 class QC_IMPORT QubeModel : public QObject{
     Q_OBJECT
 public:
     explicit QubeModel(QObject *parent = 0);
-
-
-signals:
-
-public slots:
-
+protected:
+    QubeInterface dao;
 };
 
 QC_END_NAMESPACE

diff --git a/src/QubicORM/QubeModule/qubeprocessor.cpp → ...src/QubicORM/QubeModule/qubeprocessor.cpp b/src/QubicORM/QubeModule/qubeprocessor.cpp → ...src/QubicORM/QubeModule/qubeprocessor.cpp
diff --git a/src/QubicORM/QubeModule/qubeprocessor.h → ...c/src/QubicORM/QubeModule/qubeprocessor.h b/src/QubicORM/QubeModule/qubeprocessor.h → ...c/src/QubicORM/QubeModule/qubeprocessor.h
diff --git a/src/QubicORM/QubicORM.pro → qubic/src/QubicORM/QubicORM.pro b/src/QubicORM/QubicORM.pro → qubic/src/QubicORM/QubicORM.pro
diff --git a/src/QubicORM/QubiconsModule/qubicon.h → qubic/src/QubicORM/QubiconsModule/qubicon.h b/src/QubicORM/QubiconsModule/qubicon.h → qubic/src/QubicORM/QubiconsModule/qubicon.h
diff --git a/...bicORM/QubiconsModule/qubiconcompiler.cpp → ...bicORM/QubiconsModule/qubiconcompiler.cpp b/...bicORM/QubiconsModule/qubiconcompiler.cpp → ...bicORM/QubiconsModule/qubiconcompiler.cpp
diff --git a/...QubicORM/QubiconsModule/qubiconcompiler.h → ...QubicORM/QubiconsModule/qubiconcompiler.h b/...QubicORM/QubiconsModule/qubiconcompiler.h → ...QubicORM/QubiconsModule/qubiconcompiler.h
diff --git a/src/QubicORM/QubiconsModule/qubicons.h → qubic/src/QubicORM/QubiconsModule/qubicons.h b/src/QubicORM/QubiconsModule/qubicons.h → qubic/src/QubicORM/QubiconsModule/qubicons.h
diff --git a/src/QubicORM/README.md → qubic/src/QubicORM/README.md b/src/QubicORM/README.md → qubic/src/QubicORM/README.md
diff --git a/src/QubicORM/private/pch.h → qubic/src/QubicORM/private/pch.h b/src/QubicORM/private/pch.h → qubic/src/QubicORM/private/pch.h
diff --git a/src/QubicORM/private/qubicorm.h → qubic/src/QubicORM/private/qubicorm.h b/src/QubicORM/private/qubicorm.h → qubic/src/QubicORM/private/qubicorm.h
diff --git a/...stingFacility/ConnectionManagerTestUnit.h → ...stingFacility/ConnectionManagerTestUnit.h b/...stingFacility/ConnectionManagerTestUnit.h → ...stingFacility/ConnectionManagerTestUnit.h
diff --git a/src/TestingFacility/TestingFacility.pro → ...c/src/TestingFacility/TestingFacility.pro b/src/TestingFacility/TestingFacility.pro → ...c/src/TestingFacility/TestingFacility.pro
diff --git a/src/Utilities/Utilities.pro → qubic/src/Utilities/Utilities.pro b/src/Utilities/Utilities.pro → qubic/src/Utilities/Utilities.pro
diff --git a/src/Utilities/Utilities_global.h → qubic/src/Utilities/Utilities_global.h b/src/Utilities/Utilities_global.h → qubic/src/Utilities/Utilities_global.h
diff --git a/src/Utilities/utilities.cpp → qubic/src/Utilities/utilities.cpp b/src/Utilities/utilities.cpp → qubic/src/Utilities/utilities.cpp
diff --git a/src/Utilities/utilities.h → qubic/src/Utilities/utilities.h b/src/Utilities/utilities.h → qubic/src/Utilities/utilities.h
diff --git a/uml/LOG → qubic/uml/LOG b/uml/LOG → qubic/uml/LOG
diff --git a/uml/README → qubic/uml/README b/uml/README → qubic/uml/README
diff --git a/uml/use_case_configuration.dia → qubic/uml/use_case_configuration.dia b/uml/use_case_configuration.dia → qubic/uml/use_case_configuration.dia
diff --git a/uml/use_case_configuration.svg → qubic/uml/use_case_configuration.svg b/uml/use_case_configuration.svg → qubic/uml/use_case_configuration.svg
diff --git a/xsd/qubeCfg.xsd → qubic/xsd/qubeCfg.xsd b/xsd/qubeCfg.xsd → qubic/xsd/qubeCfg.xsd
diff --git a/xsd/qubic.xsd → qubic/xsd/qubic.xsd b/xsd/qubic.xsd → qubic/xsd/qubic.xsd
diff --git a/xsd/sample_qubic_cfg.xml → qubic/xsd/sample_qubic_cfg.xml b/xsd/sample_qubic_cfg.xml → qubic/xsd/sample_qubic_cfg.xml
diff --git a/src/QubicORM/QubeModule/model/qubeinterface (117-kornik's conflicted copy 2013-02-01).h b/src/QubicORM/QubeModule/model/qubeinterface (117-kornik's conflicted copy 2013-02-01).h