db_get_sa / db_get_wsa to receive the default value, massive code simplification

3 files changed, 4 insertions, 10 deletions

diff --git a/plugins/Popup/src/common.h b/plugins/Popup/src/common.h
index b078a6a1f8..fbcfc88af7 100644
--- a/plugins/Popup/src/common.h
+++ b/plugins/Popup/src/common.h
@@ -51,12 +51,6 @@ inline int Byte2Percentile(int vByte) { return (vByte * 100) / 255; }
 inline int Percentile2Byte(int vPerc) { return (vPerc * 255) / 100; }

 

 //===== Strings & MirandaDB ==================

-inline char *db_get_s(MCONTACT hContact, const char *ModuleName, const char *SettingName, const char *Default)

-{

-	char *result = db_get_sa(hContact, ModuleName, SettingName);

-	return result ? result : mir_strdup(Default);

-}

-

 inline INT_PTR DBGetContactSettingStringX(MCONTACT hContact, const char *ModuleName, const char *SettingName, const char *Default, const int retType)

 {

 	INT_PTR ret = NULL;

diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp
index 8dbee80a98..48dc3c4f5c 100644
--- a/plugins/Popup/src/notifications.cpp
+++ b/plugins/Popup/src/notifications.cpp
@@ -156,12 +156,12 @@ void LoadNotificationSettings(POPUPTREEDATA *ptd, char* szModul)
 			db_get_b(0, szModul, setting, 0);

 

 		mir_snprintf(setting, "{%s/%s}leftAction", ptd->notification.lpzGroup, ptd->notification.lpzName);

-		char *szTmp = db_get_s(0, szModul, setting, ptd->notification.lpzLAction);

+		char *szTmp = db_get_sa(0, szModul, setting, ptd->notification.lpzLAction);

 		mir_strncpy(ptd->leftAction, szTmp, sizeof(ptd->leftAction));

 		mir_free(szTmp); szTmp = nullptr;

 

 		mir_snprintf(setting, "{%s/%s}rightAction", ptd->notification.lpzGroup, ptd->notification.lpzName);

-		szTmp = db_get_s(0, szModul, setting, ptd->notification.lpzRAction);

+		szTmp = db_get_sa(0, szModul, setting, ptd->notification.lpzRAction);

 		mir_strncpy(ptd->rightAction, szTmp, sizeof(ptd->rightAction));

 		mir_free(szTmp); szTmp = nullptr;

 	}

diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp
index 4b38d22a18..0d9bd89dec 100644
--- a/plugins/Popup/src/opt_class.cpp
+++ b/plugins/Popup/src/opt_class.cpp
@@ -495,12 +495,12 @@ void LoadClassSettings(POPUPTREEDATA *ptd, char* szModul)
 		ptd->pupClass.iSeconds ? ptd->pupClass.iSeconds : PopupOptions.Seconds);

 

 	mir_snprintf(setting, "%s/leftAction", ptd->pupClass.pszName);

-	char *szTmp = db_get_s(0, szModul, setting, POPUP_ACTION_NOTHING);	// standart ??

+	char *szTmp = db_get_sa(0, szModul, setting, POPUP_ACTION_NOTHING);	// standart ??

 	mir_strncpy(ptd->leftAction, szTmp, _countof(ptd->leftAction));

 	mir_free(szTmp);

 

 	mir_snprintf(setting, "%s/rightAction", ptd->pupClass.pszName);

-	szTmp = db_get_s(0, szModul, setting, POPUP_ACTION_DISMISS);	// standart ??

+	szTmp = db_get_sa(0, szModul, setting, POPUP_ACTION_DISMISS);	// standart ??

 	mir_strncpy(ptd->rightAction, szTmp, _countof(ptd->rightAction));

 	mir_free(szTmp);

 }