From 5687e029d151d4590693c66da8440acb0fca1910 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 1 Jun 2018 15:46:26 +0300
Subject: CPluginDlgBase: this class became useless because CMPlugin already
 has module setting

---
 plugins/Db_autobackups/src/backup.cpp  |  2 +-
 plugins/Db_autobackups/src/main.cpp    |  4 ++--
 plugins/Db_autobackups/src/options.cpp | 24 ++++++++++++------------
 plugins/Db_autobackups/src/options.h   |  4 ++--
 plugins/Db_autobackups/src/stdafx.h    |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'plugins/Db_autobackups/src')

diff --git a/plugins/Db_autobackups/src/backup.cpp b/plugins/Db_autobackups/src/backup.cpp
index 75e9f26a28..d9b4dd5b5e 100644
--- a/plugins/Db_autobackups/src/backup.cpp
+++ b/plugins/Db_autobackups/src/backup.cpp
@@ -243,7 +243,7 @@ int Backup(wchar_t *backup_filename)
 		}
 		SendDlgItemMessage(progress_dialog, IDC_PROGRESS, PBM_SETPOS, (WPARAM)(100), 0);
 		UpdateWindow(progress_dialog);
-		db_set_dw(0, MODULE, "LastBackupTimestamp", (DWORD)time(0));
+		db_set_dw(0, MODULENAME, "LastBackupTimestamp", (DWORD)time(0));
 
 		if (options.use_cloudfile)
 		{
diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp
index 4c52633c9e..db34035088 100644
--- a/plugins/Db_autobackups/src/main.cpp
+++ b/plugins/Db_autobackups/src/main.cpp
@@ -21,7 +21,7 @@ PLUGININFOEX pluginInfoEx = {
 };
 
 CMPlugin::CMPlugin() :
-	PLUGIN<CMPlugin>(MODULE, pluginInfoEx)
+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
 {}
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ static int ModulesLoad(WPARAM, LPARAM)
 	}
 	else {
 		DBVARIANT dbv;
-		if (!db_get_ws(0, MODULE, "Folder", &dbv)) {
+		if (!db_get_ws(0, MODULENAME, "Folder", &dbv)) {
 			wcsncpy_s(options.folder, dbv.ptszVal, _TRUNCATE);
 			db_free(&dbv);
 		}
diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp
index 803193cccd..be3543ea2e 100644
--- a/plugins/Db_autobackups/src/options.cpp
+++ b/plugins/Db_autobackups/src/options.cpp
@@ -1,23 +1,23 @@
 #include "stdafx.h"
 
 Options::Options() :
-	backup_types(MODULE, "BackupType", BT_PERIODIC),
-	period(MODULE, "Period", 1),
-	period_type(MODULE, "PeriodType", PT_DAYS),
-	num_backups(MODULE, "NumBackups", 3),
-	disable_progress(MODULE, "NoProgress", 0),
-	disable_popups(MODULE, "NoPopups", 0),
-	use_zip(MODULE, "UseZip", 0),
-	backup_profile(MODULE, "BackupProfile", 0),
-	use_cloudfile(MODULE, "UseCloudFile", 0),
-	cloudfile_service(MODULE, "CloudFileService", nullptr)
+	backup_types(MODULENAME, "BackupType", BT_PERIODIC),
+	period(MODULENAME, "Period", 1),
+	period_type(MODULENAME, "PeriodType", PT_DAYS),
+	num_backups(MODULENAME, "NumBackups", 3),
+	disable_progress(MODULENAME, "NoProgress", 0),
+	disable_popups(MODULENAME, "NoPopups", 0),
+	use_zip(MODULENAME, "UseZip", 0),
+	backup_profile(MODULENAME, "BackupProfile", 0),
+	use_cloudfile(MODULENAME, "UseCloudFile", 0),
+	cloudfile_service(MODULENAME, "CloudFileService", nullptr)
 {
 }
 
 Options options;
 
 COptionsDlg::COptionsDlg()
-	: CPluginDlgBase(g_plugin, IDD_OPTIONS, MODULE),
+	: CDlgBase(g_plugin, IDD_OPTIONS),
 	m_disable(this, IDC_RAD_DISABLED), m_backupOnStart(this, IDC_RAD_START),
 	m_backupOnExit(this, IDC_RAD_EXIT), m_backupPeriodic(this, IDC_RAD_PERIODIC),
 	m_backup(this, IDC_BUT_NOW), m_backupProfile(this, IDC_BACKUPPROFILE),
@@ -133,7 +133,7 @@ void COptionsDlg::OnApply()
 			MessageBox(nullptr, msg, TranslateT("Error creating backup folder"), MB_OK | MB_ICONERROR);
 			return;
 		}
-		db_set_ws(0, MODULE, "Folder", folder);
+		db_set_ws(0, MODULENAME, "Folder", folder);
 	}
 
 	int currentService = m_cloudFileService.GetCurSel();
diff --git a/plugins/Db_autobackups/src/options.h b/plugins/Db_autobackups/src/options.h
index 9700053e73..6182acf91d 100644
--- a/plugins/Db_autobackups/src/options.h
+++ b/plugins/Db_autobackups/src/options.h
@@ -56,7 +56,7 @@ struct Options
 	Options();
 };
 
-class COptionsDlg : public CPluginDlgBase
+class COptionsDlg : public CDlgBase
 {
 	CCtrlCheck m_disable;
 	CCtrlCheck m_backupOnStart;
@@ -102,4 +102,4 @@ protected:
 
 public:
 	COptionsDlg();
-};
\ No newline at end of file
+};
diff --git a/plugins/Db_autobackups/src/stdafx.h b/plugins/Db_autobackups/src/stdafx.h
index b0229f1e35..0698f1fd47 100644
--- a/plugins/Db_autobackups/src/stdafx.h
+++ b/plugins/Db_autobackups/src/stdafx.h
@@ -25,7 +25,7 @@ namespace fs = std::experimental::filesystem;
 #include <m_folders.h>
 #include <m_cloudfile.h>
 
-#define MODULE "AutoBackups"
+#define MODULENAME "AutoBackups"
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-- 
cgit v1.2.3