From 4bce57b1495aec153041da0cb5bd5be8f518aea8 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Sun, 20 Jan 2019 18:20:21 -0700
Subject: [PATCH] Move progress bar style into constexpr strings

---
 src/yuzu/loading_screen.cpp | 78 +++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp
index 530f5173c..608ab6f02 100644
--- a/src/yuzu/loading_screen.cpp
+++ b/src/yuzu/loading_screen.cpp
@@ -28,6 +28,43 @@
 #include <QMovie>
 #endif
 
+constexpr const char* PROGRESSBAR_STYLE_PREPARE = R"(
+QProgressBar {}
+QProgressBar::chunk {})";
+
+constexpr const char* PROGRESSBAR_STYLE_RAW = R"(
+QProgressBar {
+  background-color: black;
+  border: 2px solid white;
+  border-radius: 4px;
+  padding: 2px;
+}
+QProgressBar::chunk {
+  background-color: #0ab9e6;
+})";
+
+constexpr const char* PROGRESSBAR_STYLE_BINARY = R"(
+QProgressBar {
+  background-color: black;
+  border: 2px solid white;
+  border-radius: 4px;
+  padding: 2px;
+}
+QProgressBar::chunk {
+ background-color: #ff3c28;
+})";
+
+constexpr const char* PROGRESSBAR_STYLE_COMPLETE = R"(
+QProgressBar {
+  background-color: black;
+  border: 2px solid white;
+  border-radius: 4px;
+  padding: 2px;
+}
+QProgressBar::chunk {
+  background-color: #ff3c28;
+})";
+
 LoadingScreen::LoadingScreen(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::LoadingScreen>()),
       previous_stage(VideoCore::LoadCallbackStage::Complete) {
@@ -44,43 +81,10 @@ LoadingScreen::LoadingScreen(QWidget* parent)
         {VideoCore::LoadCallbackStage::Complete, tr("Launching...")},
     };
     progressbar_style = {
-        {VideoCore::LoadCallbackStage::Prepare,
-         R"(
-QProgressBar {}
-QProgressBar::chunk {})"},
-        {VideoCore::LoadCallbackStage::Raw,
-         R"(
-QProgressBar {
-  background-color: black;
-  border: 2px solid white;
-  border-radius: 4px;
-  padding: 2px;
-}
-QProgressBar::chunk {
-  background-color: #0ab9e6;
-})"},
-        {VideoCore::LoadCallbackStage::Binary,
-         R"(
-QProgressBar {
-  background-color: black;
-  border: 2px solid white;
-  border-radius: 4px;
-  padding: 2px;
-}
-QProgressBar::chunk {
- background-color: #ff3c28;
-})"},
-        {VideoCore::LoadCallbackStage::Complete,
-         R"(
-QProgressBar {
-  background-color: black;
-  border: 2px solid white;
-  border-radius: 4px;
-  padding: 2px;
-}
-QProgressBar::chunk {
-  background-color: #ff3c28;
-})"},
+        {VideoCore::LoadCallbackStage::Prepare, PROGRESSBAR_STYLE_PREPARE},
+        {VideoCore::LoadCallbackStage::Raw, PROGRESSBAR_STYLE_RAW},
+        {VideoCore::LoadCallbackStage::Binary, PROGRESSBAR_STYLE_BINARY},
+        {VideoCore::LoadCallbackStage::Complete, PROGRESSBAR_STYLE_COMPLETE},
     };
 }