diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-03-25 19:18:08 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-03-25 19:42:27 +0200 |
commit | 0f6f34ca2fca81734544b32e8dbc8ee32122bb65 (patch) | |
tree | 79bb05d19d6d7f3ec4966b2913b7628d3ad8de0f /common/resourceaccess.cpp | |
parent | 7f0f45c544b3a48feec3226faa8bb3018d542d9c (diff) | |
download | sink-0f6f34ca2fca81734544b32e8dbc8ee32122bb65.tar.gz sink-0f6f34ca2fca81734544b32e8dbc8ee32122bb65.zip |
Fixed more warnings and then disabled them
..because there is a boatload more to fix.
Diffstat (limited to 'common/resourceaccess.cpp')
-rw-r--r-- | common/resourceaccess.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp index 20bb632..6863193 100644 --- a/common/resourceaccess.cpp +++ b/common/resourceaccess.cpp | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <QTime> | 48 | #include <QTime> |
49 | #include <QStandardPaths> | 49 | #include <QStandardPaths> |
50 | 50 | ||
51 | static void queuedInvoke(const std::function<void()> &f, QObject *context = 0) | 51 | static void queuedInvoke(const std::function<void()> &f, QObject *context = nullptr) |
52 | { | 52 | { |
53 | auto timer = QSharedPointer<QTimer>::create(); | 53 | auto timer = QSharedPointer<QTimer>::create(); |
54 | timer->setSingleShot(true); | 54 | timer->setSingleShot(true); |
@@ -605,8 +605,8 @@ bool ResourceAccess::processMessageBuffer() | |||
605 | } | 605 | } |
606 | 606 | ||
607 | // const uint messageId = *(int*)(d->partialMessageBuffer.constData()); | 607 | // const uint messageId = *(int*)(d->partialMessageBuffer.constData()); |
608 | const int commandId = *(int *)(d->partialMessageBuffer.constData() + sizeof(uint)); | 608 | const int commandId = *(const int *)(d->partialMessageBuffer.constData() + sizeof(uint)); |
609 | const uint size = *(int *)(d->partialMessageBuffer.constData() + sizeof(int) + sizeof(uint)); | 609 | const uint size = *(const int *)(d->partialMessageBuffer.constData() + sizeof(int) + sizeof(uint)); |
610 | 610 | ||
611 | if (size > (uint)(d->partialMessageBuffer.size() - headerSize)) { | 611 | if (size > (uint)(d->partialMessageBuffer.size() - headerSize)) { |
612 | SinkWarning() << "command too small"; | 612 | SinkWarning() << "command too small"; |
@@ -690,7 +690,7 @@ ResourceAccessFactory::ResourceAccessFactory() | |||
690 | 690 | ||
691 | ResourceAccessFactory &ResourceAccessFactory::instance() | 691 | ResourceAccessFactory &ResourceAccessFactory::instance() |
692 | { | 692 | { |
693 | static ResourceAccessFactory *instance = 0; | 693 | static ResourceAccessFactory *instance = nullptr; |
694 | if (!instance) { | 694 | if (!instance) { |
695 | instance = new ResourceAccessFactory; | 695 | instance = new ResourceAccessFactory; |
696 | } | 696 | } |