aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.clang-format2
-rw-r--r--src/kvilib/ext/KviRuntimeInfo.cpp3
-rw-r--r--src/kvilib/net/KviNetUtils.cpp3
-rw-r--r--src/kvirc/kernel/KviIrcConnection.cpp3
-rw-r--r--src/kvirc/kvs/KviKvsVariant.h6
-rw-r--r--src/modules/dcc/DccFileTransfer.cpp3
-rw-r--r--src/modules/objects/qtftp/qftp.cpp3
-rw-r--r--src/modules/objects/qtftp/qftp.h6
-rw-r--r--src/modules/objects/qthttp/qhttp.cpp3
-rw-r--r--src/modules/objects/qthttp/qhttp.h3
-rw-r--r--src/modules/perlcore/ppport.h8
-rw-r--r--src/modules/upnp/Service.cpp3
12 files changed, 21 insertions, 25 deletions
diff --git a/.clang-format b/.clang-format
index 9f8463ad0..3729c36e2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -14,4 +14,6 @@ BreakConstructorInitializersBeforeComma: false
AlignTrailingComments: true
DerivePointerAlignment: false
PointerAlignment: Middle
+
+SortIncludes: false
...
diff --git a/src/kvilib/ext/KviRuntimeInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp
index 2cfa1eb74..41838c04e 100644
--- a/src/kvilib/ext/KviRuntimeInfo.cpp
+++ b/src/kvilib/ext/KviRuntimeInfo.cpp
@@ -38,8 +38,7 @@
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
#include <winsock2.h>
-typedef enum _QueryInfo
-{
+typedef enum _QueryInfo {
Os_Release,
Os_Version,
Os_Type
diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp
index b5ee05ad9..a94555692 100644
--- a/src/kvilib/net/KviNetUtils.cpp
+++ b/src/kvilib/net/KviNetUtils.cpp
@@ -664,8 +664,7 @@ namespace KviNetUtils
}
#ifdef COMPILE_GET_INTERFACE_ADDRESS
- union sockaddr_union
- {
+ union sockaddr_union {
struct sockaddr sa;
struct sockaddr_in sin;
};
diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index e7a591d68..f4dde8d74 100644
--- a/src/kvirc/kernel/KviIrcConnection.cpp
+++ b/src/kvirc/kernel/KviIrcConnection.cpp
@@ -441,8 +441,7 @@ void KviIrcConnection::handleInitialCapLs()
QString szRequests;
- auto cap_add = [&](const char * c)
- {
+ auto cap_add = [&](const char * c) {
if(serverInfo()->supportedCaps().contains(c, Qt::CaseInsensitive))
{
szRequests.append(c);
diff --git a/src/kvirc/kvs/KviKvsVariant.h b/src/kvirc/kvs/KviKvsVariant.h
index fe6ad4956..decfe90f5 100644
--- a/src/kvirc/kvs/KviKvsVariant.h
+++ b/src/kvirc/kvs/KviKvsVariant.h
@@ -66,8 +66,7 @@ protected:
* \union DataType
* \brief This union holds an integer or a double floating point number
*/
- union DataType
- {
+ union DataType {
kvs_int_t iInt;
kvs_real_t dReal;
};
@@ -136,8 +135,7 @@ public:
* \union DataType
* \brief Holds the value of the variant data
*/
- union DataType
- {
+ union DataType {
kvs_int_t iInt;
kvs_real_t * pReal;
QString * pString;
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index e1dca6012..ab5692539 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -672,8 +672,7 @@ void DccSendThread::updateStats()
m_pMutex->unlock();
}
-union _ack_buffer
-{
+union _ack_buffer {
char cAckBuffer[4];
quint32 i32AckBuffer;
};
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 626aaae70..2f048985e 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -78,8 +78,7 @@ public:
// If is_ba is true, ba is used; ba is never 0.
// Otherwise dev is used; dev can be 0 or not.
- union
- {
+ union {
QByteArray * ba;
QIODevice * dev;
} data;
diff --git a/src/modules/objects/qtftp/qftp.h b/src/modules/objects/qtftp/qftp.h
index 68c14e46d..f9b6ff1df 100644
--- a/src/modules/objects/qtftp/qftp.h
+++ b/src/modules/objects/qtftp/qftp.h
@@ -143,7 +143,8 @@ public:
public Q_SLOTS:
void abort();
- Q_SIGNALS : void stateChanged(int);
+Q_SIGNALS:
+ void stateChanged(int);
void listInfo(const QUrlInfo &);
void readyRead();
void dataTransferProgress(qint64, qint64);
@@ -239,8 +240,7 @@ private:
// If is_ba is true, ba is used; ba is never 0.
// Otherwise dev is used; dev can be 0 or not.
- union
- {
+ union {
QByteArray * ba;
QIODevice * dev;
} data;
diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp
index 8dd437451..f6de5e6a5 100644
--- a/src/modules/objects/qthttp/qhttp.cpp
+++ b/src/modules/objects/qthttp/qhttp.cpp
@@ -234,8 +234,7 @@ protected:
QHttpRequestHeader header;
private:
- union
- {
+ union {
QByteArray * ba;
QIODevice * dev;
} data;
diff --git a/src/modules/objects/qthttp/qhttp.h b/src/modules/objects/qthttp/qhttp.h
index f40361656..3e622e943 100644
--- a/src/modules/objects/qthttp/qhttp.h
+++ b/src/modules/objects/qthttp/qhttp.h
@@ -252,7 +252,8 @@ public Q_SLOTS:
void ignoreSslErrors();
#endif
- Q_SIGNALS : void stateChanged(int);
+Q_SIGNALS:
+ void stateChanged(int);
void responseHeaderReceived(const QHttpResponseHeader & resp);
void readyRead(const QHttpResponseHeader & resp);
diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h
index 187afa347..69310ffab 100644
--- a/src/modules/perlcore/ppport.h
+++ b/src/modules/perlcore/ppport.h
@@ -503,7 +503,7 @@ __DATA__*/
#endif
#endif
#ifndef PoisonWith
-#define PoisonWith(d, n, t, b) (void) memset((char *)(d), (U8)(b), (n) * sizeof(t))
+#define PoisonWith(d, n, t, b) (void)memset((char *)(d), (U8)(b), (n) * sizeof(t))
#endif
#ifndef PoisonNew
#define PoisonNew(d, n, t) PoisonWith(d, n, t, 0xAB)
@@ -631,7 +631,7 @@ typedef NVTYPE NV;
#else
#if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
#define STMT_START if(1)
-#define STMT_END else(void)0
+#define STMT_END else(void) 0
#else
#define STMT_START do
#define STMT_END while(0)
@@ -1018,8 +1018,8 @@ extern yy_parser DPPP_(dummy_PL_parser);
(flags) & ~G_METHOD) \
: perl_call_sv(sv, flags))
#else
-#define call_sv(sv, flags) ((flags)&G_METHOD ? Perl_call_method(aTHX_(char *)SvPV_nolen_const(sv), \
- (flags) & ~G_METHOD) \
+#define call_sv(sv, flags) ((flags)&G_METHOD ? Perl_call_method(aTHX_(char *) SvPV_nolen_const(sv), \
+ (flags) & ~G_METHOD) \
: Perl_call_sv(aTHX_ sv, flags))
#endif
#endif
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index e0547bfc2..2b0d87d4e 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -233,7 +233,8 @@ namespace UPnP
QByteArray response = reply->readAll();
QDomDocument xml;
- qDebug() << "Response:\n" << response << "\n---\n";
+ qDebug() << "Response:\n"
+ << response << "\n---\n";
// Parse the XML
QString errorMessage;