drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia] Fix ignored ox::Error's

Browse Source
This commit is contained in:
Gary Talent 2020-10-11 19:04:10 -05:00
parent a725369311
commit c671c8bd66
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/gba/panic.cpp
View File

@ -26,7 +26,7 @@ void panic(const char*, int, const char *msg, ox::Error err) {
REG_DISPCTL = DispCtl_Bg0; REG_DISPCTL = DispCtl_Bg0;
clearTileLayer(nullptr, 0); clearTileLayer(nullptr, 0);
ox::BString<23> serr = "Error code: "; ox::BString<23> serr = "Error code: ";
serr += err; serr += static_cast<int64_t>(err);
puts(nullptr, 32 + 1, 1, "SADNESS..."); puts(nullptr, 32 + 1, 1, "SADNESS...");
puts(nullptr, 32 + 1, 4, "UNEXPECTED STATE:"); puts(nullptr, 32 + 1, 4, "UNEXPECTED STATE:");
puts(nullptr, 32 + 2, 6, msg); puts(nullptr, 32 + 2, 6, msg);

26
src/nostalgia/studio/json_test.cpp
View File

@ -24,11 +24,11 @@ struct TestStructNest {
template<typename T> template<typename T>
Error model(T *io, TestStructNest *obj) { Error model(T *io, TestStructNest *obj) {
auto err = OxError(0); auto err = OxError(0);
err |= io->setTypeInfo("TestStructNest", 4); oxReturnError(io->setTypeInfo("TestStructNest", 4));
err |= io->field("Bool", &obj->Bool); oxReturnError(io->field("Bool", &obj->Bool));
err |= io->field("Int", &obj->Int); oxReturnError(io->field("Int", &obj->Int));
err |= io->field("Double", &obj->Double); oxReturnError(io->field("Double", &obj->Double));
err |= io->field("String", &obj->String); oxReturnError(io->field("String", &obj->String));
return err; return err;
} }
@ -43,12 +43,12 @@ struct TestStruct {
template<typename T> template<typename T>
Error model(T *io, TestStruct *obj) { Error model(T *io, TestStruct *obj) {
auto err = OxError(0); auto err = OxError(0);
err |= io->setTypeInfo("TestStruct", 5); oxReturnError(io->setTypeInfo("TestStruct", 5));
err |= io->field("Bool", &obj->Bool); oxReturnError(io->field("Bool", &obj->Bool));
err |= io->field("Int", &obj->Int); oxReturnError(io->field("Int", &obj->Int));
err |= io->field("Double", &obj->Double); oxReturnError(io->field("Double", &obj->Double));
err |= io->field("String", &obj->String); oxReturnError(io->field("String", &obj->String));
err |= io->field("Struct", &obj->Struct); oxReturnError(io->field("Struct", &obj->Struct));
return err; return err;
} }
@ -68,8 +68,8 @@ int main() {
} }
}; };
TestStruct tsOut; TestStruct tsOut;
err |= writeJson(&json, &ts); oxReturnError(writeJson(&json, &ts));
err |= readJson(json, &tsOut); oxReturnError(readJson(json, &tsOut));
cout << tsOut.Bool << endl; cout << tsOut.Bool << endl;
cout << tsOut.Int << endl; cout << tsOut.Int << endl;

4
src/nostalgia/studio/mainwindow.cpp
View File

@ -247,7 +247,7 @@ int MainWindow::readState() {
restoreGeometry(settings.value("geometry").toByteArray()); restoreGeometry(settings.value("geometry").toByteArray());
restoreState(settings.value("windowState").toByteArray()); restoreState(settings.value("windowState").toByteArray());
auto json = settings.value("json").toString(); auto json = settings.value("json").toString();
err |= readJson(json, &m_state); oxReturnError(readJson(json, &m_state));
settings.endGroup(); settings.endGroup();
openProject(m_state.projectPath); openProject(m_state.projectPath);
@ -258,7 +258,7 @@ int MainWindow::readState() {
void MainWindow::writeState() { void MainWindow::writeState() {
// generate JSON for application specific state info // generate JSON for application specific state info
QString json; QString json;
writeJson(&json, &m_state); oxIgnoreError(writeJson(&json, &m_state));
QSettings settings(m_profile.orgName, m_profile.appName); QSettings settings(m_profile.orgName, m_profile.appName);
settings.beginGroup("MainWindow"); settings.beginGroup("MainWindow");

2
src/nostalgia/studio/mainwindow.hpp
View File

@ -53,7 +53,7 @@ struct NostalgiaStudioProfile {
template<typename T> template<typename T>
ox::Error model(T *io, NostalgiaStudioProfile *obj) { ox::Error model(T *io, NostalgiaStudioProfile *obj) {
auto err = OxError(0); auto err = OxError(0);
io->setTypeInfo("NostalgiaStudioProfile", 3); oxReturnError(io->setTypeInfo("NostalgiaStudioProfile", 3));
oxReturnError(io->field("app_name", &obj->appName)); oxReturnError(io->field("app_name", &obj->appName));
oxReturnError(io->field("org_name", &obj->orgName)); oxReturnError(io->field("org_name", &obj->orgName));
oxReturnError(io->field("plugins_path", &obj->pluginsPath)); oxReturnError(io->field("plugins_path", &obj->pluginsPath));

4
src/nostalgia/studio/oxfstreeview.cpp
View File

@ -28,12 +28,12 @@ OxFSFile::OxFSFile(PassThroughFS *fs, QString path, OxFSFile *parentItem) {
auto stat = fs->stat(static_cast<const char*>(m_path.toUtf8())); auto stat = fs->stat(static_cast<const char*>(m_path.toUtf8()));
if (!stat.error) { if (!stat.error) {
if (stat.value.fileType == FileType_Directory) { if (stat.value.fileType == FileType_Directory) {
fs->ls(m_path.toUtf8(), [&ls](const char *name, ox::InodeId_t) { oxThrowError(fs->ls(m_path.toUtf8(), [&ls](const char *name, ox::InodeId_t) {
if (name[0] != '.') { if (name[0] != '.') {
ls.push_back(name); ls.push_back(name);
} }
return OxError(0); return OxError(0);
}); }));
std::sort(ls.begin(), ls.end()); std::sort(ls.begin(), ls.end());
} }
auto p = m_path; auto p = m_path;