Added wrapping of all boost headers until the whole beast built succe…

include/tinia/jobcontroller/ComputeJob.hpp

@@ -20,8 +20,11 @@
 #include <string>
 //#include <mutex> 
 #include "tinia/jobcontroller/Job.hpp"
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/thread/thread.hpp>
 #include <boost/scoped_ptr.hpp>
+#endif
 
 namespace tinia {
 namespace jobcontroller

include/tinia/model/ExposedModelLock.hpp

@@ -17,9 +17,15 @@
  */
 
 #pragma once
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include "boost/thread.hpp"
+#endif
 #include "tinia/model/ExposedModel.hpp"
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 
 namespace tinia {
 namespace model {

include/tinia/model/StateSchemaElement.hpp

@@ -18,7 +18,10 @@
 
 #pragma once
 #include "tinia/model/impl/ElementData.hpp"
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/property_tree/ptree.hpp>
+#endif
 #include <string>
 
 namespace tinia {

include/tinia/model/impl/utils.hpp

@@ -20,8 +20,11 @@
 
 #include <string>
 #include <stdexcept>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
+#endif
 #include <iostream>
 
 

include/tinia/model/impl/xml/ElementHandler.hpp

@@ -18,7 +18,10 @@
 
 #pragma once
 #include <string>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 #include "tinia/model/ExposedModel.hpp"
 
 namespace tinia {

include/tinia/qtcontroller/QTController.hpp

@@ -22,8 +22,11 @@
 
 
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
+#endif
 
 class QMainWindow;
 class QGLWidget;

include/tinia/qtcontroller/impl/http_utils.hpp

@@ -4,10 +4,13 @@
 #include <QStringList>
 #include <QMap>
 #include <stdexcept>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/fusion/sequence.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/tuple/tuple_io.hpp>
+#endif
 
 namespace tinia { namespace qtcontroller { namespace impl {
 

include/tinia/qtcontroller/moc/Canvas.hpp

@@ -27,7 +27,10 @@
 #include "tinia/model/ExposedModel.hpp"
 #include "tinia/model/StateListener.hpp"
 #include <tinia/qtcontroller/impl/EventHandler.hpp>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/scoped_ptr.hpp>
+#endif
 
 namespace tinia {
 namespace qtcontroller {

include/tinia/qtcontroller/moc/VisibilityController.hpp

@@ -21,7 +21,10 @@
 #include <QObject>
 #include <QWidget>
 #include <string>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 #include "tinia/model/ExposedModel.hpp"
 #include "tinia/model/StateListener.hpp"
 

include/tinia/qtcontroller/scripting/ExposedModel.hpp

@@ -18,7 +18,10 @@
 
 #pragma once
 #include <QObject>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 #include <tinia/model/ExposedModel.hpp>
 #include <tinia/qtcontroller/scripting/Viewer.hpp>
 #include <QtScript>

include/tinia/renderlist/Item.hpp

@@ -17,7 +17,10 @@
  */
 
 #pragma once
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/utility.hpp>
+#endif
 #include <tinia/renderlist/RenderList.hpp>
 
 namespace tinia {

include/tinia/renderlist/gl/Renderer.hpp

@@ -19,7 +19,10 @@
 #pragma once
 #include <list>
 #include <map>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/utility.hpp>
+#endif
 #include <tinia/renderlist/RenderList.hpp>
 
 namespace tinia {

src/model/ElementData.cpp

@@ -21,8 +21,11 @@
 #include <iostream>
 #include <string>
 #include <vector>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/algorithm/string.hpp>
+#endif
 #include <tinia/model/exceptions/RestrictionException.hpp>
 
 using std::cout;

src/model/ExposedModel.cpp

@@ -28,8 +28,11 @@
 #include <map>
 #include <iterator>
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
+#endif
 
 #include "tinia/model/Viewer.hpp"
 

src/model/validateGUI.cpp

@@ -18,9 +18,12 @@
 
 
 #include <tinia/model/GUILayout.hpp>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/for_each.hpp>
 #include <boost/mpl/placeholders.hpp>
+#endif
 #include <tinia/model/GUILayout.hpp>
 #include <tinia/model/ExposedModel.hpp>
 #include <tinia/model/exceptions/KeyNotFoundException.hpp>

src/modelxml/XMLBuilder.cpp

@@ -20,8 +20,11 @@
 
 #include <iostream>
 #include <algorithm>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/lexical_cast.hpp>
+#endif
 
 using namespace std;
 

src/modelxml/XMLReader.cpp

@@ -20,8 +20,11 @@
 //#include "tinia/model/ExposedModel.hpp"
 #include "tinia/model/impl/xml/utils.hpp"
 #include <algorithm>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
+#endif
 
 #define XMLDEBUG std::cout<< __FILE__<<__LINE__ << std::endl;
 

src/modelxml/XMLTransporter.cpp

@@ -17,7 +17,10 @@
  */
 
 #include <algorithm>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
+#endif
 #include <iostream>
 #include <cstring>
 #include <stdexcept>

src/qtcontroller/HTTPServer.cpp

@@ -30,9 +30,12 @@
 #include <QStringList>
 #include <QDateTime>
 #include <QFile>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/tuple/tuple_io.hpp>
+#endif
 #include <QThreadPool>
 
 namespace tinia {

src/qtcontroller/HorizontalSlider.cpp

@@ -18,7 +18,10 @@
 
 #include "tinia/qtcontroller/moc/HorizontalSlider.hpp"
 #include <QHBoxLayout>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
+#endif
 
 namespace tinia {
 namespace qtcontroller {

unittests/ipc/main.cpp

@@ -16,5 +16,8 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define BOOST_TEST_MODULE IpcMsgTest
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 

unittests/ipc/test_errors.cpp

@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "test_fixture.hpp"
 
 BOOST_AUTO_TEST_SUITE( IpcMsgErrors )

unittests/ipc/test_fixture.hpp

@@ -21,7 +21,10 @@
 #include <iostream>
 #include <sstream>
 #include <sys/time.h>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <tinia/ipc/ipc_msg.h>
 #include "../../src/ipc/ipc_msg_internal.h"
 #ifdef TINIA_IPC_VALGRIND_ANNOTATIONS

unittests/ipc/test_notification.cpp

@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "test_fixture.hpp"
 
 BOOST_AUTO_TEST_SUITE( IpcMsgNotification )

unittests/ipc/test_sendrecv.cpp

@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "test_fixture.hpp"
 
 BOOST_AUTO_TEST_SUITE( IpcMsgSendRecv )

unittests/modelxml/ExposedModelTest.cpp

@@ -16,13 +16,19 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 
 #include <string>
 #include <memory>
 #include <stdexcept>
 #include <iostream>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/array.hpp>
+#endif
 #include <vector>
 #include <ctime>
 #include <cstring>
@@ -43,7 +49,10 @@
 
 #include "testutils.hpp"
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/algorithm/string.hpp>
+#endif
 
 using tinia::model::impl::ElementData;
 using tinia::model::impl::xml::xpathQuery;

unittests/modelxml/main.cpp

@@ -17,4 +17,7 @@
  */
 
 #define BOOST_TEST_MODULE ExposedModelTest
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif

unittests/qtcontroller/EventHandler.cpp

@@ -16,11 +16,17 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <tinia/qtcontroller/impl/EventHandler.hpp>
 #include <tinia/qtcontroller/impl/ScriptEngine.hpp>
 #include <tinia/qtcontroller/scripting/KeyboardEvent.hpp>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/make_shared.hpp>
+#endif
 
 BOOST_AUTO_TEST_SUITE(EventHandler)
 

unittests/qtcontroller/ScriptEngine.cpp

@@ -16,7 +16,10 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <tinia/qtcontroller/impl/ScriptEngine.hpp>
 
 BOOST_AUTO_TEST_SUITE(ScriptEngine)

unittests/qtcontroller/Server.cpp

@@ -16,7 +16,10 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "tinia/qtcontroller/impl/http_utils.hpp"
 #include <QString>
 

unittests/qtcontroller/main.cpp

@@ -17,7 +17,10 @@
  */
 
 #define BOOST_TEST_MODULE qtcontrollerTest
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <QApplication>
 
 /*