change: change code style to Linux style except indent.
This commit is contained in:
@@ -24,58 +24,65 @@
|
||||
|
||||
#include "node/project/serializer/serializer.h"
|
||||
|
||||
namespace olive {
|
||||
namespace olive
|
||||
{
|
||||
|
||||
ProjectLoadTask::ProjectLoadTask(const QString &filename) :
|
||||
ProjectLoadBaseTask(filename)
|
||||
ProjectLoadTask::ProjectLoadTask(const QString &filename)
|
||||
: ProjectLoadBaseTask(filename)
|
||||
{
|
||||
}
|
||||
|
||||
bool ProjectLoadTask::Run()
|
||||
{
|
||||
project_ = new Project();
|
||||
project_ = new Project();
|
||||
|
||||
project_->set_filename(GetFilename());
|
||||
project_->set_filename(GetFilename());
|
||||
|
||||
ProjectSerializer::Result result = ProjectSerializer::Load(project_, GetFilename(), ProjectSerializer::kProject);
|
||||
ProjectSerializer::Result result = ProjectSerializer::Load(
|
||||
project_, GetFilename(), ProjectSerializer::kProject);
|
||||
|
||||
layout_ = result.GetLoadData().layout;
|
||||
layout_ = result.GetLoadData().layout;
|
||||
|
||||
switch (result.code()) {
|
||||
case ProjectSerializer::kSuccess:
|
||||
break;
|
||||
case ProjectSerializer::kProjectTooOld:
|
||||
SetError(tr("This project is from a version of Olive that is no longer supported in this version."));
|
||||
break;
|
||||
case ProjectSerializer::kProjectTooNew:
|
||||
SetError(tr("This project is from a newer version of Olive and cannot be opened in this version."));
|
||||
break;
|
||||
case ProjectSerializer::kUnknownVersion:
|
||||
SetError(tr("Failed to determine project version."));
|
||||
break;
|
||||
case ProjectSerializer::kFileError:
|
||||
SetError(tr("Failed to read file \"%1\" for reading.").arg(GetFilename()));
|
||||
break;
|
||||
case ProjectSerializer::kXmlError:
|
||||
SetError(tr("Failed to read XML document. File may be corrupt. Error was: %1").arg(result.GetDetails()));
|
||||
break;
|
||||
case ProjectSerializer::kNoData:
|
||||
SetError(tr("Failed to find any data to parse."));
|
||||
break;
|
||||
switch (result.code()) {
|
||||
case ProjectSerializer::kSuccess:
|
||||
break;
|
||||
case ProjectSerializer::kProjectTooOld:
|
||||
SetError(tr(
|
||||
"This project is from a version of Olive that is no longer supported in this version."));
|
||||
break;
|
||||
case ProjectSerializer::kProjectTooNew:
|
||||
SetError(tr(
|
||||
"This project is from a newer version of Olive and cannot be opened in this version."));
|
||||
break;
|
||||
case ProjectSerializer::kUnknownVersion:
|
||||
SetError(tr("Failed to determine project version."));
|
||||
break;
|
||||
case ProjectSerializer::kFileError:
|
||||
SetError(
|
||||
tr("Failed to read file \"%1\" for reading.").arg(GetFilename()));
|
||||
break;
|
||||
case ProjectSerializer::kXmlError:
|
||||
SetError(
|
||||
tr("Failed to read XML document. File may be corrupt. Error was: %1")
|
||||
.arg(result.GetDetails()));
|
||||
break;
|
||||
case ProjectSerializer::kNoData:
|
||||
SetError(tr("Failed to find any data to parse."));
|
||||
break;
|
||||
|
||||
// Errors that should never be thrown by a load
|
||||
case ProjectSerializer::kOverwriteError:
|
||||
SetError(tr("Unknown error."));
|
||||
break;
|
||||
}
|
||||
// Errors that should never be thrown by a load
|
||||
case ProjectSerializer::kOverwriteError:
|
||||
SetError(tr("Unknown error."));
|
||||
break;
|
||||
}
|
||||
|
||||
if (result == ProjectSerializer::kSuccess) {
|
||||
project_->moveToThread(qApp->thread());
|
||||
return true;
|
||||
} else {
|
||||
delete project_;
|
||||
return false;
|
||||
}
|
||||
if (result == ProjectSerializer::kSuccess) {
|
||||
project_->moveToThread(qApp->thread());
|
||||
return true;
|
||||
} else {
|
||||
delete project_;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -24,17 +24,16 @@
|
||||
#include "loadbasetask.h"
|
||||
#include "window/mainwindow/mainwindowlayoutinfo.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
class ProjectLoadTask : public ProjectLoadBaseTask
|
||||
namespace olive
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
class ProjectLoadTask : public ProjectLoadBaseTask {
|
||||
Q_OBJECT
|
||||
public:
|
||||
ProjectLoadTask(const QString& filename);
|
||||
ProjectLoadTask(const QString &filename);
|
||||
|
||||
protected:
|
||||
virtual bool Run() override;
|
||||
|
||||
virtual bool Run() override;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -20,13 +20,14 @@
|
||||
|
||||
#include "loadbasetask.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) :
|
||||
project_(nullptr),
|
||||
filename_(filename)
|
||||
namespace olive
|
||||
{
|
||||
SetTitle(tr("Loading '%1'").arg(filename));
|
||||
|
||||
ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename)
|
||||
: project_(nullptr)
|
||||
, filename_(filename)
|
||||
{
|
||||
SetTitle(tr("Loading '%1'").arg(filename));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -24,37 +24,36 @@
|
||||
#include "node/project.h"
|
||||
#include "task/task.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
class ProjectLoadBaseTask : public Task
|
||||
namespace olive
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
class ProjectLoadBaseTask : public Task {
|
||||
Q_OBJECT
|
||||
public:
|
||||
ProjectLoadBaseTask(const QString& filename);
|
||||
ProjectLoadBaseTask(const QString &filename);
|
||||
|
||||
Project* GetLoadedProject() const
|
||||
{
|
||||
return project_;
|
||||
}
|
||||
Project *GetLoadedProject() const
|
||||
{
|
||||
return project_;
|
||||
}
|
||||
|
||||
const QString& GetFilename() const
|
||||
{
|
||||
return filename_;
|
||||
}
|
||||
const QString &GetFilename() const
|
||||
{
|
||||
return filename_;
|
||||
}
|
||||
|
||||
const MainWindowLayoutInfo &GetLoadedLayout() const
|
||||
{
|
||||
return layout_;
|
||||
}
|
||||
const MainWindowLayoutInfo &GetLoadedLayout() const
|
||||
{
|
||||
return layout_;
|
||||
}
|
||||
|
||||
protected:
|
||||
Project* project_;
|
||||
Project *project_;
|
||||
|
||||
MainWindowLayoutInfo layout_;
|
||||
MainWindowLayoutInfo layout_;
|
||||
|
||||
private:
|
||||
QString filename_;
|
||||
|
||||
QString filename_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user