diff --git a/src/Lib/Ass/Line.cc b/src/Lib/Ass/Line.cc index 3e518632f5d03df7b4aeff6e1639f8fa1fe57408..6ea03059b95c57c2ba512f181909ffc2359cb3ff 100644 --- a/src/Lib/Ass/Line.cc +++ b/src/Lib/Ass/Line.cc @@ -65,16 +65,16 @@ Line::Line(AssFactory *const factory, const QString &lineString) // Pop all but the text, it may contains `,` characters for (int i = 0; i < LineIndex::Text; ++i) contentList.removeFirst(); - ___contentAsText = contentList.join(""); - initSylFromString(___contentAsText); + contentAsText = contentList.join(""); + initSylFromString(contentAsText); } void Line::sylsChanged() noexcept { - ___contentAsText = ""; + contentAsText = ""; for (const auto &syl : content) - ___contentAsText.append(syl->getAssText()); + contentAsText.append(syl->getAssText()); } void @@ -174,7 +174,7 @@ Line::getEnd() const noexcept QString Line::getContentAsText() const noexcept { - return ___contentAsText; + return contentAsText; } QString @@ -187,5 +187,5 @@ Line::getLineAsText() const noexcept styleProperties.name + QString::asprintf(",%s,%d,%d,%d,%s,", "", styleProperties.marginL, styleProperties.marginR, styleProperties.marginV, "karaoke") + - ___contentAsText; + contentAsText; } diff --git a/src/Lib/Ass/Line.hh b/src/Lib/Ass/Line.hh index 5c8e176db99462b99c2a1cbab235537501c2ff56..1a7bce03e181f03342f493d082b0abbbd7487b4f 100644 --- a/src/Lib/Ass/Line.hh +++ b/src/Lib/Ass/Line.hh @@ -25,7 +25,7 @@ class Line final { QString nameOrActor{}; StyleWeakPtr lineStyle; - QString ___contentAsText; + QString contentAsText; AssFactory *const assFactory; diff --git a/src/Lib/Log.hh b/src/Lib/Log.hh index f81054e98b1d60c3038e7f29e49397d295394eb4..fc4b9b7a29a8dd12196b157d2e3b4f622529ea76 100644 --- a/src/Lib/Log.hh +++ b/src/Lib/Log.hh @@ -70,13 +70,13 @@ struct LogLevel final { Warning, Error, Critical, // Will trigger qFatal - ___MaxAndUnused + _vv_MaxAndUnused }; static const std::string_view toStdStringView(const LogLevel::Level) noexcept; private: - using Array = std::array<const std::string_view, ___MaxAndUnused>; + using Array = std::array<const std::string_view, _vv_MaxAndUnused>; // WARN: The order matters! static inline constexpr Array LevelsStringViews = { "None", "Debug", "Info", diff --git a/src/Lib/Utils.hh b/src/Lib/Utils.hh index 1aa2d5e45b914bb2228cf1f8e622a50bcbe5d87c..3783621edd799b3564d24b2da8f26f2ea74747ac 100644 --- a/src/Lib/Utils.hh +++ b/src/Lib/Utils.hh @@ -106,7 +106,7 @@ concept StringType = requires(T str) enum class ThemeType { QtCreator, System, QssFile }; // Prefered collor for a given type -enum class VivyThemeType { Dark, Light, ___COUNT }; +enum class VivyThemeType { Dark, Light, _vv_COUNT }; } namespace Vivy::Utils