code improvement: replace #defines with constexpr
Issue: #80846
Change-Id: Ifd23ac301c95867a5efc5643f683ee01d17eeaec
diff --git a/src/contactsview.cpp b/src/contactsview.cpp
index c0cfede..8c27509 100644
--- a/src/contactsview.cpp
+++ b/src/contactsview.cpp
@@ -44,7 +44,7 @@
#include "utils/models.h"
#include <QtCore/QItemSelectionModel>
-#define COPY_DATA_KEY "copy_data"
+static constexpr const char* COPY_DATA_KEY = "copy_data";
struct _ContactsView
{
diff --git a/src/frequentcontactsview.cpp b/src/frequentcontactsview.cpp
index 6e9aa44..54ff847 100644
--- a/src/frequentcontactsview.cpp
+++ b/src/frequentcontactsview.cpp
@@ -44,7 +44,7 @@
#include <call.h>
#include "utils/menus.h"
-#define COPY_DATA_KEY "copy_data"
+static constexpr const char* COPY_DATA_KEY = "copy_data";
struct _FrequentContactsView
{
diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp
index 826bd36..5f114fb 100644
--- a/src/ringmainwindow.cpp
+++ b/src/ringmainwindow.cpp
@@ -65,17 +65,17 @@
#include "callsview.h"
#include "utils/accounts.h"
-#define CALL_VIEW_NAME "calls"
-#define CREATE_ACCOUNT_1_VIEW_NAME "create1"
-#define CREATE_ACCOUNT_2_VIEW_NAME "create2"
-#define GENERAL_SETTINGS_VIEW_NAME "general"
-#define AUDIO_SETTINGS_VIEW_NAME "audio"
-#define MEDIA_SETTINGS_VIEW_NAME "media"
-#define ACCOUNT_SETTINGS_VIEW_NAME "accounts"
-#define DEFAULT_VIEW_NAME "placeholder"
-#define VIEW_CONTACTS "contacts"
-#define VIEW_HISTORY "history"
-#define VIEW_PRESENCE "presence"
+static constexpr const char* CALL_VIEW_NAME = "calls";
+static constexpr const char* CREATE_ACCOUNT_1_VIEW_NAME = "create1";
+static constexpr const char* CREATE_ACCOUNT_2_VIEW_NAME = "create2";
+static constexpr const char* GENERAL_SETTINGS_VIEW_NAME = "general";
+static constexpr const char* AUDIO_SETTINGS_VIEW_NAME = "audio";
+static constexpr const char* MEDIA_SETTINGS_VIEW_NAME = "media";
+static constexpr const char* ACCOUNT_SETTINGS_VIEW_NAME = "accounts";
+static constexpr const char* DEFAULT_VIEW_NAME = "placeholder";
+static constexpr const char* VIEW_CONTACTS = "contacts";
+static constexpr const char* VIEW_HISTORY = "history";
+static constexpr const char* VIEW_PRESENCE = "presence";
struct _RingMainWindow
{
diff --git a/src/video/video_widget.cpp b/src/video/video_widget.cpp
index 3d90418..6d4fe60 100644
--- a/src/video/video_widget.cpp
+++ b/src/video/video_widget.cpp
@@ -42,13 +42,13 @@
#include <mutex>
#include "xrectsel.h"
-#define VIDEO_LOCAL_SIZE 150
-#define VIDEO_LOCAL_OPACITY_DEFAULT 255 /* out of 255 */
+static constexpr int VIDEO_LOCAL_SIZE = 150;
+static constexpr int VIDEO_LOCAL_OPACITY_DEFAULT = 255; /* out of 255 */
/* check video frame queues at this rate;
* use 30 ms (about 30 fps) since we don't expect to
* receive video frames faster than that */
-#define FRAME_RATE_PERIOD 30
+static constexpr int FRAME_RATE_PERIOD = 30;
struct _VideoWidgetClass {
GtkBinClass parent_class;