diff --git a/Session.cpp b/Session.cpp index 0efb43f..c05389c 100644 --- a/Session.cpp +++ b/Session.cpp @@ -296,8 +296,8 @@ int Session::index(SourceList::iterator it) const void Session::move(int current_index, int target_index) { - if ( current_index < 0 || current_index > sources_.size() - || target_index < 0 || target_index > sources_.size() + if ( current_index < 0 || current_index > (int) sources_.size() + || target_index < 0 || target_index > (int) sources_.size() || target_index == current_index ) return; diff --git a/SessionCreator.cpp b/SessionCreator.cpp index 344c499..3cf8963 100644 --- a/SessionCreator.cpp +++ b/SessionCreator.cpp @@ -52,7 +52,7 @@ std::string SessionCreator::info(const std::string& filename) return ret; } -SessionCreator::SessionCreator(uint recursion): SessionLoader(nullptr, recursion) +SessionCreator::SessionCreator(int recursion): SessionLoader(nullptr, recursion) { } @@ -108,7 +108,7 @@ void SessionCreator::loadConfig(XMLElement *viewsNode) } } -SessionLoader::SessionLoader(Session *session, uint recursion): Visitor(), session_(session), recursion_(recursion) +SessionLoader::SessionLoader(Session *session, int recursion): Visitor(), session_(session), recursion_(recursion) { } diff --git a/SessionCreator.h b/SessionCreator.h index ed3dea6..e472b92 100644 --- a/SessionCreator.h +++ b/SessionCreator.h @@ -13,7 +13,7 @@ class SessionLoader : public Visitor { public: - SessionLoader(Session *session, uint recursion = 0); + SessionLoader(Session *session, int recursion = 0); inline Session *session() const { return session_; } void load(tinyxml2::XMLElement *sessionNode); @@ -58,7 +58,7 @@ protected: tinyxml2::XMLElement *xmlCurrent_; Session *session_; std::list sources_id_; - uint recursion_; + int recursion_; static void XMLToNode(tinyxml2::XMLElement *xml, Node &n); }; @@ -70,7 +70,7 @@ class SessionCreator : public SessionLoader { void loadConfig(tinyxml2::XMLElement *viewsNode); public: - SessionCreator(uint recursion = 0); + SessionCreator(int recursion = 0); void load(const std::string& filename);