RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-25 04:38:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix build of the new TWidgetHelper<> for GCC, finally.

Browse Source 
Also fixed a char-related warning in codegen project.
This commit is contained in:
John Preston 2017-02-13 02:17:06 +03:00
parent 232ed0a7c0
commit 25f90b5159
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/codegen/style/generator.cpp
View File

@ -127,7 +127,7 @@ QString stringToEncodedString(const QString &str) {
} else if (ch == '"' || ch == '\\') {
writingHexEscapedCharacters = false;
result.append('\\').append(ch);
} else if (ch < 32 || ch > 127) {
} else if (ch < 32 || static_cast<uchar>(ch) > 127) {
writingHexEscapedCharacters = true;
result.append("\\x").append(hexFirstChar(ch)).append(hexSecondChar(ch));
} else {

6
Telegram/SourceFiles/ui/twidget.h
View File

@ -220,6 +220,9 @@ private:
return qobject_cast<const TWidget*>(Base::parentWidget());
}
template <typename OtherBase>
friend class TWidgetHelper;
};
class TWidget : public TWidgetHelper<QWidget> {
@ -303,9 +306,6 @@ protected:
return height();
}
template <typename Base>
friend class TWidgetHelper;
};
template <typename Widget>