Skip to content

Commit 2590931

Browse files
fix(log): dont use std::pair
partial revert e0bb9e5
1 parent a2d52cf commit 2590931

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

makespec/BUILDVERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
136
1+
137

src/base/LemonBaseApplication.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ auto LemonBaseApplication::Initialize() -> bool {
2222
bool canContinue;
2323
const auto hasError = parseCommandLine(&canContinue, &errorMessage);
2424
if (hasError) {
25-
// LOG("Command line: " + A(errorMessage));
25+
LOG("Command line: " A(errorMessage));
2626
if (! canContinue) {
2727
LOG("Fatal Error, LemonLime cannot continue.");
2828
return false;
@@ -88,13 +88,11 @@ auto LemonBaseApplication::parseCommandLine(bool *canContinue, QString *errorMes
8888
return true;
8989
}
9090

91-
/*
91+
9292
#define ProcessExtraStartupOptions(option) \
93-
DEBUG("Startup Options:" + A(parser.isSet(option##Option))); \
93+
DEBUG("Startup Options:" A(parser.isSet(option##Option))); \
9494
StartupArguments.option = parser.isSet(option##Option);
9595

9696
ProcessExtraStartupOptions(debugLog);
97-
*/
98-
StartupArguments.debugLog = parser.isSet(debugLogOption);
9997
return true;
10098
}

src/base/LemonLog.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ namespace Lemon::base {
7070
} // namespace Lemon::base
7171

7272
template <typename TKey, typename TVal>
73-
QTextStream &operator<<(QTextStream &stream, const std::pair<TKey, TVal> &pair) {
73+
QTextStream &operator<<(QTextStream &stream, const QPair<TKey, TVal> &pair) {
7474
return stream << pair.first << ": " << pair.second;
7575
}
7676

@@ -80,7 +80,7 @@ template <typename TKey, typename TVal>
8080
QTextStream &operator<<(QTextStream &stream, const QMap<TKey, TVal> &map) {
8181
stream << "{ ";
8282
for (const auto &[k, v] : map.toStdMap())
83-
stream << std::pair(k, v) << "; ";
83+
stream << QPair(k, v) << "; ";
8484
stream << "}";
8585
return stream;
8686
}

0 commit comments

Comments
 (0)