diff --git a/src/thirdparty/SOIL2 b/src/thirdparty/SOIL2 index e9ae69d4a..9b7d218b2 160000 --- a/src/thirdparty/SOIL2 +++ b/src/thirdparty/SOIL2 @@ -1 +1 @@ -Subproject commit e9ae69d4aadaefcca0a7c0ca43bfcee0d4c09b79 +Subproject commit 9b7d218b20a66ec92ee202261f2699222609b45e diff --git a/src/thirdparty/efsw b/src/thirdparty/efsw index 22f17a0bc..e937840e6 160000 --- a/src/thirdparty/efsw +++ b/src/thirdparty/efsw @@ -1 +1 @@ -Subproject commit 22f17a0bcdf3a4edf61f8b14328391463389e548 +Subproject commit e937840e62f6fab68e5d0a7437f99bb2efc04a05 diff --git a/src/tools/ecode/filesystemlistener.cpp b/src/tools/ecode/filesystemlistener.cpp index cb84de30d..de5a5339f 100644 --- a/src/tools/ecode/filesystemlistener.cpp +++ b/src/tools/ecode/filesystemlistener.cpp @@ -30,7 +30,7 @@ static inline bool endsWithSlash( const std::string& dir ) { void FileSystemListener::handleFileAction( efsw::WatchID, const std::string& dir, const std::string& filename, efsw::Action action, - std::string oldFilename ) { + const std::string& oldFilename ) { FileInfo file( ( endsWithSlash( dir ) ? dir : ( dir + FileSystem::getOSSlash() ) ) + filename ); switch ( action ) { diff --git a/src/tools/ecode/filesystemlistener.hpp b/src/tools/ecode/filesystemlistener.hpp index 985cbb5fd..f71be38d4 100644 --- a/src/tools/ecode/filesystemlistener.hpp +++ b/src/tools/ecode/filesystemlistener.hpp @@ -28,7 +28,7 @@ class FileSystemListener : public efsw::FileWatchListener { virtual ~FileSystemListener() {} void handleFileAction( efsw::WatchID, const std::string& dir, const std::string& filename, - efsw::Action action, std::string oldFilename ); + efsw::Action action, const std::string& oldFilename ); void setFileSystemModel( std::shared_ptr model ) { mFileSystemModel = model; } diff --git a/src/tools/uieditor/uieditor.cpp b/src/tools/uieditor/uieditor.cpp index 3b545a736..e855cc1bb 100644 --- a/src/tools/uieditor/uieditor.cpp +++ b/src/tools/uieditor/uieditor.cpp @@ -84,7 +84,7 @@ class UpdateListener : public efsw::FileWatchListener { virtual ~UpdateListener() {} void handleFileAction( efsw::WatchID, const std::string& dir, const std::string& filename, - efsw::Action action, std::string ) { + efsw::Action action, const std::string& ) { if ( action == efsw::Actions::Modified ) { if ( dir + filename == mApp->getCurrentLayout() ) { mApp->updateLayoutFunc( InvalidationType::FileSystem );