From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- libraries/irrlicht-1.8/include/path.h | 176 +++++++++++++++++----------------- 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'libraries/irrlicht-1.8/include/path.h') diff --git a/libraries/irrlicht-1.8/include/path.h b/libraries/irrlicht-1.8/include/path.h index b537987..ed7661c 100644 --- a/libraries/irrlicht-1.8/include/path.h +++ b/libraries/irrlicht-1.8/include/path.h @@ -1,88 +1,88 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine" and the "irrXML" project. -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#ifndef __IRR_PATH_H_INCLUDED__ -#define __IRR_PATH_H_INCLUDED__ - -#include "irrString.h" - -namespace irr -{ -namespace io -{ - -//! Type used for all file system related strings. -/** This type will transparently handle different file system encodings. */ -typedef core::string path; - -//! Used in places where we identify objects by a filename, but don't actually work with the real filename -/** Irrlicht is internally not case-sensitive when it comes to names. - Also this class is a first step towards support for correctly serializing renamed objects. -*/ -struct SNamedPath -{ - //! Constructor - SNamedPath() {} - - //! Constructor - SNamedPath(const path& p) : Path(p), InternalName( PathToName(p) ) - { - } - - //! Is smaller comparator - bool operator <(const SNamedPath& other) const - { - return InternalName < other.InternalName; - } - - //! Set the path. - void setPath(const path& p) - { - Path = p; - InternalName = PathToName(p); - } - - //! Get the path. - const path& getPath() const - { - return Path; - }; - - //! Get the name which is used to identify the file. - //! This string is similar to the names and filenames used before Irrlicht 1.7 - const path& getInternalName() const - { - return InternalName; - } - - //! Implicit cast to io::path - operator core::stringc() const - { - return core::stringc(getPath()); - } - //! Implicit cast to io::path - operator core::stringw() const - { - return core::stringw(getPath()); - } - -protected: - // convert the given path string to a name string. - path PathToName(const path& p) const - { - path name(p); - name.replace( '\\', '/' ); - name.make_lower(); - return name; - } - -private: - path Path; - path InternalName; -}; - -} // io -} // irr - -#endif // __IRR_PATH_H_INCLUDED__ +// Copyright (C) 2002-2012 Nikolaus Gebhardt +// This file is part of the "Irrlicht Engine" and the "irrXML" project. +// For conditions of distribution and use, see copyright notice in irrlicht.h + +#ifndef __IRR_PATH_H_INCLUDED__ +#define __IRR_PATH_H_INCLUDED__ + +#include "irrString.h" + +namespace irr +{ +namespace io +{ + +//! Type used for all file system related strings. +/** This type will transparently handle different file system encodings. */ +typedef core::string path; + +//! Used in places where we identify objects by a filename, but don't actually work with the real filename +/** Irrlicht is internally not case-sensitive when it comes to names. + Also this class is a first step towards support for correctly serializing renamed objects. +*/ +struct SNamedPath +{ + //! Constructor + SNamedPath() {} + + //! Constructor + SNamedPath(const path& p) : Path(p), InternalName( PathToName(p) ) + { + } + + //! Is smaller comparator + bool operator <(const SNamedPath& other) const + { + return InternalName < other.InternalName; + } + + //! Set the path. + void setPath(const path& p) + { + Path = p; + InternalName = PathToName(p); + } + + //! Get the path. + const path& getPath() const + { + return Path; + }; + + //! Get the name which is used to identify the file. + //! This string is similar to the names and filenames used before Irrlicht 1.7 + const path& getInternalName() const + { + return InternalName; + } + + //! Implicit cast to io::path + operator core::stringc() const + { + return core::stringc(getPath()); + } + //! Implicit cast to io::path + operator core::stringw() const + { + return core::stringw(getPath()); + } + +protected: + // convert the given path string to a name string. + path PathToName(const path& p) const + { + path name(p); + name.replace( '\\', '/' ); + name.make_lower(); + return name; + } + +private: + path Path; + path InternalName; +}; + +} // io +} // irr + +#endif // __IRR_PATH_H_INCLUDED__ -- cgit v1.1