Index: code/branches/FICN/src/misc/CMakeLists.txt
===================================================================
--- code/branches/FICN/src/misc/CMakeLists.txt	(revision 728)
+++ 	(revision )
@@ -1,5 +1,0 @@
-
-
-IF(TESTING_ENABLED)
-ADD_SUBDIRECTORY(testing)
-ENDIF(TESTING_ENABLED)
Index: code/branches/FICN/src/misc/Convert.h
===================================================================
--- code/branches/FICN/src/misc/Convert.h	(revision 728)
+++ 	(revision )
@@ -1,103 +1,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Benjamin Grauer
- *   Co-authors:
- *      Fabian 'x3n' Landau
- */
-
-/*!
-    @file Convert.h
-    @brief Definition and Implementation of the Convert class.
-*/
-
-#ifndef _Convert_H__
-#define _Convert_H__
-
-#include <string>
-#include <sstream>
-
-
-// DEFAULT CLASS
-template <typename FromType, typename ToType>
-class Converter
-{
- public:
-  bool operator()(ToType* output, const FromType& input) const
-  {
-    return false;
-  }
-};
-
-// PARTIAL SPECIALIZATION TO CONVERT TO STRINGS
-template<typename FromType>
-class Converter<FromType, std::string>
-{
- public:
-  bool operator()(std::string* output, const FromType& input) const
-  {
-    std::ostringstream oss;
-    if (oss << input)
-    {
-      (*output) = oss.str();
-      return true;
-    }
-    else
-      return false;
-  }
-};
-
-// PARTIAL SPECIALIZATION TO CONVERT FROM STRING
-template<typename ToType>
-class Converter<std::string, ToType>
-{
- public:
-  bool operator()(ToType* output, const std::string& input) const
-  {
-    std::istringstream iss(input);
-    if (iss >> (*output))
-      return true;
-    else
-      return false;
-  }
-};
-
-// FUNCTION SO WE DO NOT HAVE TO TELL THE COMPILER ABOUT THE TYPE
-template<typename FromType, typename ToType>
-static bool ConvertValue(ToType* output, const FromType& input)
-{
-  Converter<FromType, ToType> converter;
-  return converter(output, input);
-}
-
-// THE SAME, BUT WITH DEFAULT VALUE
-template<typename FromType, typename ToType>
-static bool ConvertValue(ToType* output, const FromType& input, const ToType& fallback)
-{
-  Converter<FromType, ToType> converter;
-  if (converter(output, input))
-    return true;
-
-  (*output) = fallback;
-  return false;
-}
-
-#endif /* _Convert_H__ */
Index: code/branches/FICN/src/misc/Math.h
===================================================================
--- code/branches/FICN/src/misc/Math.h	(revision 728)
+++ 	(revision )
@@ -1,19 +1,0 @@
-#include <OgreMath.h>
-#include <OgreVector2.h>
-#include <OgreVector3.h>
-#include <OgreVector4.h>
-#include <OgreMatrix3.h>
-#include <OgreQuaternion.h>
-#include <OgreColourValue.h>
-
-namespace orxonox
-{
-  typedef Ogre::Radian Radian;
-  typedef Ogre::Degree Degree;
-  typedef Ogre::Vector2 Vector2;
-  typedef Ogre::Vector3 Vector3;
-  typedef Ogre::Vector4 Vector4;
-  typedef Ogre::Matrix3 Matrix3;
-  typedef Ogre::Quaternion Quaternion;
-  typedef Ogre::ColourValue ColourValue;
-}
Index: code/branches/FICN/src/misc/Sleep.h
===================================================================
--- code/branches/FICN/src/misc/Sleep.h	(revision 728)
+++ 	(revision )
@@ -1,7 +1,0 @@
-// hack for the usleep/Sleep problem
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
-#  include <windows.h>
-#  define usleep(x) Sleep((x)/1000)
-#else
-#  include <unistd.h>
-#endif
Index: code/branches/FICN/src/misc/String2Number.h
===================================================================
--- code/branches/FICN/src/misc/String2Number.h	(revision 728)
+++ 	(revision )
@@ -1,51 +1,0 @@
-#ifndef _String2Number_H__
-#define _String2Number_H__
-
-#include <string>
-#include <sstream>
-#include <iostream>
-
-#include "orxonox/core/Debug.h"
-
-/**
- * String to number conversion
- *
- * This class converts a number inside a std::string
- * into a numeric type number (int,float,double)
- * Number in string can be decimal, hexadecimal or octal
- *
- * @author Nicolas Perrenoud<nicolape@ee.ethz.ch>
- *
- * @example
- * float f;
- * String2Number<float>(f, std::string(" 123.45 "));
- */
-
-template <class T>
-class String2Number
-{
-  private:
-  bool success_;
-
-  public:
-  /**
-   * Constructor
-   *
-   * First value is the target variable, the second vector is the
-   * string where the number is taken from, the third parameter
-   * should be one of std::hex, std::dec or std::oct (dec is default value)
-   */
-  inline String2Number(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) =  std::dec, int haltOnError=1)
-  {
-    std::istringstream iss(s);
-    success_ = !(iss >> f >> t).fail();
-
-    if (!success_ && haltOnError==1)
-    {
-      COUT(1) << "Error: Conversion from string to number in \"" << s << "\" failed." << std::endl;
-      exit(1);
-    }
-  }
-};
-
-#endif /* _String2Number_H__ */
Index: code/branches/FICN/src/misc/Tokenizer.h
===================================================================
--- code/branches/FICN/src/misc/Tokenizer.h	(revision 728)
+++ 	(revision )
@@ -1,40 +1,0 @@
-#ifndef _Tokenizer_H__
-#define _Tokenizer_H__
-
-#include <string>
-#include <iostream>
-#include <vector>
-
-/**
- * String tokenizer
- *
- * Splits a given string into several smaller strings
- * using a delmiter (default is the comma).
- * Returns the result as a vector<string> object
- *
- * @author Nicolas Perrenoud<nicolape@ee.ethz.ch>
- */
-
-inline std::vector<std::string> tokenize(const std::string& str, const std::string& delimiters = ",")
-{
-  std::vector<std::string> tokens;
-
-  // Skip delimiters at beginning.
-  std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
-  // Find first "non-delimiter".
-  std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
-
-  while (std::string::npos != pos || std::string::npos != lastPos)
-  {
-      // Found a token, add it to the vector.
-      tokens.push_back(str.substr(lastPos, pos - lastPos));
-      // Skip delimiters.  Note the "not_of"
-      lastPos = str.find_first_not_of(delimiters, pos);
-      // Find next "non-delimiter"
-      pos = str.find_first_of(delimiters, lastPos);
-  }
-  return tokens;
-}
-
-
-#endif /* _Tokenizer_H__ */
