drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia] Update nested namespaces for C++17

Browse Source
This commit is contained in:
Gary Talent
2019-08-03 22:43:17 -05:00
parent 8cd38dccbf
commit 32b345ed0b
21 changed files with 27 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/studio/lib/json_err.hpp
View File

@@ -8,8 +8,7 @@
#pragma once
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
enum {
JSON_ERR_FIELD_MISSING = 1,
@@ -17,4 +16,3 @@ enum {
};
}
}

4
src/nostalgia/studio/lib/json_read.cpp
View File

@@ -8,8 +8,7 @@
#include "json_read.hpp"
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
JsonReader::JsonReader(QJsonObject &obj): m_src(obj) {
}
@@ -86,4 +85,3 @@ ox::Error JsonReader::field(QJsonValueRef src, QString *dest) {
}
}

4
src/nostalgia/studio/lib/oxfstreeview.hpp
View File

@@ -14,8 +14,7 @@
#include <ox/fs/fs.hpp>
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
class OxFSFile {
private:
@@ -82,4 +81,3 @@ class OxFSModel: public QAbstractItemModel {
};
}
}

4
src/nostalgia/studio/lib/plugin.cpp
View File

@@ -8,8 +8,7 @@
#include "plugin.hpp"
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
QVector<WizardMaker> Plugin::newWizards(const Context*) {
return {};
@@ -24,4 +23,3 @@ QWidget *Plugin::makeEditor(QString, const Context*) {
}
}
}

4
src/nostalgia/studio/lib/plugin.hpp
View File

@@ -19,8 +19,7 @@
#include "project.hpp"
#include "wizard.hpp"
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
struct Context {
QWidget *tabParent = nullptr;
@@ -46,7 +45,6 @@ class Plugin {
};
}
}
#define PluginInterface_iid "net.drinkingtea.nostalgia.studio.Plugin"

4
src/nostalgia/studio/lib/project.hpp
View File

@@ -15,8 +15,7 @@
#include <ox/fs/fs.hpp>
#include <ox/mc/mc.hpp>
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
class Project: public QObject {
Q_OBJECT
@@ -75,4 +74,3 @@ ox::Error Project::writeObj(QString path, T *obj) const {
}
}
}

4
src/nostalgia/studio/lib/wizard.cpp
View File

@@ -18,8 +18,7 @@
#include "plugin.hpp"
#include "wizard.hpp"
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
using std::function;
@@ -343,4 +342,3 @@ void Wizard::accept() {
}
}
}

4
src/nostalgia/studio/lib/wizard.hpp
View File

@@ -19,8 +19,7 @@
#include <QVector>
#include <QWizard>
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
struct WizardMaker {
QString name;
@@ -132,4 +131,3 @@ class Wizard: public QWizard {
};
}
}

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

@@ -29,8 +29,7 @@
#include "mainwindow.hpp"
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
const QString MainWindow::StateFilePath = "studio_state.json";
@@ -375,4 +374,3 @@ void MainWindow::refreshProjectExplorer(QString path) {
}
}
}

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

@@ -27,8 +27,7 @@
#include "lib/plugin.hpp"
#include "lib/project.hpp"
namespace nostalgia {
namespace studio {
namespace nostalgia::studio {
struct NostalgiaStudioState {
QString projectPath;
@@ -145,4 +144,3 @@ class MainWindow: public QMainWindow {
};
}
}