Move lots of components from common in basics

18 files changed, 2 insertions, 1 deletions

diff --git a/project2/common/memoryCache.cpp b/project2/basics/caches/memoryCache.cpp
index 7ab271e..7ab271e 100644
--- a/project2/common/memoryCache.cpp
+++ b/project2/basics/caches/memoryCache.cpp
diff --git a/project2/common/consoleLog.cpp b/project2/basics/loggers/consoleLog.cpp
index de45245..de45245 100644
--- a/project2/common/consoleLog.cpp
+++ b/project2/basics/loggers/consoleLog.cpp
diff --git a/project2/common/syslogLog.cpp b/project2/basics/loggers/syslogLog.cpp
index 8e58326..8e58326 100644
--- a/project2/common/syslogLog.cpp
+++ b/project2/basics/loggers/syslogLog.cpp
diff --git a/project2/basics/preload.cpp b/project2/basics/options/preload.cpp
index 03f275b..03f275b 100644
--- a/project2/basics/preload.cpp
+++ b/project2/basics/options/preload.cpp
diff --git a/project2/common/sessionClearTask.cpp b/project2/basics/tasks/session/sessionClearTask.cpp
index 265bb1c..265bb1c 100644
--- a/project2/common/sessionClearTask.cpp
+++ b/project2/basics/tasks/session/sessionClearTask.cpp
diff --git a/project2/common/sessionClearTask.h b/project2/basics/tasks/session/sessionClearTask.h
index ead88bf..ead88bf 100644
--- a/project2/common/sessionClearTask.h
+++ b/project2/basics/tasks/session/sessionClearTask.h
diff --git a/project2/common/sessionSetTask.cpp b/project2/basics/tasks/session/sessionSetTask.cpp
index f46571b..f46571b 100644
--- a/project2/common/sessionSetTask.cpp
+++ b/project2/basics/tasks/session/sessionSetTask.cpp
diff --git a/project2/common/sessionSetTask.h b/project2/basics/tasks/session/sessionSetTask.h
index d38c216..d38c216 100644
--- a/project2/common/sessionSetTask.h
+++ b/project2/basics/tasks/session/sessionSetTask.h
diff --git a/project2/common/structExceptHandling.cpp b/project2/basics/tasks/structExceptHandling.cpp
index 917f030..917f030 100644
--- a/project2/common/structExceptHandling.cpp
+++ b/project2/basics/tasks/structExceptHandling.cpp
diff --git a/project2/common/structExceptHandling.h b/project2/basics/tasks/structExceptHandling.h
index b6702f1..b6702f1 100644
--- a/project2/common/structExceptHandling.h
+++ b/project2/basics/tasks/structExceptHandling.h
diff --git a/project2/common/flatView.cpp b/project2/basics/views/flatView.cpp
index 05e8b09..05e8b09 100644
--- a/project2/common/flatView.cpp
+++ b/project2/basics/views/flatView.cpp
diff --git a/project2/common/flatView.h b/project2/basics/views/flatView.h
index 5dc24dc..5dc24dc 100644
--- a/project2/common/flatView.h
+++ b/project2/basics/views/flatView.h
diff --git a/project2/common/rowView.cpp b/project2/basics/views/rowView.cpp
index b9508bd..b9508bd 100644
--- a/project2/common/rowView.cpp
+++ b/project2/basics/views/rowView.cpp
diff --git a/project2/common/rowView.h b/project2/basics/views/rowView.h
index d2745db..d2745db 100644
--- a/project2/common/rowView.h
+++ b/project2/basics/views/rowView.h
diff --git a/project2/common/singleton.cpp b/project2/basics/views/singleton.cpp
index eff3f94..eff3f94 100644
--- a/project2/common/singleton.cpp
+++ b/project2/basics/views/singleton.cpp
diff --git a/project2/common/viewGroup.cpp b/project2/basics/views/viewGroup.cpp
index e6e84d0..e6e84d0 100644
--- a/project2/common/viewGroup.cpp
+++ b/project2/basics/views/viewGroup.cpp
diff --git a/project2/ice/Jamfile.jam b/project2/ice/Jamfile.jam
index 4ecca91..1376c34 100644
--- a/project2/ice/Jamfile.jam
+++ b/project2/ice/Jamfile.jam
@@ -42,6 +42,7 @@ lib p2icedaemon :
 	<library>glibmm
 	<library>../common//p2common
 	<library>../lib//p2lib
+	<library>../basics//p2basics
 	<library>../daemon/lib//p2daemonlib
 	<library>p2ice
 	<library>dl
diff --git a/project2/ice/iceDaemon.cpp b/project2/ice/iceDaemon.cpp
index 7dcf298..04d6fdb 100644
--- a/project2/ice/iceDaemon.cpp
+++ b/project2/ice/iceDaemon.cpp
@@ -12,7 +12,7 @@
 #include <commonObjects.h>
 #include <logger.h>
 #include <checkHost.h>
-#include <flatView.h>
+#include <views/flatView.h>
 #include <taskHost.h>
 #include <execContext.h>
 #include <misc.h>