Browse Source

UI: Remove unused macros

Also removes a translation string that was referred from the removed
macro.
Norihiro Kamae 2 years ago
parent
commit
c2f157470b

+ 0 - 1
UI/data/locale/en-US.ini

@@ -223,7 +223,6 @@ Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Failed to connect to a
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Testing bandwidth for: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="Testing stream encoder, this may take a minute..."
 Basic.AutoConfig.TestPage.TestingRecordingEncoder="Testing recording encoder, this may take a minute..."
-Basic.AutoConfig.TestPage.TestingRes="Testing resolutions, this may take a few minutes..."
 Basic.AutoConfig.TestPage.TestingRes.Fail="Failed to start up encoder"
 Basic.AutoConfig.TestPage.TestingRes.Resolution="Testing %1x%2 %3 FPS..."
 Basic.AutoConfig.TestPage.Result.StreamingEncoder="Streaming Encoder"

+ 0 - 3
UI/importers/classic.cpp

@@ -36,8 +36,6 @@ static bool source_name_exists(const Json::array &sources, const string &name)
 #define translate_int(in_key, in, out_key, out, off) \
 	out[out_key] = in[in_key].int_value() + off;
 #define translate_string(in_key, in, out_key, out) out[out_key] = in[in_key];
-#define translate_double(in_key, in, out_key, out) \
-	translate_string(in_key, in, out_key, out);
 #define translate_bool(in_key, in, out_key, out) \
 	out[out_key] = in[in_key].int_value() == 1;
 
@@ -271,7 +269,6 @@ static Json::object translate_source(const Json &in, const Json &sources)
 
 #undef translate_int
 #undef translate_string
-#undef translate_double
 #undef translate_bool
 
 static void translate_sc(const Json &in, Json &out)

+ 0 - 2
UI/win-update/win-update.cpp

@@ -70,8 +70,6 @@ typedef struct {
 #define BLAKE2_HASH_LENGTH 20
 #define BLAKE2_HASH_STR_LENGTH ((BLAKE2_HASH_LENGTH * 2) + 1)
 
-#define TEST_BUILD
-
 // Hard coded 4096 bit RSA public key for obsproject.com in PEM format
 static const unsigned char obs_pub[] = {
 	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x50,

+ 0 - 1
UI/window-basic-auto-config-test.cpp

@@ -91,7 +91,6 @@ public:
 #define TEST_BW_CONNECTING TEST_STR("TestingBandwidth.Connecting")
 #define TEST_BW_CONNECT_FAIL TEST_STR("TestingBandwidth.ConnectFailed")
 #define TEST_BW_SERVER TEST_STR("TestingBandwidth.Server")
-#define TEST_RES TEST_STR("TestingRes")
 #define TEST_RES_VAL TEST_STR("TestingRes.Resolution")
 #define TEST_RES_FAIL TEST_STR("TestingRes.Fail")
 #define TEST_SE TEST_STR("TestingStreamEncoder")

+ 0 - 2
UI/window-basic-settings-a11y.cpp

@@ -5,8 +5,6 @@
 #include "qt-wrappers.hpp"
 #include <QColorDialog>
 
-#define I18nStr(str) QTStr(str).toStdString().c_str()
-
 enum ColorPreset {
 	COLOR_PRESET_DEFAULT,
 	COLOR_PRESET_COLOR_BLIND_1,

+ 0 - 2
UI/window-basic-settings.cpp

@@ -333,14 +333,12 @@ void OBSBasicSettings::HookWidget(QWidget *widget, const char *signal,
 #define CHECK_CHANGED   SIGNAL(clicked(bool))
 #define SCROLL_CHANGED  SIGNAL(valueChanged(int))
 #define DSCROLL_CHANGED SIGNAL(valueChanged(double))
-#define TOGGLE_CHANGED  SIGNAL(toggled(bool))
 
 #define GENERAL_CHANGED SLOT(GeneralChanged())
 #define STREAM1_CHANGED SLOT(Stream1Changed())
 #define OUTPUTS_CHANGED SLOT(OutputsChanged())
 #define AUDIO_RESTART   SLOT(AudioChangedRestart())
 #define AUDIO_CHANGED   SLOT(AudioChanged())
-#define VIDEO_RESTART   SLOT(VideoChangedRestart())
 #define VIDEO_RES       SLOT(VideoChangedResolution())
 #define VIDEO_CHANGED   SLOT(VideoChanged())
 #define A11Y_CHANGED    SLOT(A11yChanged())