StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2080 from zetok/compile

Browse Source 
Fix compiling qTox against static Qt 5.5
This commit is contained in:
agilob 2015-08-20 21:51:39 +01:00
commit 4b9d358afc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/persistence/settingsserializer.cpp
View File

@ -31,17 +31,17 @@ using namespace std;
const char SettingsSerializer::magic[] = {0x51,0x54,0x4F,0x58}; const char SettingsSerializer::magic[] = {0x51,0x54,0x4F,0x58};
QDataStream& operator<<(QDataStream& dataStream, const SettingsSerializer::RecordTag& tag) inline QDataStream& operator<<(QDataStream& dataStream, const SettingsSerializer::RecordTag& tag)
{ {
return dataStream << static_cast<uint8_t>(tag); return dataStream << static_cast<uint8_t>(tag);
} }
QDataStream& operator<<(QDataStream& dataStream, const QString& str) inline QDataStream& operator<<(QDataStream& dataStream, const QString& str)
{ {
return dataStream << str.toUtf8(); return dataStream << str.toUtf8();
} }
QDataStream& operator<<(QDataStream& dataStream, const QByteArray& data) inline QDataStream& operator<<(QDataStream& dataStream, const QByteArray& data)
{ {
QByteArray size = vuintToData(data.size()); QByteArray size = vuintToData(data.size());
dataStream.writeRawData(size.data(), size.size()); dataStream.writeRawData(size.data(), size.size());
@ -54,7 +54,7 @@ QDataStream& operator>>(QDataStream& dataStream, SettingsSerializer::RecordTag&
return dataStream.operator >>((uint8_t&)tag); return dataStream.operator >>((uint8_t&)tag);
} }
QDataStream& operator>>(QDataStream& dataStream, QByteArray& data) inline QDataStream& operator>>(QDataStream& dataStream, QByteArray& data)
{ {
unsigned char num3; unsigned char num3;
size_t num = 0; size_t num = 0;