Skip to content

Commit 22debed

Browse files
7bitcoder7bitcoder
committed
make just one namespace sb for in project
1 parent 4972d1a commit 22debed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+208
-202
lines changed

‎SharpsenBox/.vscode/settings.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"files.associations": {
3-
"filesystem": "cpp"
3+
"filesystem": "cpp",
4+
"future": "cpp",
5+
"memory": "cpp",
6+
"sstream": "cpp",
7+
"xhash": "cpp",
8+
"xlocnum": "cpp"
49
}
510
}

‎SharpsenBox/Source/App/App/Backend.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
#include "Config.hpp"
66
#include "Backend.hpp"
77

8-
namespace bc {
8+
namespace sb {
99
Backend::Backend(QQmlApplicationEngine* eng) : register_(eng) {}
1010

1111
void Backend::init() { register_.init(); }
1212

1313
void Backend::registerComponents() {
14-
register_.createAndRegister<cf::IConfig, cf::Config>();
15-
register_.createAndRegister<dl::IDialog, dl::Dialog>();
16-
register_.createAndRegister<lb::ILoadingBar, lb::LoadingBar>();
17-
register_.createAndRegister<gm::IGameManager, gm::GameManager>();
14+
register_.createAndRegister<IConfig, Config>();
15+
register_.createAndRegister<IDialog, Dialog>();
16+
register_.createAndRegister<ILoadingBar, LoadingBar>();
17+
register_.createAndRegister<IGameManager, GameManager>();
1818
}
1919
}

‎SharpsenBox/Source/App/App/Backend.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <unordered_map>
66
#include "ComponentRegister.hpp"
77

8-
namespace bc {
8+
namespace sb {
99
class Backend {
1010
public:
1111
Backend(QQmlApplicationEngine* eng);

‎SharpsenBox/Source/App/App/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ int main(int argc, char** argv) {
1212
app.setWindowIcon(QIcon("orbit2.ico"));
1313
QQmlApplicationEngine engine;
1414

15-
bc::Backend backend(&engine);
15+
sb::Backend backend(&engine);
1616
backend.registerComponents();
1717
backend.init();
1818

‎SharpsenBox/Source/App/QDialog/Dialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "IGameManager.hpp"
66

77

8-
namespace dl {
8+
namespace sb {
99
Dialog::Dialog() {}
1010
Q_INVOKABLE void Dialog::dialog(bool value) {
1111
value_ = value;

‎SharpsenBox/Source/App/QDialog/Dialog.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "IDialog.hpp"
77
#include "IComponent.hpp"
88

9-
namespace dl {
9+
namespace sb {
1010
class Dialog final : public IDialog {
1111
Q_OBJECT;
1212
public:

‎SharpsenBox/Source/App/QDialog/h/IDialog.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <QDebug>
55
#include "IComponent.hpp"
66

7-
namespace dl {
8-
struct IDialog : public bc::IComponent {
7+
namespace sb {
8+
struct IDialog : public IComponent {
99
public:
1010
enum Type {NONE=0, INFO, INSTALL, DIALOG};
1111
IDialog() {};

‎SharpsenBox/Source/App/QGameManager/GameManager.cpp

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "updateInfo.hpp"
1313

1414

15-
namespace gm {
15+
namespace sb {
1616

1717
std::string GameManager::getName() {
1818
return TYPENAME(GameManager);
@@ -33,7 +33,7 @@ namespace gm {
3333
auto callback = [id, this](bool val) {
3434
if (val) {
3535
lb_->reset();
36-
auto& game = bc::Component <cf::IConfig>::get().getGame(id);
36+
auto& game = Component <IConfig>::get().getGame(id);
3737
std::string gg = path_.toStdString();
3838
#ifdef _WIN32
3939
if (gg.starts_with("/"))
@@ -47,43 +47,43 @@ namespace gm {
4747
}
4848
return false;
4949
};
50-
auto& dialog = bc::Component<dl::IDialog>::get();
51-
dialog.setType(dl::IDialog::INSTALL);
50+
auto& dialog = Component<IDialog>::get();
51+
dialog.setType(IDialog::INSTALL);
5252
dialog.setCallback(callback);
5353
dialog.setInfo("");
5454
dialog.show();
5555
}
5656

5757
void GameManager::init() {
5858
im_.init();
59-
lb_ = &bc::Component<lb::ILoadingBar>::get();
59+
lb_ = &Component<ILoadingBar>::get();
6060
connect(uninstaller_, &GameUninstaller::uninstalationComplete, this, &GameManager::uninstallation);
6161

62-
connect(&im_, &im::UpdateManager::errorEmit, this, &GameManager::errorEmit);
63-
connect(&im_, &im::UpdateManager::updateProgress, this, &GameManager::updateProgress);
64-
connect(&im_, &im::UpdateManager::setTotalLb, this, &GameManager::setTotalLb);
65-
connect(&im_, &im::UpdateManager::setActualLb, this, &GameManager::setActualLb);
66-
connect(&im_, &im::UpdateManager::setSpeedLb, this, &GameManager::setSpeedLb);
67-
connect(&im_, &im::UpdateManager::setStateLb, this, &GameManager::setStateLb);
68-
connect(&im_, &im::UpdateManager::setVisibleStateLb, this, &GameManager::setVisibleStateLb);
69-
connect(&im_, &im::UpdateManager::setUninstallModeLb, this, &GameManager::setUninstallModeLb);
70-
connect(&im_, &im::UpdateManager::pausedSignal, this, &GameManager::paused);
71-
connect(&im_, &im::UpdateManager::resumedSignal, this, &GameManager::resumed);
62+
connect(&im_, &UpdateManager::errorEmit, this, &GameManager::errorEmit);
63+
connect(&im_, &UpdateManager::updateProgress, this, &GameManager::updateProgress);
64+
connect(&im_, &UpdateManager::setTotalLb, this, &GameManager::setTotalLb);
65+
connect(&im_, &UpdateManager::setActualLb, this, &GameManager::setActualLb);
66+
connect(&im_, &UpdateManager::setSpeedLb, this, &GameManager::setSpeedLb);
67+
connect(&im_, &UpdateManager::setStateLb, this, &GameManager::setStateLb);
68+
connect(&im_, &UpdateManager::setVisibleStateLb, this, &GameManager::setVisibleStateLb);
69+
connect(&im_, &UpdateManager::setUninstallModeLb, this, &GameManager::setUninstallModeLb);
70+
connect(&im_, &UpdateManager::pausedSignal, this, &GameManager::paused);
71+
connect(&im_, &UpdateManager::resumedSignal, this, &GameManager::resumed);
7272
};
7373

7474
Q_INVOKABLE void GameManager::unistallRequest(int id) {
7575
gameId_ = id;
7676
if (checkProcess())
7777
return;
78-
auto& cf = bc::Component <cf::IConfig>::get();
79-
auto& dialog = bc::Component < dl::IDialog > ::get();
78+
auto& cf = Component <IConfig>::get();
79+
auto& dialog = Component < IDialog > ::get();
8080
if (cf.installed(id)) {
81-
dialog.setType(dl::IDialog::DIALOG);
81+
dialog.setType(IDialog::DIALOG);
8282
dialog.setCallback([this](bool val) {return this->uninstall(val); });
8383
dialog.setInfo(QString("Are you sure you want to remove ") + cf.getGameName(id));
8484
dialog.show();
8585
} else {
86-
dialog.setType(dl::IDialog::INFO);
86+
dialog.setType(IDialog::INFO);
8787
dialog.setInfo("Game is not installed");
8888
dialog.show();
8989
}
@@ -96,8 +96,8 @@ namespace gm {
9696
lock();
9797
lb_->reset();
9898
lb_->setUninstallMode(true);
99-
lb_->setState(im::IUpdateManager::State::CHECKING);
100-
lb_->setVisibleState(im::IUpdateManager::VisibleState::SHOWED);
99+
lb_->setState(IUpdateManager::State::CHECKING);
100+
lb_->setVisibleState(IUpdateManager::VisibleState::SHOWED);
101101
uninstaller_->setId(gameId_);
102102
uninstaller_->start();
103103
return false;
@@ -112,18 +112,18 @@ namespace gm {
112112
void GameManager::stop() { if (lock_) im_.stop(); }
113113

114114
void GameManager::uninstallation(int id) {
115-
bc::Component <cf::IConfig>::get().getGame(id).installed = false;
115+
Component <IConfig>::get().getGame(id).installed = false;
116116
unLock();
117117
lb_->setUninstallMode(false);
118-
lb_->setVisibleState(im::IUpdateManager::VisibleState::HIDDEN);
118+
lb_->setVisibleState(IUpdateManager::VisibleState::HIDDEN);
119119
}
120120

121121
Q_INVOKABLE void GameManager::checkAutoUpdate(int id) {
122-
auto& game = bc::Component<cf::IConfig>::get().getGame(id);
122+
auto& game = Component<IConfig>::get().getGame(id);
123123
if (game.autoCheck && game.installed) {
124124
if (lock_) {
125-
auto& dialog = bc::Component<dl::IDialog>::get();
126-
dialog.setType(dl::IDialog::INFO);
125+
auto& dialog = Component<IDialog>::get();
126+
dialog.setType(IDialog::INFO);
127127
dialog.setInfo(QString("Cannot auto update game ") + game.name + " another process is running");
128128
dialog.show();
129129
} else {
@@ -134,15 +134,15 @@ namespace gm {
134134
}
135135

136136
Q_INVOKABLE void GameManager::update(int id) {
137-
auto& game = bc::Component <cf::IConfig>::get().getGame(id);
137+
auto& game = Component <IConfig>::get().getGame(id);
138138
if (!game.updateChecked) {
139-
bc::Component <lb::ILoadingBar>::get().reset();
139+
Component <ILoadingBar>::get().reset();
140140
im_.updateGame(game);
141141
}
142142
}
143143

144144
Q_INVOKABLE void GameManager::runGame(int id) {
145-
auto& game = bc::Component <cf::IConfig>::get().getGame(id);
145+
auto& game = Component <IConfig>::get().getGame(id);
146146
std::filesystem::path path = game.gameDir.toUtf8().constData();
147147
path /= game.execPath.toUtf8().constData();
148148
std::string cd = "cd \"";
@@ -162,12 +162,12 @@ namespace gm {
162162
void GameManager::setUninstallModeLb(bool un) { lb_->setUninstallMode(un); }
163163

164164
void GameManager::setStateLb(int state) {
165-
using State = im::IUpdateManager::State;
165+
using State = IUpdateManager::State;
166166
auto st = static_cast<State>(state);
167167
switch (st) {
168168
case State::COMPLEET: {
169169
auto& updatedGame = im_.getUpdateInfo().getActualGame();
170-
bc::Component<cf::IConfig>::get().getGame(updatedGame.id) = updatedGame; // insert new game info in cofnig
170+
Component<IConfig>::get().getGame(updatedGame.id) = updatedGame; // insert new game info in cofnig
171171
}
172172
case State::ERRORD:
173173
case State::STOPPED:
@@ -180,13 +180,13 @@ namespace gm {
180180
}
181181

182182
void GameManager::setVisibleStateLb(int st) {
183-
lb_->setVisibleState(im::IUpdateManager::VisibleState(st));
183+
lb_->setVisibleState(IUpdateManager::VisibleState(st));
184184
}
185185

186186
bool GameManager::checkProcess() {
187187
if (lock_) {
188-
auto& dialog = bc::Component<dl::IDialog>::get();
189-
dialog.setType(dl::IDialog::INFO);
188+
auto& dialog = Component<IDialog>::get();
189+
dialog.setType(IDialog::INFO);
190190
dialog.setInfo("Wait for other process to finish");
191191
dialog.show();
192192
return true;

‎SharpsenBox/Source/App/QGameManager/GameManager.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "ILoadingBar.hpp"
99
#include "UpdateManager.hpp"
1010

11-
namespace gm {
11+
namespace sb {
1212
class GameUninstaller;
1313
class GameManager final :public IGameManager {
1414
Q_OBJECT
@@ -68,7 +68,7 @@ namespace gm {
6868
QString path_;
6969
bool shortcut_;
7070
GameUninstaller* uninstaller_;
71-
im::UpdateManager im_;
72-
lb::ILoadingBar* lb_;
71+
UpdateManager im_;
72+
ILoadingBar* lb_;
7373
};
7474
}

‎SharpsenBox/Source/App/QGameManager/GameUninstaller.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#include "IComponent.hpp"
44
#include "Game.hpp"
55

6-
namespace gm {
6+
namespace sb {
77
void GameUninstaller::setId(int id) {
88
id_ = id;
9-
auto& game = bc::Component<cf::IConfig>::get().getGame(id_);
9+
auto& game = Component<IConfig>::get().getGame(id_);
1010
gameDir_ = game.gameDir.toStdString();
1111
shortcut_ = game.shortcut;
1212
if (shortcut_)

‎SharpsenBox/Source/App/QGameManager/GameUninstaller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <QDebug>
55
#include <filesystem>
66

7-
namespace gm {
7+
namespace sb {
88
class GameUninstaller : public QThread {
99
Q_OBJECT
1010
public:

‎SharpsenBox/Source/App/QGameManager/h/IGameManager.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <QNetworkAccessManager>
77
#include "IComponent.hpp"
88

9-
namespace gm {
10-
struct IGameManager : bc::IComponent {
9+
namespace sb {
10+
struct IGameManager : public IComponent {
1111
public:
1212
virtual ~IGameManager() {};
1313

‎SharpsenBox/Source/App/QLoadingBar/LoadingBar.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "IGameManager.hpp"
88

99

10-
namespace lb {
10+
namespace sb {
1111
LoadingBar::LoadingBar() {}
1212
LoadingBar::~LoadingBar() {}
1313

@@ -41,9 +41,9 @@ namespace lb {
4141
return progress_;
4242
}
4343

44-
Q_INVOKABLE void LoadingBar::pause() { bc::Component<gm::IGameManager>::get().pause(); };
45-
Q_INVOKABLE void LoadingBar::resume() { bc::Component<gm::IGameManager>::get().resume(); }
46-
Q_INVOKABLE void LoadingBar::stop() { bc::Component<gm::IGameManager>::get().stop(); }
44+
Q_INVOKABLE void LoadingBar::pause() { Component<IGameManager>::get().pause(); };
45+
Q_INVOKABLE void LoadingBar::resume() { Component<IGameManager>::get().resume(); }
46+
Q_INVOKABLE void LoadingBar::stop() { Component<IGameManager>::get().stop(); }
4747

4848
Q_INVOKABLE bool LoadingBar::getUninstall() {
4949
return uninstall_;
@@ -66,18 +66,18 @@ namespace lb {
6666
}
6767

6868
void LoadingBar::setError(const QString& str) {
69-
auto& dialog = bc::Component<dl::IDialog>::get();
70-
dialog.setType(dl::IDialog::Type::INFO);
69+
auto& dialog = Component<IDialog>::get();
70+
dialog.setType(IDialog::Type::INFO);
7171
dialog.setInfo(str);
7272
dialog.show();
7373
}
7474

75-
void LoadingBar::setState(im::IUpdateManager::State st) {
75+
void LoadingBar::setState(IUpdateManager::State st) {
7676
state_ = st;
7777
stateChanged();
7878
}
7979

80-
void LoadingBar::setVisibleState(im::IUpdateManager::VisibleState st) {
80+
void LoadingBar::setVisibleState(IUpdateManager::VisibleState st) {
8181
visibleState_ = st;
8282
visibleStateChanged();
8383
}
@@ -88,13 +88,13 @@ namespace lb {
8888

8989
void LoadingBar::paused() {
9090
lastState_ = state_;
91-
setState(im::IUpdateManager::State::PAUSE);
91+
setState(IUpdateManager::State::PAUSE);
9292
pauseResume_ = true;
9393
pauseResumeChanged();
9494
}
9595

9696
void LoadingBar::resumed() {
97-
if(lastState_ != im::IUpdateManager::State::NONE)
97+
if(lastState_ != IUpdateManager::State::NONE)
9898
setState(lastState_);
9999
pauseResume_ = false;
100100
pauseResumeChanged();
@@ -111,9 +111,9 @@ namespace lb {
111111
uninstall_ = false;
112112
pauseResume_ = false;
113113

114-
setState(im::IUpdateManager::State::NONE);
115-
lastState_ = im::IUpdateManager::State::NONE;
114+
setState(IUpdateManager::State::NONE);
115+
lastState_ = IUpdateManager::State::NONE;
116116
resumed(); // to reset pause resume button to pause state
117-
visibleState_ = im::IUpdateManager::VisibleState::HIDDEN;
117+
visibleState_ = IUpdateManager::VisibleState::HIDDEN;
118118
}
119119
}

0 commit comments

Comments
 (0)