# # # patch "NEWS" # from [9caf1a89fde91b5d1de941c74002ac5174361821] # to [0d188e1b6def5e935ddbe770078adc6552bfe3dc] # # patch "src/util/Platform.cpp" # from [79fed0e2454d48a2f146674c022abc558365862f] # to [8e0712a7006fa7c8f5c5018df724210709e8e821] # # patch "src/util/StdioParser.h" # from [0621c85fc2f5c7193bde542d02d209794b750e84] # to [41274ff52e46c7d06008cee53f4cc6b9b09205e2] # ============================================================ --- NEWS 9caf1a89fde91b5d1de941c74002ac5174361821 +++ NEWS 0d188e1b6def5e935ddbe770078adc6552bfe3dc @@ -1,5 +1,7 @@ xxxx-xx-xx (1.0rc3) xxxx-xx-xx (1.0rc3) - new: drag'n'drop support in the workspace view to easily rename items + - improved: compatibility with MS Visual Studio 2008 (closes FS#48, + thanks to Phil Hannent) - internal: bind guitone's internal settings system late to the needed QSettings backend; improve the creation of Mac OS X distributable binaries and images ============================================================ --- src/util/Platform.cpp 79fed0e2454d48a2f146674c022abc558365862f +++ src/util/Platform.cpp 8e0712a7006fa7c8f5c5018df724210709e8e821 @@ -30,6 +30,12 @@ #include #endif +// needed for MS Visual Studio +#ifdef _MSC_VER +#pragma comment(lib, "shell32.lib") +#pragma comment(lib, "Advapi32.lib") +#endif + #ifdef Q_WS_X11 #include using namespace std; ============================================================ --- src/util/StdioParser.h 0621c85fc2f5c7193bde542d02d209794b750e84 +++ src/util/StdioParser.h 41274ff52e46c7d06008cee53f4cc6b9b09205e2 @@ -36,11 +36,11 @@ public: inline TickerMap getTickers() const { return tickers; } inline QList getOutOfBandMessages() const { return oobMessages; } - static const int STDIO_VERSION = 2; - static QList > parseAndCheckHeaders(const QByteArray &); private: + static const int STDIO_VERSION = 2; + int getNumber(); void parseTicks(const QByteArray &);