Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7425


Ignore:
Timestamp:
Sep 12, 2010, 3:12:55 PM (14 years ago)
Author:
rgrieder
Message:

Fixed various problems revealed on tardis

Location:
sandbox_qt
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • sandbox_qt/cmake/LibraryConfig.cmake

    r7421 r7425  
    8888# Performs the search and sets the variables    #
    8989
    90 FIND_PACKAGE(QT4 COMPONENTS QtCore QtGui REQUIRED)
     90FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
    9191
    9292
  • sandbox_qt/src/libraries/core/CMakeLists.txt

    r7424 r7425  
    1919
    2020SET_SOURCE_FILES(CORE_SRC_FILES
    21   CommandlineParser.cc
     21  CommandLineParser.cc
    2222  Core.cc
    2323  PathConfig.cc
  • sandbox_qt/src/libraries/core/Core.cc

    r7424 r7425  
    3737
    3838#include <cassert>
     39#include <cstdlib>
    3940#include <ctime>
    4041#include <fstream>
     
    107108    /**
    108109    @brief
    109         All destruction code is handled by QScopedPointers
     110        All destruction code is handled by std::auto_ptr
    110111    */
    111112    Core::~Core()
  • sandbox_qt/src/libraries/core/Core.h

    r7424 r7425  
    4444#include "CorePrereqs.h"
    4545
     46#include <memory>
    4647#include <string>
    47 #include <QScopedPointer>
    4848#include <loki/ScopeGuard.h>
    4949
     
    8686            // MANAGED SINGLETONS/OBJECTS
    8787            // Mind the order for the destruction!
    88             QScopedPointer<PathConfig>    pathConfig_;
     88            std::auto_ptr<PathConfig>     pathConfig_;
    8989
    9090            int                           softDebugLevelLogFile_;      //!< The debug level for the log file (belongs to OutputHandler)
  • sandbox_qt/src/libraries/util/Math.h

    r7421 r7425  
    4545#include <string>
    4646#include <cmath>
     47#include <cstdlib>
    4748
    4849// Certain headers might define unwanted macros...
  • sandbox_qt/src/libraries/util/StringUtils.cc

    r7421 r7425  
    532532    QDir operator/(const QDir& lhs, const QDir& rhs)
    533533    {
    534         return (QDir(lhs) /= rhs);
     534        return QDir(lhs.path() + QDir::separator() + rhs.path());
    535535    }
    536536
  • sandbox_qt/src/orxonox/Main.cc

    r7424 r7425  
    4040
    4141#include "util/Debug.h"
    42 #include "core/CommandlineParser.h"
     42#include "core/CommandLineParser.h"
    4343#include "core/Core.h"
    4444#include "Main.h"
Note: See TracChangeset for help on using the changeset viewer.