Move some RepoMan code around

scunz · scunz · commit 04a20d9d6cea · 2015-03-22T01:40:34.000Z
diff --git a/Libs/libMacGitverCore/CMakeLists.txt b/Libs/libMacGitverCore/CMakeLists.txt
@@ -37,20 +37,21 @@ SET( SRC_FILES
     MacGitver/GitPatchConsumer.cpp
 
     RepoMan/AutoRefresher.cpp
-    RepoMan/Base.cpp
-    RepoMan/Ref.cpp
-    RepoMan/Branch.cpp
-    RepoMan/CollectionNode.cpp
     RepoMan/Events.cpp
-    RepoMan/Repo.cpp
-    RepoMan/RepoMan.cpp
-    RepoMan/Remote.cpp
-    RepoMan/Tag.cpp
-    RepoMan/RefLog.cpp
-    RepoMan/Submodule.cpp
-    RepoMan/RefTreeNode.cpp
-    RepoMan/Namespace.cpp
-    RepoMan/Head.cpp
+
+    RepoMan/Frontend/Base.cpp
+    RepoMan/Frontend/Branch.cpp
+    RepoMan/Frontend/CollectionNode.cpp
+    RepoMan/Frontend/Namespace.cpp
+    RepoMan/Frontend/Ref.cpp
+    RepoMan/Frontend/RefLog.cpp
+    RepoMan/Frontend/RefTreeNode.cpp
+    RepoMan/Frontend/Remote.cpp
+    RepoMan/Frontend/Repo.cpp
+    RepoMan/Frontend/RepoMan.cpp
+    RepoMan/Frontend/Submodule.cpp
+    RepoMan/Frontend/Tag.cpp
+    RepoMan/Frontend/Head.cpp
 
     RepoMan/Private/Dumper.cpp
 
@@ -132,20 +133,22 @@ SET( PRI_HDR_FILES
 
     RepoMan/AutoRefresher.hpp
 
-    RepoMan/Private/BasePrivate.hpp
-    RepoMan/Private/BranchPrivate.hpp
-    RepoMan/Private/CollectionNodePrivate.hpp
-    RepoMan/Private/NamespacePrivate.hpp
-    RepoMan/Private/RefPrivate.hpp
-    RepoMan/Private/RefLogPrivate.hpp
-    RepoMan/Private/RefTreeNodePrivate.hpp
-    RepoMan/Private/RemotePrivate.hpp
-    RepoMan/Private/RepoPrivate.hpp
-    RepoMan/Private/RepoManPrivate.hpp
-    RepoMan/Private/SubmodulePrivate.hpp
-    RepoMan/Private/TagPrivate.hpp
     RepoMan/Private/Dumper.hpp
-    RepoMan/Private/HeadPrivate.hpp
+
+    RepoMan/Data/BaseData.hpp
+    RepoMan/Data/BranchData.hpp
+    RepoMan/Data/CollectionNodeData.hpp
+    RepoMan/Data/NamespaceData.hpp
+    RepoMan/Data/RefData.hpp
+    RepoMan/Data/RefLogData.hpp
+    RepoMan/Data/RefTreeNodeData.hpp
+    RepoMan/Data/RemoteData.hpp
+    RepoMan/Data/RepoData.hpp
+    RepoMan/Data/RepoManData.hpp
+    RepoMan/Data/SubmoduleData.hpp
+    RepoMan/Data/TagData.hpp
+    RepoMan/Data/HeadData.hpp
+
 
     RepoMan/Config/RepoManConfigPage.hpp
 
diff --git a/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.cpp b/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp"
-#include "libMacGitverCore/RepoMan/Private/RepoManPrivate.hpp"
+#include "libMacGitverCore/RepoMan/Data/RepoManData.hpp"
 #include "libMacGitverCore/RepoMan/AutoRefresher.hpp"
 #include "libMacGitverCore/RepoMan/RepoMan.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/BaseData.hpp b/Libs/libMacGitverCore/RepoMan/Data/BaseData.hpp
diff --git a/Libs/libMacGitverCore/RepoMan/Data/BranchData.hpp b/Libs/libMacGitverCore/RepoMan/Data/BranchData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_BRANCH_PRIVATE_HPP
 #define REPOMAN_BRANCH_PRIVATE_HPP
 
-#include "RepoMan/Private/RefPrivate.hpp"
+#include "RepoMan/Data/RefData.hpp"
 
 #include "RepoMan/Branch.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/CollectionNodeData.hpp b/Libs/libMacGitverCore/RepoMan/Data/CollectionNodeData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_COLLECTION_NODE_PRIVATE_HPP
 #define REPOMAN_COLLECTION_NODE_PRIVATE_HPP
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/CollectionNode.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/HeadData.hpp b/Libs/libMacGitverCore/RepoMan/Data/HeadData.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/Head.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/NamespaceData.hpp b/Libs/libMacGitverCore/RepoMan/Data/NamespaceData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_NAMESPACE_PRIVATE_HPP
 #define REPOMAN_NAMESPACE_PRIVATE_HPP
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/Namespace.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/RefData.hpp b/Libs/libMacGitverCore/RepoMan/Data/RefData.hpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/Ref.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/RefLogData.hpp b/Libs/libMacGitverCore/RepoMan/Data/RefLogData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_REF_LOG_PRIVATE_HPP
 #define REPOMAN_REF_LOG_PRIVATE_HPP
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/RefLog.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/RefTreeNodeData.hpp b/Libs/libMacGitverCore/RepoMan/Data/RefTreeNodeData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_REF_TREE_NODE_PRIVATE_HPP
 #define REPOMAN_REF_TREE_NODE_PRIVATE_HPP
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/RefTreeNode.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/RemoteData.hpp b/Libs/libMacGitverCore/RepoMan/Data/RemoteData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_REMOTE_PRIVATE_HPP
 #define REPOMAN_REMOTE_PRIVATE_HPP
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/Remote.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/RepoData.hpp b/Libs/libMacGitverCore/RepoMan/Data/RepoData.hpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "RepoMan/Private/BasePrivate.hpp"
+#include "RepoMan/Data/BaseData.hpp"
 
 #include "RepoMan/Repo.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/RepoManData.hpp b/Libs/libMacGitverCore/RepoMan/Data/RepoManData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_REPO_MAN_PRIVATE_HPP
 #define REPOMAN_REPO_MAN_PRIVATE_HPP
 
-#include "libMacGitverCore/RepoMan/Private/BasePrivate.hpp"
+#include "libMacGitverCore/RepoMan/Data/BaseData.hpp"
 
 #include "libMacGitverCore/RepoMan/RepoMan.hpp"
 #include "libMacGitverCore/RepoMan/AutoRefresher.hpp"
diff --git a/Libs/libMacGitverCore/RepoMan/Data/SubmoduleData.hpp b/Libs/libMacGitverCore/RepoMan/Data/SubmoduleData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_SUBMODULE_PRIVATE_HPP
 #define REPOMAN_SUBMODULE_PRIVATE_HPP
 
-#include "RepoMan/Private/RepoPrivate.hpp"
+#include "RepoMan/Data/RepoData.hpp"
 
 #include "RepoMan/Submodule.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Data/TagData.hpp b/Libs/libMacGitverCore/RepoMan/Data/TagData.hpp
@@ -20,7 +20,7 @@
 #ifndef REPOMAN_TAG_PRIVATE_HPP
 #define REPOMAN_TAG_PRIVATE_HPP
 
-#include "RepoMan/Private/RefPrivate.hpp"
+#include "RepoMan/Data/RefData.hpp"
 
 #include "RepoMan/Tag.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Base.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Base.cpp
@@ -24,16 +24,17 @@
 
 #include "App/MacGitver.hpp"
 
-#include "Base.hpp"
-#include "Repo.hpp"
-#include "RepoMan.hpp"
-#include "RefTreeNode.hpp"
-#include "CollectionNode.hpp"
-#include "Events.hpp"
-
-#include "Private/RepoManPrivate.hpp"
-#include "Private/Dumper.hpp"
-#include "Private/BasePrivate.hpp"
+#include "RepoMan/Base.hpp"
+#include "RepoMan/Repo.hpp"
+#include "RepoMan/RepoMan.hpp"
+#include "RepoMan/RefTreeNode.hpp"
+#include "RepoMan/CollectionNode.hpp"
+#include "RepoMan/Events.hpp"
+
+#include "RepoMan/Data/RepoManData.hpp"
+#include "RepoMan/Data/BaseData.hpp"
+
+#include "RepoMan/Private/Dumper.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Branch.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Branch.cpp
@@ -23,7 +23,8 @@
 #include "RepoMan/Head.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/BranchPrivate.hpp"
+
+#include "RepoMan/Data/BranchData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/CollectionNode.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/CollectionNode.cpp
@@ -21,10 +21,10 @@
 
 #include "libHeavenIcons/IconRef.hpp"
 
-#include "CollectionNode.hpp"
+#include "RepoMan/CollectionNode.hpp"
 
-#include "Private/Dumper.hpp"
-#include "Private/CollectionNodePrivate.hpp"
+#include "RepoMan/Private/Dumper.hpp"
+#include "RepoMan/Data/CollectionNodeData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Head.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Head.cpp
@@ -17,11 +17,14 @@
  *
  */
 
-#include "Head.hpp"
-#include "Events.hpp"
+#include "RepoMan/Events.hpp"
+
+#include "RepoMan/Head.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/HeadPrivate.hpp"
+
+#include "RepoMan/Data/HeadData.hpp"
+
 #include "RepoMan/Branch.hpp"
 #include "RepoMan/Repo.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Namespace.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Namespace.cpp
@@ -17,11 +17,12 @@
  *
  */
 
-#include "Namespace.hpp"
-#include "Events.hpp"
+#include "RepoMan/Events.hpp"
+
+#include "RepoMan/Namespace.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/NamespacePrivate.hpp"
+#include "RepoMan/Data/NamespaceData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Ref.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Ref.cpp
@@ -21,12 +21,13 @@
 #include "libGitWrap/Reference.hpp"
 #include "libGitWrap/RefName.hpp"
 
-#include "Ref.hpp"
-#include "Repo.hpp"
-#include "Events.hpp"
+#include "RepoMan/Events.hpp"
 
-#include "Private/Dumper.hpp"
-#include "Private/RefPrivate.hpp"
+#include "RepoMan/Ref.hpp"
+#include "RepoMan/Repo.hpp"
+
+#include "RepoMan/Private/Dumper.hpp"
+#include "RepoMan/Data/RefData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/RefLog.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/RefLog.cpp
@@ -17,10 +17,10 @@
  *
  */
 
-#include "RefLog.hpp"
+#include "RepoMan/RefLog.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/RefLogPrivate.hpp"
+#include "RepoMan/Data/RefLogData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/RefTreeNode.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/RefTreeNode.cpp
@@ -17,10 +17,13 @@
  *
  */
 
-#include "RefTreeNode.hpp"
-#include "Events.hpp"
+#include "RepoMan/Events.hpp"
+
+#include "RepoMan/RefTreeNode.hpp"
+
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/RefTreeNodePrivate.hpp"
+
+#include "RepoMan/Data/RefTreeNodeData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Remote.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Remote.cpp
@@ -19,13 +19,15 @@
 
 #include "libGitWrap/Result.hpp"
 
-#include "Repo.hpp"
-#include "Remote.hpp"
-#include "Events.hpp"
-#include "CollectionNode.hpp"
+#include "RepoMan/Events.hpp"
+
+#include "RepoMan/Repo.hpp"
+#include "RepoMan/Remote.hpp"
+#include "RepoMan/CollectionNode.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/RemotePrivate.hpp"
+
+#include "RepoMan/Data/RemoteData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Repo.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Repo.cpp
@@ -39,9 +39,10 @@
 #include "RepoMan/Submodule.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/RepoPrivate.hpp"
-#include "RepoMan/Private/RemotePrivate.hpp"
-#include "RepoMan/Private/CollectionNodePrivate.hpp"
+
+#include "RepoMan/Data/RepoData.hpp"
+#include "RepoMan/Data/RemoteData.hpp"
+#include "RepoMan/Data/CollectionNodeData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/RepoMan.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/RepoMan.cpp
@@ -22,8 +22,9 @@
 #include "RepoMan/Events.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/RepoManPrivate.hpp"
-#include "RepoMan/Private/RepoPrivate.hpp"
+
+#include "RepoMan/Data/RepoManData.hpp"
+#include "RepoMan/Data/RepoData.hpp"
 
 #include "libBlueSky/Application.hpp"
 
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Submodule.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Submodule.cpp
@@ -17,11 +17,12 @@
  *
  */
 
-#include "Submodule.hpp"
-#include "Events.hpp"
+#include "RepoMan/Events.hpp"
+
+#include "RepoMan/Submodule.hpp"
 
 #include "RepoMan/Private/Dumper.hpp"
-#include "RepoMan/Private/SubmodulePrivate.hpp"
+#include "RepoMan/Data/SubmoduleData.hpp"
 
 namespace RM
 {
diff --git a/Libs/libMacGitverCore/RepoMan/Frontend/Tag.cpp b/Libs/libMacGitverCore/RepoMan/Frontend/Tag.cpp

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`*/`
`19`	`19`
`20`		`-#include "RepoMan/Private/BasePrivate.hpp"`
	`20`	`+#include "RepoMan/Data/BaseData.hpp"`
`21`	`21`
`22`	`22`	`#include "RepoMan/Ref.hpp"`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`#include "RepoMan/Head.hpp"`
`24`	`24`
`25`	`25`	`#include "RepoMan/Private/Dumper.hpp"`
`26`		`-#include "RepoMan/Private/BranchPrivate.hpp"`
	`26`	`+`
	`27`	`+#include "RepoMan/Data/BranchData.hpp"`
`27`	`28`
`28`	`29`	`namespace RM`
`29`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,12 @@`
`17`	`17`	`*`
`18`	`18`	`*/`
`19`	`19`
`20`		`-#include "Namespace.hpp"`
`21`		`-#include "Events.hpp"`
	`20`	`+#include "RepoMan/Events.hpp"`
	`21`	`+`
	`22`	`+#include "RepoMan/Namespace.hpp"`
`22`	`23`
`23`	`24`	`#include "RepoMan/Private/Dumper.hpp"`
`24`		`-#include "RepoMan/Private/NamespacePrivate.hpp"`
	`25`	`+#include "RepoMan/Data/NamespaceData.hpp"`
`25`	`26`
`26`	`27`	`namespace RM`
`27`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@`
`17`	`17`	`*`
`18`	`18`	`*/`
`19`	`19`
`20`		`-#include "RefLog.hpp"`
	`20`	`+#include "RepoMan/RefLog.hpp"`
`21`	`21`
`22`	`22`	`#include "RepoMan/Private/Dumper.hpp"`
`23`		`-#include "RepoMan/Private/RefLogPrivate.hpp"`
	`23`	`+#include "RepoMan/Data/RefLogData.hpp"`
`24`	`24`
`25`	`25`	`namespace RM`
`26`	`26`	`{`