eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-12 02:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

OSX compile fix

Browse Source
This commit is contained in:
brunoherbelin
2021-02-15 09:03:30 +01:00
parent e37b21760e
commit 885ce67174
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Session.cpp
View File

@@ -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;

4
SessionCreator.cpp
View File

@@ -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)
{
}

6
SessionCreator.h
View File

@@ -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<uint64_t> 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);