Changeset 7425 for sandbox_qt/src/libraries/core

Timestamp:

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

Author:

rgrieder

Message:

Fixed various problems revealed on tardis

Location:

sandbox_qt/src/libraries/core

Files:

• CMakeLists.txt (modified) (1 diff)
• Core.cc (modified) (2 diffs)
• Core.h (modified) (2 diffs)

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)