Reorganize files in pglablib

The enitities and containers of the catalog now go into catalog subfolder
Models go into model

pglablib/QueryGenerator.cpp

@@ -1,8 +1,8 @@
 #include "QueryGenerator.h"
-#include "PgDatabaseCatalog.h"
-#include "PgClass.h"
-#include "PgNamespace.h"
-#include "PgNamespaceContainer.h"
+#include "catalog/PgDatabaseCatalog.h"
+#include "catalog/PgClass.h"
+#include "catalog/PgNamespace.h"
+#include "catalog/PgNamespaceContainer.h"
 
 using namespace Querygen;
 

pglablib/SelectionEditorFactory.cpp

@@ -1,5 +1,5 @@
 #include "SelectionEditorFactory.h"
-#include "TypeSelectionItemModel.h"
+#include "model/TypeSelectionItemModel.h"
 #include "AbstractModelFactory.h"
 #include <QComboBox>
 

pglablib/SqlFormattingUtils.cpp

@@ -2,16 +2,16 @@
 #include <QStringBuilder>
 
 #include <cassert>
-#include "PgKeywordList.h"
+#include "catalog/PgKeywordList.h"
 
-#include "PgConstraint.h"
-#include "PgAttributeContainer.h"
-#include "PgClass.h"
-#include "PgClassContainer.h"
-#include "PgIndex.h"
-#include "PgNamespace.h"
-#include "PgNamespaceContainer.h"
-#include "PgDatabaseCatalog.h"
+#include "catalog/PgConstraint.h"
+#include "catalog/PgAttributeContainer.h"
+#include "catalog/PgClass.h"
+#include "catalog/PgClassContainer.h"
+#include "catalog/PgIndex.h"
+#include "catalog/PgNamespace.h"
+#include "catalog/PgNamespaceContainer.h"
+#include "catalog/PgDatabaseCatalog.h"
 
 namespace {
 

pglablib/codebuilder/DefaultConfigs.cpp

@@ -6,7 +6,7 @@
 #include "StructureTemplate.h"
 #include "TypeMappings.h"
 #include "Pgsql_oids.h"
-#include "PgDatabaseCatalog.h"
+#include "catalog/PgDatabaseCatalog.h"
 
 using namespace Pgsql;
 
@@ -29,7 +29,7 @@ std::shared_ptr<const TypeMappings>  GetPglabCppTypeMappings(std::shared_ptr<con
 	});
 	tm->setDefaultStringType("QString");
 	tm->setDefaultContainerType("std::vector<%1>");
-	return tm;
+	return std::move(tm);
 }
 
 std::shared_ptr<StructureTemplate> buildPglabStructureTemplate()

pglablib/codebuilder/TypeMappings.cpp

@@ -1,5 +1,5 @@
 #include "TypeMappings.h"
-#include "PgTypeContainer.h"
+#include "catalog/PgTypeContainer.h"
 
 //namespace {
 //	using Fallbacks = std::unordered_map<Oid, Oid>;

pglablib/model/CollationModel.cpp

@@ -0,0 +1,6 @@
+#include "CollationModel.h"
+
+CollationModel::CollationModel()
+{
+
+}

pglablib/model/CollationModel.h

@@ -0,0 +1,11 @@
+#ifndef COLLATIONMODEL_H
+#define COLLATIONMODEL_H
+
+
+class CollationModel
+{
+public:
+	CollationModel();
+};
+
+#endif // COLLATIONMODEL_H

pglablib/model/CollationModelFactory.cpp

@@ -0,0 +1,6 @@
+#include "CollationModelFactory.h"
+
+CollationModelFactory::CollationModelFactory()
+{
+
+}

pglablib/model/CollationModelFactory.h

@@ -0,0 +1,11 @@
+#ifndef COLLATIONMODELFACTORY_H
+#define COLLATIONMODELFACTORY_H
+
+
+class CollationModelFactory
+{
+public:
+	CollationModelFactory();
+};
+
+#endif // COLLATIONMODELFACTORY_H

pglablib/model/TypeModelFactory.h

@@ -4,7 +4,6 @@
 #include "AbstractModelFactory.h"
 
 class PgTypeContainer;
-void setTypeList();
 
 class TypeModelFactory: public AbstractModelFactory {
 	Q_OBJECT

pglablib/model/TypeSelectionItemModel.cpp

@@ -1,5 +1,5 @@
 #include "TypeSelectionItemModel.h"
-#include "PgTypeContainer.h"
+#include "catalog/PgTypeContainer.h"
 #include <algorithm>
 
 TypeSelectionItemModel::TypeSelectionItemModel(QObject *parent)

pglablib/pglablib.pro

@@ -25,123 +25,123 @@ SOURCES += \
         Pglablib.cpp \
 	ASyncDBConnection.cpp \
 	ConnectionConfig.cpp \
-	PgType.cpp \
-	PgTypeContainer.cpp \
-    PgNamespace.cpp \
-    PgClass.cpp \
-    PgDatabase.cpp \
-    PgDatabaseContainer.cpp \
-    PgAuthId.cpp \
-    PgAuthIdContainer.cpp \
-    PgClassContainer.cpp \
-    PgDatabaseCatalog.cpp \
-    PgNamespaceContainer.cpp \
-    PgAttribute.cpp \
-    PgContainer.cpp \
-    PgAttributeContainer.cpp \
-    PgIndex.cpp \
-    PgIndexContainer.cpp \
-    PgConstraint.cpp \
-    PgConstraintContainer.cpp \
+	catalog/PgType.cpp \
+	catalog/PgTypeContainer.cpp \
+    catalog/PgNamespace.cpp \
+    catalog/PgClass.cpp \
+    catalog/PgDatabase.cpp \
+    catalog/PgDatabaseContainer.cpp \
+    catalog/PgAuthId.cpp \
+    catalog/PgAuthIdContainer.cpp \
+    catalog/PgClassContainer.cpp \
+    catalog/PgDatabaseCatalog.cpp \
+    catalog/PgNamespaceContainer.cpp \
+    catalog/PgAttribute.cpp \
+    catalog/PgContainer.cpp \
+    catalog/PgAttributeContainer.cpp \
+    catalog/PgIndex.cpp \
+    catalog/PgIndexContainer.cpp \
+    catalog/PgConstraint.cpp \
+    catalog/PgConstraintContainer.cpp \
     ParamListJson.cpp \
     ParamListModel.cpp \
     util.cpp \
     SqlFormattingUtils.cpp \
-    PgKeywordList.cpp \
+    catalog/PgKeywordList.cpp \
     QueryGenerator.cpp \
-    PgAm.cpp \
-    PgAmContainer.cpp \
-    PgObject.cpp \
-    PgTablespace.cpp \
-PgTablespaceContainer.cpp \
-codebuilder/LanguageConfig.cpp \
-codebuilder/CodeBuilder.cpp \
-codebuilder/NameManglingRules.cpp \
-codebuilder/DefaultConfigs.cpp \
-codebuilder/TypeMappings.cpp \
-codebuilder/IndentationConfig.cpp \
-codebuilder/StructureTemplate.cpp \
+    catalog/PgObject.cpp \
+    catalog/PgTablespace.cpp \
+    catalog/PgTablespaceContainer.cpp \
+    codebuilder/LanguageConfig.cpp \
+    codebuilder/CodeBuilder.cpp \
+    codebuilder/NameManglingRules.cpp \
+    codebuilder/DefaultConfigs.cpp \
+    codebuilder/TypeMappings.cpp \
+    codebuilder/IndentationConfig.cpp \
+    codebuilder/StructureTemplate.cpp \
     FormatToStream.cpp \
     codebuilder/StringLiteralRules.cpp \
     codebuilder/StringEscapeRule.cpp \
-    PgTrigger.cpp \
-    PgTriggerContainer.cpp \
-    PgProc.cpp \
-    PgProcContainer.cpp \
-    PgDatabaseObject.cpp \
-    PgServerObject.cpp \
-    PgOwnedObject.cpp \
-    PgNamespaceObject.cpp \
-    PgCollation.cpp \
-    PgCollationContainer.cpp \
-    PgInherits.cpp \
-    PgInheritsContainer.cpp \
-    TypeSelectionItemModel.cpp \
+    catalog/PgTrigger.cpp \
+    catalog/PgTriggerContainer.cpp \
+    catalog/PgProc.cpp \
+    catalog/PgProcContainer.cpp \
+    catalog/PgDatabaseObject.cpp \
+    catalog/PgServerObject.cpp \
+    catalog/PgOwnedObject.cpp \
+    catalog/PgNamespaceObject.cpp \
+    catalog/PgCollation.cpp \
+    catalog/PgCollationContainer.cpp \
+    catalog/PgInherits.cpp \
+    catalog/PgInheritsContainer.cpp \
     SelectionEditorFactory.cpp \
-    TypeModelFactory.cpp
+    catalog/PgAm.cpp \
+    model/TypeModelFactory.cpp \
+    model/TypeSelectionItemModel.cpp \
+    catalog/PgAmContainer.cpp
 
 HEADERS += \
         Pglablib.h \
 	ASyncDBConnection.h \
 	ConnectionConfig.h \
-	PgType.h \
-	PgTypeContainer.h \
-    PgNamespace.h \
-    PgClass.h \
-    PgDatabase.h \
-    PgDatabaseContainer.h \
-    PgContainer.h \
-    PgAuthId.h \
-    PgAuthIdContainer.h \
-    PgClassContainer.h \
-    PgDatabaseCatalog.h \
-    PgNamespaceContainer.h \
-    PgAttribute.h \
-    PgAttributeContainer.h \
-    PgIndex.h \
-    PgIndexContainer.h \
-    PgConstraint.h \
-    PgConstraintContainer.h \
+	catalog/PgType.h \
+	catalog/PgTypeContainer.h \
+    catalog/PgNamespace.h \
+    catalog/PgClass.h \
+    catalog/PgDatabase.h \
+    catalog/PgDatabaseContainer.h \
+    catalog/PgContainer.h \
+    catalog/PgAuthId.h \
+    catalog/PgAuthIdContainer.h \
+    catalog/PgClassContainer.h \
+    catalog/PgDatabaseCatalog.h \
+    catalog/PgNamespaceContainer.h \
+    catalog/PgAttribute.h \
+    catalog/PgAttributeContainer.h \
+    catalog/PgIndex.h \
+    catalog/PgIndexContainer.h \
+    catalog/PgConstraint.h \
+    catalog/PgConstraintContainer.h \
     ParamListJson.h \
     ParamListModel.h \
     util.h \ 
     SqlFormattingUtils.h \
-    PgCatalogTypes.h \
-    PgKeywordList.h \
+    catalog/PgCatalogTypes.h \
+    catalog/PgKeywordList.h \
     QueryGenerator.h \
-    PgAm.h \
-    PgAmContainer.h \
-    PgObject.h \
-    PgTablespace.h \
-PgTablespaceContainer.h \
-codebuilder/LanguageConfig.h \
-codebuilder/CodeBuilder.h \
-codebuilder/NameManglingRules.h \
-codebuilder/DefaultConfigs.h \
-codebuilder/TypeMappings.h \
-codebuilder/IndentationConfig.h \
-codebuilder/StructureTemplate.h \
+    catalog/PgObject.h \
+    catalog/PgTablespace.h \
+    catalog/PgTablespaceContainer.h \
+    codebuilder/LanguageConfig.h \
+    codebuilder/CodeBuilder.h \
+    codebuilder/NameManglingRules.h \
+    codebuilder/DefaultConfigs.h \
+    codebuilder/TypeMappings.h \
+    codebuilder/IndentationConfig.h \
+    codebuilder/StructureTemplate.h \
     FormatToStream.h \
     codebuilder/ResultLoopTemplate.h \
     codebuilder/StringEscapeRule.h \
     codebuilder/StringLiteralRules.h \
-    PgTrigger.h \
-    PgTriggerContainer.h \
-    PgProc.h \
-    PgProcContainer.h \
-    PgDatabaseObject.h \
-    PgServerObject.h \
-    PgOwnedObject.h \
-    PgNamespaceObject.h \
-    PgCollation.h \
-    PgCollationContainer.h \
+    catalog/PgTrigger.h \
+    catalog/PgTriggerContainer.h \
+    catalog/PgProc.h \
+    catalog/PgProcContainer.h \
+    catalog/PgDatabaseObject.h \
+    catalog/PgServerObject.h \
+    catalog/PgOwnedObject.h \
+    catalog/PgNamespaceObject.h \
+    catalog/PgCollation.h \
+    catalog/PgCollationContainer.h \
     AbstractModelFactory.h \
     AbstractEditorFactory.h \
-    PgInherits.h \
-    PgInheritsContainer.h \
+    catalog/PgInherits.h \
+    catalog/PgInheritsContainer.h \
     SelectionEditorFactory.h \
-    TypeSelectionItemModel.h \
-    TypeModelFactory.h
+    model/TypeSelectionItemModel.h \
+    model/TypeModelFactory.h \
+    catalog/PgAm.h \
+    catalog/PgAmContainer.h
 
 unix {
     target.path = /usr/lib