Browse Source

UI: Replace use of macros for macOS updater with character constants

Also updates unqualified call to `std::move` per modern clang standards
PatTheMav 2 years ago
parent
commit
2978f20b06
2 changed files with 5 additions and 9 deletions
  1. 3 7
      UI/update/mac-update.cpp
  2. 2 2
      UI/update/shared-update.cpp

+ 3 - 7
UI/update/mac-update.cpp

@@ -10,13 +10,9 @@
 
 /* ------------------------------------------------------------------------ */
 
-#ifndef MAC_BRANCHES_URL
-#define MAC_BRANCHES_URL "https://obsproject.com/update_studio/branches.json"
-#endif
-
-#ifndef MAC_DEFAULT_BRANCH
-#define MAC_DEFAULT_BRANCH "stable"
-#endif
+static const char *MAC_BRANCHES_URL =
+	"https://obsproject.com/update_studio/branches.json";
+static const char *MAC_DEFAULT_BRANCH = "stable";
 
 /* ------------------------------------------------------------------------ */
 

+ 2 - 2
UI/update/shared-update.cpp

@@ -232,7 +232,7 @@ bool FetchAndVerifyFile(const char *name, const char *file, const char *url,
 						    BLAKE2_HASH_LENGTH);
 
 		QString header = "If-None-Match: " + hash.toHex();
-		headers.push_back(move(header.toStdString()));
+		headers.push_back(std::move(header.toStdString()));
 	}
 
 	/* ----------------------------------- *
@@ -242,7 +242,7 @@ bool FetchAndVerifyFile(const char *name, const char *file, const char *url,
 
 	if (!guid.empty()) {
 		std::string header = "X-OBS2-GUID: " + guid;
-		headers.push_back(move(header));
+		headers.push_back(std::move(header));
 	}
 
 	/* ----------------------------------- *