From 43acb9c9b1cb239ea2e4e956bf734e8f29b018f4 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov
Date: Sat, 30 Apr 2016 18:16:23 +0100
Subject: Update my clang-format to 3.8.0

Don't sort includes
---
 src/modules/objects/qtftp/qftp.cpp   | 3 +--
 src/modules/objects/qtftp/qftp.h     | 6 +++---
 src/modules/objects/qthttp/qhttp.cpp | 3 +--
 src/modules/objects/qthttp/qhttp.h   | 3 ++-
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/modules/objects')

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);
 
-- 
cgit v1.3.1-10-gc9f91