Changeset 7425

Timestamp:

Sep 12, 2010, 3:12:55 PM (14 years ago)

Author:

rgrieder

Message:

Fixed various problems revealed on tardis

Location:

sandbox_qt

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/libraries/core/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/Core.cc (modified) (2 diffs)
• src/libraries/core/Core.h (modified) (2 diffs)
• src/libraries/util/Math.h (modified) (1 diff)
• src/libraries/util/StringUtils.cc (modified) (1 diff)
• src/orxonox/Main.cc (modified) (1 diff)

sandbox_qt/cmake/LibraryConfig.cmake

@@ -88 +88 @@
 # Performs the search and sets the variables    #
 
-FIND_PACKAGE(QT4 COMPONENTS QtCore QtGui REQUIRED)
+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
 
 

sandbox_qt/src/libraries/core/CMakeLists.txt

@@ -19 +19 @@
 
 SET_SOURCE_FILES(CORE_SRC_FILES
-  CommandlineParser.cc
+  CommandLineParser.cc
   Core.cc
   PathConfig.cc

sandbox_qt/src/libraries/core/Core.cc

@@ -37 +37 @@
 
 #include <cassert>
+#include <cstdlib>
 #include <ctime>
 #include <fstream>
@@ -107 +108 @@
     /**
     @brief
-        All destruction code is handled by QScopedPointers
+        All destruction code is handled by std::auto_ptr
     */
     Core::~Core()

sandbox_qt/src/libraries/core/Core.h

@@ -44 +44 @@
 #include "CorePrereqs.h"
 
+#include <memory>
 #include <string>
-#include <QScopedPointer>
 #include <loki/ScopeGuard.h>
 
@@ -86 +86 @@
             // 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)

sandbox_qt/src/libraries/util/Math.h

@@ -45 +45 @@
 #include <string>
 #include <cmath>
+#include <cstdlib>
 
 // Certain headers might define unwanted macros...

sandbox_qt/src/libraries/util/StringUtils.cc

@@ -532 +532 @@
     QDir operator/(const QDir& lhs, const QDir& rhs)
     {
-        return (QDir(lhs) /= rhs);
+        return QDir(lhs.path() + QDir::separator() + rhs.path());
     }
 

sandbox_qt/src/orxonox/Main.cc

@@ -40 +40 @@
 
 #include "util/Debug.h"
-#include "core/CommandlineParser.h"
+#include "core/CommandLineParser.h"
 #include "core/Core.h"
 #include "Main.h"