diff options
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/proparser/proitems.cpp | 5 | ||||
-rw-r--r-- | src/shared/qtsingleapplication/qtsingleapplication.cpp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/proparser/proitems.cpp b/src/shared/proparser/proitems.cpp index 4a5108f9253..57b894396f6 100644 --- a/src/shared/proparser/proitems.cpp +++ b/src/shared/proparser/proitems.cpp @@ -223,14 +223,9 @@ ProString &ProString::append(const ProStringList &other, bool *pending, bool ski if (!m_length && sz == startIdx + 1) { *this = other.at(startIdx); } else { - int totalLength = sz - startIdx; - for (int i = startIdx; i < sz; ++i) - totalLength += other.at(i).size(); bool putSpace = false; if (pending && !*pending && m_length) putSpace = true; - else - totalLength--; m_string = toQString(); m_offset = 0; diff --git a/src/shared/qtsingleapplication/qtsingleapplication.cpp b/src/shared/qtsingleapplication/qtsingleapplication.cpp index c38d568004c..ce91306c75f 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.cpp +++ b/src/shared/qtsingleapplication/qtsingleapplication.cpp @@ -182,13 +182,17 @@ public: void setFreezeTreshold(std::chrono::milliseconds freezeAbove) { m_threshold = freezeAbove; } bool notify(QObject *receiver, QEvent *event) override { + if (m_inNotify) + return QtSingleApplication::notify(receiver, event); using namespace std::chrono; const auto start = system_clock::now(); const QPointer<QObject> p(receiver); const QString className = QLatin1String(receiver->metaObject()->className()); const QString name = receiver->objectName(); + m_inNotify = true; const bool ret = QtSingleApplication::notify(receiver, event); + m_inNotify = false; const auto end = system_clock::now(); const auto freeze = duration_cast<milliseconds>(end - start); @@ -207,6 +211,7 @@ public: } private: + bool m_inNotify = false; const QString m_align; std::chrono::milliseconds m_threshold = std::chrono::milliseconds(100); }; |