From 0fd79e86e2eb35e85bf11c90cf4072a1e291a501 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Thu, 27 Apr 2017 16:17:36 +0200
Subject: [PATCH] feat(app): sort correctly included headers

---
 linphone-desktop/src/Utils.cpp                   |  2 --
 linphone-desktop/src/app/App.cpp                 | 16 ++++++++--------
 linphone-desktop/src/app/App.hpp                 |  6 +++---
 linphone-desktop/src/app/paths/Paths.cpp         |  2 +-
 .../src/components/camera/Camera.cpp             |  8 ++++----
 .../src/components/camera/CameraPreview.cpp      |  8 ++++----
 .../src/components/chat/ChatProxyModel.hpp       |  4 ++--
 .../components/contacts/ContactsListModel.hpp    |  3 +--
 .../contacts/ContactsListProxyModel.cpp          |  4 ++--
 .../src/components/core/CoreManager.cpp          |  8 ++++----
 .../src/components/core/CoreManager.hpp          |  8 ++++----
 .../src/components/presence/OwnPresenceModel.hpp |  4 ++--
 .../sip-addresses/SipAddressesModel.hpp          |  4 ++--
 13 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/linphone-desktop/src/Utils.cpp b/linphone-desktop/src/Utils.cpp
index 6d807ff1c..24ebe2496 100644
--- a/linphone-desktop/src/Utils.cpp
+++ b/linphone-desktop/src/Utils.cpp
@@ -20,8 +20,6 @@
  *      Author: Ronan Abhamon
  */
 
-#include <QQuickWindow>
-
 #include "Utils.hpp"
 
 // =============================================================================
diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index 168c933f2..1f516be4b 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -20,6 +20,14 @@
  *      Author: Ronan Abhamon
  */
 
+#include <QDir>
+#include <QFileSelector>
+#include <QMenu>
+#include <QQmlFileSelector>
+#include <QSystemTrayIcon>
+#include <QtDebug>
+#include <QTimer>
+
 #include "../components/Components.hpp"
 #include "../Utils.hpp"
 
@@ -30,14 +38,6 @@
 
 #include "App.hpp"
 
-#include <QDir>
-#include <QFileSelector>
-#include <QMenu>
-#include <QQmlFileSelector>
-#include <QSystemTrayIcon>
-#include <QtDebug>
-#include <QTimer>
-
 #define DEFAULT_LOCALE "en"
 
 #define LANGUAGES_PATH ":/languages/"
diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp
index 153a058c7..24b9eeb53 100644
--- a/linphone-desktop/src/app/App.hpp
+++ b/linphone-desktop/src/app/App.hpp
@@ -23,13 +23,13 @@
 #ifndef APP_H_
 #define APP_H_
 
-#include "../components/notifier/Notifier.hpp"
-#include "../externals/single-application/SingleApplication.hpp"
-
 #include <QCommandLineParser>
 #include <QQmlApplicationEngine>
 #include <QQuickWindow>
 
+#include "../components/notifier/Notifier.hpp"
+#include "../externals/single-application/SingleApplication.hpp"
+
 // =============================================================================
 
 class DefaultTranslator;
diff --git a/linphone-desktop/src/app/paths/Paths.cpp b/linphone-desktop/src/app/paths/Paths.cpp
index 4fa372a0f..2ecdb0096 100644
--- a/linphone-desktop/src/app/paths/Paths.cpp
+++ b/linphone-desktop/src/app/paths/Paths.cpp
@@ -27,9 +27,9 @@
 #include <QtDebug>
 
 #include "../../Utils.hpp"
+#include "config.h"
 
 #include "Paths.hpp"
-#include "config.h"
 
 #define PATH_ASSISTANT_CONFIG "/assistant/"
 #define PATH_AVATARS "/avatars/"
diff --git a/linphone-desktop/src/components/camera/Camera.cpp b/linphone-desktop/src/components/camera/Camera.cpp
index ebe1c7917..0a4d50d3d 100644
--- a/linphone-desktop/src/components/camera/Camera.cpp
+++ b/linphone-desktop/src/components/camera/Camera.cpp
@@ -20,15 +20,15 @@
  *      Author: Ronan Abhamon
  */
 
+#include <QQuickWindow>
+#include <QThread>
+#include <QTimer>
+
 #include "../core/CoreManager.hpp"
 #include "MSFunctions.hpp"
 
 #include "Camera.hpp"
 
-#include <QQuickWindow>
-#include <QThread>
-#include <QTimer>
-
 #define MAX_FPS 30
 
 using namespace std;
diff --git a/linphone-desktop/src/components/camera/CameraPreview.cpp b/linphone-desktop/src/components/camera/CameraPreview.cpp
index 36d8faaa1..74eae6efd 100644
--- a/linphone-desktop/src/components/camera/CameraPreview.cpp
+++ b/linphone-desktop/src/components/camera/CameraPreview.cpp
@@ -20,15 +20,15 @@
  *      Author: Ronan Abhamon
  */
 
+#include <QQuickWindow>
+#include <QThread>
+#include <QTimer>
+
 #include "../core/CoreManager.hpp"
 #include "MSFunctions.hpp"
 
 #include "CameraPreview.hpp"
 
-#include <QQuickWindow>
-#include <QThread>
-#include <QTimer>
-
 #define MAX_FPS 30
 
 using namespace std;
diff --git a/linphone-desktop/src/components/chat/ChatProxyModel.hpp b/linphone-desktop/src/components/chat/ChatProxyModel.hpp
index 7a8ba6f4a..a4e0cf3be 100644
--- a/linphone-desktop/src/components/chat/ChatProxyModel.hpp
+++ b/linphone-desktop/src/components/chat/ChatProxyModel.hpp
@@ -23,10 +23,10 @@
 #ifndef CHAT_PROXY_MODEL_H_
 #define CHAT_PROXY_MODEL_H_
 
-#include "ChatModel.hpp"
-
 #include <QSortFilterProxyModel>
 
+#include "ChatModel.hpp"
+
 // =============================================================================
 
 class ChatProxyModel : public QSortFilterProxyModel {
diff --git a/linphone-desktop/src/components/contacts/ContactsListModel.hpp b/linphone-desktop/src/components/contacts/ContactsListModel.hpp
index 783d4ce03..3d502fd7f 100644
--- a/linphone-desktop/src/components/contacts/ContactsListModel.hpp
+++ b/linphone-desktop/src/components/contacts/ContactsListModel.hpp
@@ -24,11 +24,10 @@
 #define CONTACTS_LIST_MODEL_H_
 
 #include <linphone++/linphone.hh>
+#include <QAbstractListModel>
 
 #include "../contact/ContactModel.hpp"
 
-#include <QAbstractListModel>
-
 // =============================================================================
 
 class ContactsListModel : public QAbstractListModel {
diff --git a/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp b/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp
index 85c3c2fbf..a3cf9332d 100644
--- a/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp
+++ b/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp
@@ -20,10 +20,10 @@
  *      Author: Ronan Abhamon
  */
 
-#include <QDebug>
-
 #include <cmath>
 
+#include <QDebug>
+
 #include "../../Utils.hpp"
 #include "../core/CoreManager.hpp"
 
diff --git a/linphone-desktop/src/components/core/CoreManager.cpp b/linphone-desktop/src/components/core/CoreManager.cpp
index 49e970a76..6215d0e43 100644
--- a/linphone-desktop/src/components/core/CoreManager.cpp
+++ b/linphone-desktop/src/components/core/CoreManager.cpp
@@ -20,15 +20,15 @@
  *      Author: Ronan Abhamon
  */
 
+#include <QDir>
+#include <QtConcurrent>
+#include <QTimer>
+
 #include "../../app/paths/Paths.hpp"
 #include "../../Utils.hpp"
 
 #include "CoreManager.hpp"
 
-#include <QDir>
-#include <QtConcurrent>
-#include <QTimer>
-
 #define CBS_CALL_INTERVAL 20
 
 using namespace std;
diff --git a/linphone-desktop/src/components/core/CoreManager.hpp b/linphone-desktop/src/components/core/CoreManager.hpp
index 18e374db9..bfeaf3fc6 100644
--- a/linphone-desktop/src/components/core/CoreManager.hpp
+++ b/linphone-desktop/src/components/core/CoreManager.hpp
@@ -23,6 +23,10 @@
 #ifndef CORE_MANAGER_H_
 #define CORE_MANAGER_H_
 
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QMutex>
+
 #include "../calls/CallsListModel.hpp"
 #include "../contacts/ContactsListModel.hpp"
 #include "../settings/AccountSettingsModel.hpp"
@@ -31,10 +35,6 @@
 
 #include "CoreHandlers.hpp"
 
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QMutex>
-
 // =============================================================================
 
 class QTimer;
diff --git a/linphone-desktop/src/components/presence/OwnPresenceModel.hpp b/linphone-desktop/src/components/presence/OwnPresenceModel.hpp
index abeddda98..d8aa0d184 100644
--- a/linphone-desktop/src/components/presence/OwnPresenceModel.hpp
+++ b/linphone-desktop/src/components/presence/OwnPresenceModel.hpp
@@ -23,10 +23,10 @@
 #ifndef OWN_PRESENCE_MODEL_H_
 #define OWN_PRESENCE_MODEL_H_
 
-#include "../presence/Presence.hpp"
-
 #include <QObject>
 
+#include "../presence/Presence.hpp"
+
 // =============================================================================
 // Gives the statuses list informations (icons, label, level, status).
 // Can set/get the presence status of the linphone user app.
diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp
index dac5690ae..79ca7b9b0 100644
--- a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp
+++ b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp
@@ -23,12 +23,12 @@
 #ifndef SIP_ADDRESSES_MODEL_H_
 #define SIP_ADDRESSES_MODEL_H_
 
+#include <QAbstractListModel>
+
 #include "../chat/ChatModel.hpp"
 #include "../contact/ContactModel.hpp"
 #include "SipAddressObserver.hpp"
 
-#include <QAbstractListModel>
-
 // =============================================================================
 
 class CoreHandlers;