Replace ApplicationData singleton lifetime management macro calls

Simply call the functions directly, there is no benefit to hide these behind these macros.
sodevel · May 28, 2024 · ddfee70 · ddfee70
1 parent c56b6ed
commit ddfee70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/maingui.cpp b/src/maingui.cpp
@@ -166,7 +166,7 @@ int MyApp::OnRun()
 
     // Create singleton AppData - wait to initialize until sure that this is not the second
     // instance of a project file.
-    AppDataCreate(dataDir);
+    ApplicationData::Get(dataDir);
 
     // Make passed project name absolute
     try {
@@ -207,7 +207,7 @@ int MyApp::OnRun()
 
     // Init AppData
     try {
-        AppDataInit();
+        ApplicationData::Initialize();
     } catch (wxFBException& ex) {
         wxLogError(_("Error loading application: %s\nwxFormBuilder cannot continue."), ex.what());
         wxLog::FlushActive();
@@ -307,7 +307,7 @@ bool MyApp::OnInit()
 int MyApp::OnExit()
 {
     MacroDictionary::Destroy();
-    AppDataDestroy();
+    ApplicationData::Destroy();
 
     if (!wxTheClipboard->IsOpened()) {
         if (!wxTheClipboard->Open()) {

diff --git a/src/rad/appdata.h b/src/rad/appdata.h
@@ -46,9 +46,6 @@ class wxFBManager;
 
 
 #define AppData() (ApplicationData::Get())
-#define AppDataCreate(path) (ApplicationData::Get(path))
-#define AppDataInit() (ApplicationData::Initialize())
-#define AppDataDestroy() (ApplicationData::Destroy())
 
 
 // This class is a singleton class.