Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move Q_VOID definition to qcorecommon_p header

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-11-02 00:45:55 +02:00
parent bca66eb32c
commit 763d398445
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/io/qiodevice.cpp
View file

@ -64,8 +64,6 @@ inline void debugBinaryString(const char *data, qint64 maxlen)
} }
#endif #endif
#define Q_VOID
#define CHECK_MAXLEN(function, returnType) \ #define CHECK_MAXLEN(function, returnType) \
do { \ do { \
if (Q_UNLIKELY(maxSize < 0)) { \ if (Q_UNLIKELY(maxSize < 0)) { \

1
src/core/io/qtextstream.cpp
View file

@ -216,7 +216,6 @@
#endif #endif
// A precondition macro // A precondition macro
#define Q_VOID
#define CHECK_VALID_STREAM(x) do { \ #define CHECK_VALID_STREAM(x) do { \
if (!d->string && !d->device) { \ if (!d->string && !d->device) { \
qWarning("QTextStream: No device"); \ qWarning("QTextStream: No device"); \

2
src/core/qcorecommon_p.h
View file

@ -9,6 +9,8 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#define Q_VOID
#define QBYTEARRAY_MAX INT_MAX #define QBYTEARRAY_MAX INT_MAX
// enough space to hold BOM, each char as surrogate pair and terminator // enough space to hold BOM, each char as surrogate pair and terminator

3
src/network/socket/qnativesocketengine.cpp
View file

@ -83,6 +83,7 @@
#include "qnativesocketengine_p.h" #include "qnativesocketengine_p.h"
#include "qthread_p.h" #include "qthread_p.h"
#include "qobject_p.h" #include "qobject_p.h"
#include "qcorecommon_p.h"
#if !defined(QT_NO_NETWORKPROXY) #if !defined(QT_NO_NETWORKPROXY)
# include "qnetworkproxy.h" # include "qnetworkproxy.h"
@ -94,8 +95,6 @@ QT_BEGIN_NAMESPACE
//#define QNATIVESOCKETENGINE_DEBUG //#define QNATIVESOCKETENGINE_DEBUG
#define Q_VOID
// Common checks // Common checks
#define Q_CHECK_VALID_SOCKETLAYER(function, returnValue) do { \ #define Q_CHECK_VALID_SOCKETLAYER(function, returnValue) do { \
if (!isValid()) { \ if (!isValid()) { \