[Orxonox-commit 2720] r7425 - in sandbox_qt: cmake src/libraries/core src/libraries/util src/orxonox

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-12 15:12:55 +0200 (Sun, 12 Sep 2010)
New Revision: 7425

Modified:
   sandbox_qt/cmake/LibraryConfig.cmake
   sandbox_qt/src/libraries/core/CMakeLists.txt
   sandbox_qt/src/libraries/core/Core.cc
   sandbox_qt/src/libraries/core/Core.h
   sandbox_qt/src/libraries/util/Math.h
   sandbox_qt/src/libraries/util/StringUtils.cc
   sandbox_qt/src/orxonox/Main.cc
Log:
Fixed various problems revealed on tardis

Modified: sandbox_qt/cmake/LibraryConfig.cmake
===================================================================
--- sandbox_qt/cmake/LibraryConfig.cmake	2010-09-12 12:48:11 UTC (rev 7424)
+++ sandbox_qt/cmake/LibraryConfig.cmake	2010-09-12 13:12:55 UTC (rev 7425)
@@ -87,7 +87,7 @@
 ############### Library finding #################
 # Performs the search and sets the variables    #
 
-FIND_PACKAGE(QT4 COMPONENTS QtCore QtGui REQUIRED)
+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
 
 
 ####### Static/Dynamic linking options ##########

Modified: sandbox_qt/src/libraries/core/CMakeLists.txt
===================================================================
--- sandbox_qt/src/libraries/core/CMakeLists.txt	2010-09-12 12:48:11 UTC (rev 7424)
+++ sandbox_qt/src/libraries/core/CMakeLists.txt	2010-09-12 13:12:55 UTC (rev 7425)
@@ -18,7 +18,7 @@
  #
 
 SET_SOURCE_FILES(CORE_SRC_FILES
-  CommandlineParser.cc
+  CommandLineParser.cc
   Core.cc
   PathConfig.cc
 )

Modified: sandbox_qt/src/libraries/core/Core.cc
===================================================================
--- sandbox_qt/src/libraries/core/Core.cc	2010-09-12 12:48:11 UTC (rev 7424)
+++ sandbox_qt/src/libraries/core/Core.cc	2010-09-12 13:12:55 UTC (rev 7425)
@@ -36,6 +36,7 @@
 #include "Core.h"
 
 #include <cassert>
+#include <cstdlib>
 #include <ctime>
 #include <fstream>
 #include <vector>
@@ -106,7 +107,7 @@
 
     /**
     @brief
-        All destruction code is handled by QScopedPointers
+        All destruction code is handled by std::auto_ptr
     */
     Core::~Core()
     {

Modified: sandbox_qt/src/libraries/core/Core.h
===================================================================
--- sandbox_qt/src/libraries/core/Core.h	2010-09-12 12:48:11 UTC (rev 7424)
+++ sandbox_qt/src/libraries/core/Core.h	2010-09-12 13:12:55 UTC (rev 7425)
@@ -43,8 +43,8 @@
 
 #include "CorePrereqs.h"
 
+#include <memory>
 #include <string>
-#include <QScopedPointer>
 #include <loki/ScopeGuard.h>
 
 #include "util/Singleton.h"
@@ -85,7 +85,7 @@
             void setThreadAffinity(int limitToCPU);
             // MANAGED SINGLETONS/OBJECTS
             // Mind the order for the destruction!
-            QScopedPointer<PathConfig>    pathConfig_;
+            std::auto_ptr<PathConfig>     pathConfig_;
 
             int                           softDebugLevelLogFile_;      //!< The debug level for the log file (belongs to OutputHandler)
             bool                          bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called

Modified: sandbox_qt/src/libraries/util/Math.h
===================================================================
--- sandbox_qt/src/libraries/util/Math.h	2010-09-12 12:48:11 UTC (rev 7424)
+++ sandbox_qt/src/libraries/util/Math.h	2010-09-12 13:12:55 UTC (rev 7425)
@@ -44,6 +44,7 @@
 
 #include <string>
 #include <cmath>
+#include <cstdlib>
 
 // Certain headers might define unwanted macros...
 #undef max

Modified: sandbox_qt/src/libraries/util/StringUtils.cc
===================================================================
--- sandbox_qt/src/libraries/util/StringUtils.cc	2010-09-12 12:48:11 UTC (rev 7424)
+++ sandbox_qt/src/libraries/util/StringUtils.cc	2010-09-12 13:12:55 UTC (rev 7425)
@@ -531,7 +531,7 @@
 
     QDir operator/(const QDir& lhs, const QDir& rhs)
     {
-        return (QDir(lhs) /= rhs);
+        return QDir(lhs.path() + QDir::separator() + rhs.path());
     }
 
     QDir operator/(const QDir& lhs, const QString& rhs)

Modified: sandbox_qt/src/orxonox/Main.cc
===================================================================
--- sandbox_qt/src/orxonox/Main.cc	2010-09-12 12:48:11 UTC (rev 7424)
+++ sandbox_qt/src/orxonox/Main.cc	2010-09-12 13:12:55 UTC (rev 7425)
@@ -39,7 +39,7 @@
 #include <QCoreApplication>
 
 #include "util/Debug.h"
-#include "core/CommandlineParser.h"
+#include "core/CommandLineParser.h"
 #include "core/Core.h"
 #include "Main.h"