opt: use enum class

rtgiskard · Oct 6, 2024 · 406bced · 406bced
1 parent 276e60d
commit 406bced
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/config.h b/src/config.h
@@ -11,11 +11,11 @@ namespace mtrx {
 
 using SView = std::string_view;
 
-enum Operation {
-	OP_RUN,
-	OP_TEST,
-	OP_DUMP,
-	OP_UDP2P,
+enum class Operation {
+	RUN,
+	TEST,
+	DUMP,
+	UDP2P,
 };
 
 class Config {
@@ -30,7 +30,7 @@ class Config {
 	std::string version;
 
 	utils::LogSettings log;
-	udp2p::Config udp2p;
+	udp2p::Config      udp2p;
 
   public:
 	bool load(SView path);

diff --git a/src/main.cc b/src/main.cc
@@ -17,10 +17,10 @@ int main(int argc, char ** argv) {
 		return 2;
 
 	switch (config.op) {
-	case mtrx::OP_DUMP:
+	case mtrx::Operation::DUMP:
 		config.dump();
 		break;
-	case mtrx::OP_UDP2P: {
+	case mtrx::Operation::UDP2P: {
 		auto udp2p = mtrx::udp2p::Udp2p(config.udp2p);
 		udp2p.run();
 		break;

diff --git a/src/udp2p/udp2p.cc b/src/udp2p/udp2p.cc
@@ -15,13 +15,13 @@ void Udp2p::run() {
 	logger_->info("run mode: {}", static_cast<int>(config_.mode));
 
 	switch (config_.mode) {
-	case Udp2p_Mode::UDP2P_MODE_PEER:
+	case Udp2p_Mode::PEER:
 		peer_ptr_ = std::make_unique<Peer>(ctx_);
 		break;
-	case Udp2p_Mode::UDP2P_MODE_SERVER:
+	case Udp2p_Mode::SERVER:
 		server_ptr_ = std::make_unique<Server>(ctx_);
 		break;
-	case Udp2p_Mode::UDP2P_MODE_HYBRID:
+	case Udp2p_Mode::HYBRID:
 		peer_ptr_   = std::make_unique<Peer>(ctx_);
 		server_ptr_ = std::make_unique<Server>(ctx_);
 		break;

diff --git a/src/udp2p/udp2p.h b/src/udp2p/udp2p.h
@@ -15,9 +15,9 @@ namespace mtrx {
 namespace udp2p {
 
 enum class Udp2p_Mode {
-	UDP2P_MODE_PEER,   // peer only
-	UDP2P_MODE_SERVER, // server only
-	UDP2P_MODE_HYBRID  // peer + server
+	PEER,   // peer only
+	SERVER, // server only
+	HYBRID  // peer + server
 };
 
 class Config {