merged develop

This commit is contained in:
Luis Ángel San Martín
2016-04-19 23:19:39 +02:00
30 changed files with 638 additions and 125 deletions

View File

@ -1,6 +1,23 @@
#include "folder.h"
Folder::Folder()
:knownParent(false),
knownId(false),
numChildren(-1)
{}
Folder::Folder(qulonglong folderId, qulonglong parentId, const QString &folderName, const QString &folderPath)
:knownParent(true),
knownId(true),
numChildren(-1)
{
this->id = folderId;
this->parentId = parentId;
this->name = folderName;
this->path = folderPath;
}
Folder::Folder(const Folder &folder)
{
operator=(folder);
@ -17,3 +34,11 @@ Folder &Folder::operator =(const Folder &other)
return *this;
}
Folder::Folder(const QString & folderName, const QString & folderPath)
:knownParent(false),
knownId(false),
numChildren(-1)
{
this->name = folderName;
this->path = folderPath;
}