opt(main):1.12.13, 将onFillDefaultConfig()改成const函数

hevake · hevake · commit 363bd5585849 · 2025-06-13T09:37:24.000+08:00
diff --git a/examples/main/02_more_than_one_apps/app2/app.cpp b/examples/main/02_more_than_one_apps/app2/app.cpp
@@ -34,7 +34,7 @@ App::~App()
     LogTag();
 }
 
-void App::onFillDefaultConfig(tbox::Json &cfg)
+void App::onFillDefaultConfig(tbox::Json &cfg) const
 {
     cfg["ok"] = true;
 }
diff --git a/examples/main/02_more_than_one_apps/app2/app.h b/examples/main/02_more_than_one_apps/app2/app.h
@@ -31,7 +31,7 @@ class App : public tbox::main::Module
     ~App();
 
   protected:
-    virtual void onFillDefaultConfig(tbox::Json &cfg) override;
+    virtual void onFillDefaultConfig(tbox::Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;
diff --git a/examples/main/03_nc_client_and_echo_server/echo_server/app.cpp b/examples/main/03_nc_client_and_echo_server/echo_server/app.cpp
@@ -39,7 +39,7 @@ App::~App()
     CHECK_DELETE_RESET_OBJ(server_);
 }
 
-void App::onFillDefaultConfig(Json &cfg)
+void App::onFillDefaultConfig(Json &cfg) const
 {
     cfg["bind"] = "127.0.0.1:12345";
 }
diff --git a/examples/main/03_nc_client_and_echo_server/echo_server/app.h b/examples/main/03_nc_client_and_echo_server/echo_server/app.h
@@ -33,7 +33,7 @@ class App : public main::Module
     App(main::Context &ctx);
     virtual ~App() override;
 
-    virtual void onFillDefaultConfig(Json &cfg) override;
+    virtual void onFillDefaultConfig(Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;
diff --git a/examples/main/03_nc_client_and_echo_server/nc_client/app.cpp b/examples/main/03_nc_client_and_echo_server/nc_client/app.cpp
@@ -41,7 +41,7 @@ App::~App()
     CHECK_DELETE_RESET_OBJ(client_);
 }
 
-void App::onFillDefaultConfig(Json &cfg)
+void App::onFillDefaultConfig(Json &cfg) const
 {
     cfg["server"] = "127.0.0.1:12345";
 }
diff --git a/examples/main/03_nc_client_and_echo_server/nc_client/app.h b/examples/main/03_nc_client_and_echo_server/nc_client/app.h
@@ -34,7 +34,7 @@ class App : public main::Module
     App(tbox::main::Context &ctx);
     virtual ~App() override;
 
-    virtual void onFillDefaultConfig(Json &cfg) override;
+    virtual void onFillDefaultConfig(Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;
diff --git a/examples/run/echo_server/echo_server.cpp b/examples/run/echo_server/echo_server.cpp
@@ -39,7 +39,7 @@ App::~App()
     CHECK_DELETE_RESET_OBJ(server_);
 }
 
-void App::onFillDefaultConfig(Json &cfg)
+void App::onFillDefaultConfig(Json &cfg) const
 {
     cfg["bind"] = "127.0.0.1:12345";
 }
diff --git a/examples/run/echo_server/echo_server.h b/examples/run/echo_server/echo_server.h
@@ -33,7 +33,7 @@ class App : public main::Module
     App(main::Context &ctx);
     virtual ~App() override;
 
-    virtual void onFillDefaultConfig(Json &cfg) override;
+    virtual void onFillDefaultConfig(Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;
diff --git a/examples/run/nc_client/nc_client.cpp b/examples/run/nc_client/nc_client.cpp
@@ -41,7 +41,7 @@ App::~App()
     CHECK_DELETE_RESET_OBJ(client_);
 }
 
-void App::onFillDefaultConfig(Json &cfg)
+void App::onFillDefaultConfig(Json &cfg) const
 {
     cfg["server"] = "127.0.0.1:12345";
 }
diff --git a/examples/run/nc_client/nc_client.h b/examples/run/nc_client/nc_client.h
@@ -34,7 +34,7 @@ class App : public main::Module
     App(tbox::main::Context &ctx);
     virtual ~App() override;
 
-    virtual void onFillDefaultConfig(Json &cfg) override;
+    virtual void onFillDefaultConfig(Json &cfg) const override;
     virtual bool onInit(const tbox::Json &cfg) override;
     virtual bool onStart() override;
     virtual void onStop() override;
diff --git a/modules/main/module.cpp b/modules/main/module.cpp
@@ -90,7 +90,7 @@ bool Module::addAs(Module *child, const std::string &name, bool required)
     return true;
 }
 
-void Module::fillDefaultConfig(Json &js_parent)
+void Module::fillDefaultConfig(Json &js_parent) const
 {
     Json &js_this = name_.empty() ? js_parent : js_parent[name_];
 
diff --git a/modules/main/module.h b/modules/main/module.h
@@ -102,7 +102,7 @@ class Module {
     bool addAs(Module *child, const std::string &name, bool required = true);
 
     //! 下面5个函数，由父Module自动调用。使用者不需要关心
-    void fillDefaultConfig(Json &js_parent);
+    void fillDefaultConfig(Json &js_parent) const;
     bool initialize(const Json &js_parent);
     bool start();
     void stop();
@@ -120,9 +120,9 @@ class Module {
     //! 下面的5个虚函数，可由使用者根据需要重写。如果没有操作，就不用重写
 
     //! 填充本模块的默认参数，可重写。注意：日志系统在该函数执行过程中尚不可用
-    virtual void onFillDefaultConfig(Json &js_this) { (void)js_this; }
+    virtual void onFillDefaultConfig(Json &) const { }
     //! 初始化本模块的操作，可重写
-    virtual bool onInit(const Json &js_this) { (void)js_this; return true; }
+    virtual bool onInit(const Json &) { return true; }
     //! 启动本模块的操作，可重写
     virtual bool onStart() { return true; }
     //! 停止本模块的操作，可重写，对应onStart()的逆操作
diff --git a/version.mk b/version.mk
@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 12
-TBOX_VERSION_REVISION := 12
+TBOX_VERSION_REVISION := 13

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ App::~App()`
`34`	`34`	`LogTag();`
`35`	`35`	`}`
`36`	`36`
`37`		`-void App::onFillDefaultConfig(tbox::Json &cfg)`
	`37`	`+void App::onFillDefaultConfig(tbox::Json &cfg) const`
`38`	`38`	`{`
`39`	`39`	`cfg["ok"] = true;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ App::~App()`
`39`	`39`	`CHECK_DELETE_RESET_OBJ(server_);`
`40`	`40`	`}`
`41`	`41`
`42`		`-void App::onFillDefaultConfig(Json &cfg)`
	`42`	`+void App::onFillDefaultConfig(Json &cfg) const`
`43`	`43`	`{`
`44`	`44`	`cfg["bind"] = "127.0.0.1:12345";`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ App::~App()`
`41`	`41`	`CHECK_DELETE_RESET_OBJ(client_);`
`42`	`42`	`}`
`43`	`43`
`44`		`-void App::onFillDefaultConfig(Json &cfg)`
	`44`	`+void App::onFillDefaultConfig(Json &cfg) const`
`45`	`45`	`{`
`46`	`46`	`cfg["server"] = "127.0.0.1:12345";`
`47`	`47`	`}`