[colobot] 274/390: Removed unused Copy function

Didier Raboud odyx at moszumanska.debian.org
Fri Jun 12 14:21:54 UTC 2015


This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit bb9e490316a43df963590e06de135cb9640aeb85
Author: krzys-h <krzys_h at interia.pl>
Date:   Wed Mar 18 21:45:28 2015 +0100

    Removed unused Copy function
    
    It's not used by the game and causes incombatibility with some version of Boost.
    Should fix Travis build, see issue #393
---
 src/common/resources/resourcemanager.cpp | 20 --------------------
 src/common/resources/resourcemanager.h   |  2 --
 2 files changed, 22 deletions(-)

diff --git a/src/common/resources/resourcemanager.cpp b/src/common/resources/resourcemanager.cpp
index 28eebfa..24c3680 100644
--- a/src/common/resources/resourcemanager.cpp
+++ b/src/common/resources/resourcemanager.cpp
@@ -283,26 +283,6 @@ bool CResourceManager::Move(const std::string& from, const std::string& to)
     return false;
 }
 
-//TODO: Don't use boost::filesystem. Why doesn't PHYSFS have this?
-bool CResourceManager::Copy(const std::string& from, const std::string& to)
-{
-    if(PHYSFS_isInit())
-    {
-        bool success = true;
-        std::string writeDir = PHYSFS_getWriteDir();
-        try
-        {
-            fs::copy(writeDir + "/" + CleanPath(from), writeDir + "/" + CleanPath(to));
-        }
-        catch (std::exception & e)
-        {
-            success = false;
-        }
-        return success;
-    }
-    return false;
-}
-
 int CResourceManager::SDLClose(SDL_RWops *context)
 {
     if (CheckSDLContext(context))
diff --git a/src/common/resources/resourcemanager.h b/src/common/resources/resourcemanager.h
index 84e28fd..f8d7eb1 100644
--- a/src/common/resources/resourcemanager.h
+++ b/src/common/resources/resourcemanager.h
@@ -65,8 +65,6 @@ public:
     
     //! Move file/directory
     static bool Move(const std::string &from, const std::string &to);
-    //! Copy file/directory
-    static bool Copy(const std::string &from, const std::string &to);
 
 private:
     static int SDLSeek(SDL_RWops *context, int offset, int whence);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git



More information about the Pkg-games-commits mailing list