Fix header files order

src/podcasts/addpodcastbyurl.cpp

@@ -18,15 +18,16 @@
 */
 
 #include "addpodcastbyurl.h"
-#include "podcastdiscoverymodel.h"
-#include "podcasturlloader.h"
-#include "ui_addpodcastbyurl.h"
-#include "core/closure.h"
 
 #include <QClipboard>
 #include <QNetworkReply>
 #include <QMessageBox>
 
+#include "podcastdiscoverymodel.h"
+#include "podcasturlloader.h"
+#include "ui_addpodcastbyurl.h"
+#include "core/closure.h"
+
 AddPodcastByUrl::AddPodcastByUrl(Application* app, QWidget* parent)
     : AddPodcastPage(app, parent),
       ui_(new Ui_AddPodcastByUrl),

src/podcasts/addpodcastdialog.cpp

@@ -18,6 +18,11 @@
 */
 
 #include "addpodcastdialog.h"
+
+#include <QFileDialog>
+#include <QPushButton>
+#include <QTimer>
+
 #include "addpodcastbyurl.h"
 #include "fixedopmlpage.h"
 #include "gpoddersearchpage.h"
@@ -30,10 +35,6 @@
 #include "ui/iconloader.h"
 #include "widgets/widgetfadehelper.h"
 
-#include <QFileDialog>
-#include <QPushButton>
-#include <QTimer>
-
 const char* AddPodcastDialog::kBbcOpmlUrl =
     "http://www.bbc.co.uk/podcasts.opml";
 

src/podcasts/fixedopmlpage.cpp

@@ -18,12 +18,13 @@
 */
 
 #include "fixedopmlpage.h"
+
+#include <QMessageBox>
+
 #include "podcastdiscoverymodel.h"
 #include "podcasturlloader.h"
 #include "core/closure.h"
 
-#include <QMessageBox>
-
 FixedOpmlPage::FixedOpmlPage(const QUrl& opml_url, const QString& title,
                              const QIcon& icon, Application* app,
                              QWidget* parent)

src/podcasts/gpoddersearchpage.cpp

@@ -18,14 +18,15 @@
 */
 
 #include "gpoddersearchpage.h"
+
+#include <QMessageBox>
+
 #include "podcast.h"
 #include "podcastdiscoverymodel.h"
 #include "ui_gpoddersearchpage.h"
 #include "core/closure.h"
 #include "core/network.h"
 
-#include <QMessageBox>
-
 GPodderSearchPage::GPodderSearchPage(Application* app, QWidget* parent)
     : AddPodcastPage(app, parent),
       ui_(new Ui_GPodderSearchPage),

src/podcasts/gpoddersync.cpp

@@ -18,6 +18,13 @@
 */
 
 #include "gpoddersync.h"
+
+#include <QCoreApplication>
+#include <QHostInfo>
+#include <QNetworkAccessManager>
+#include <QSettings>
+#include <QTimer>
+
 #include "podcastbackend.h"
 #include "podcasturlloader.h"
 #include "core/application.h"
@@ -28,12 +35,6 @@
 #include "core/timeconstants.h"
 #include "core/utilities.h"
 
-#include <QCoreApplication>
-#include <QHostInfo>
-#include <QNetworkAccessManager>
-#include <QSettings>
-#include <QTimer>
-
 const char* GPodderSync::kSettingsGroup = "Podcasts";
 const int GPodderSync::kFlushUpdateQueueDelay = 30 * kMsecPerSec;  // 30 seconds
 const int GPodderSync::kGetUpdatesInterval =

src/podcasts/gpoddertoptagsmodel.cpp

@@ -18,14 +18,14 @@
 */
 
 #include "gpoddertoptagsmodel.h"
+
+#include <ApiRequest.h>
+#include <QMessageBox>
+
 #include "gpoddertoptagspage.h"
 #include "podcast.h"
 #include "core/closure.h"
 
-#include <ApiRequest.h>
-
-#include <QMessageBox>
-
 GPodderTopTagsModel::GPodderTopTagsModel(mygpo::ApiRequest* api,
                                          Application* app, QObject* parent)
     : PodcastDiscoveryModel(app, parent), api_(api) {}

src/podcasts/gpoddertoptagspage.cpp

@@ -17,13 +17,14 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "gpoddertoptagsmodel.h"
 #include "gpoddertoptagspage.h"
-#include "core/closure.h"
-#include "core/network.h"
 
 #include <QMessageBox>
 
+#include "gpoddertoptagsmodel.h"
+#include "core/closure.h"
+#include "core/network.h"
+
 const int GPodderTopTagsPage::kMaxTagCount = 100;
 
 GPodderTopTagsPage::GPodderTopTagsPage(Application* app, QWidget* parent)

src/podcasts/itunessearchpage.cpp

@@ -18,16 +18,16 @@
 */
 
 #include "itunessearchpage.h"
+
+#include <qjson/parser.h>
+#include <QMessageBox>
+#include <QNetworkReply>
+
+#include "core/closure.h"
+#include "core/network.h"
 #include "podcast.h"
 #include "podcastdiscoverymodel.h"
 #include "ui_itunessearchpage.h"
-#include "core/closure.h"
-#include "core/network.h"
-
-#include <qjson/parser.h>
-
-#include <QMessageBox>
-#include <QNetworkReply>
 
 const char* ITunesSearchPage::kUrlBase =
     "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/"

src/podcasts/podcast.cpp

@@ -18,13 +18,13 @@
 */
 
 #include "podcast.h"
-#include "core/utilities.h"
 
 #include <QDataStream>
 #include <QDateTime>
-
 #include <Podcast.h>
 
+#include "core/utilities.h"
+
 const QStringList Podcast::kColumns = QStringList() << "url"
                                                     << "title"
                                                     << "description"

src/podcasts/podcastdiscoverymodel.cpp

@@ -17,16 +17,17 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "opmlcontainer.h"
-#include "podcast.h"
 #include "podcastdiscoverymodel.h"
-#include "core/application.h"
-#include "ui/iconloader.h"
-#include "ui/standarditemiconloader.h"
 
 #include <QIcon>
 #include <QSet>
 
+#include "core/application.h"
+#include "opmlcontainer.h"
+#include "podcast.h"
+#include "ui/iconloader.h"
+#include "ui/standarditemiconloader.h"
+
 PodcastDiscoveryModel::PodcastDiscoveryModel(Application* app, QObject* parent)
     : QStandardItemModel(parent),
       app_(app),

src/podcasts/podcastparser.cpp

@@ -17,14 +17,15 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "opmlcontainer.h"
 #include "podcastparser.h"
-#include "core/logging.h"
-#include "core/utilities.h"
 
 #include <QDateTime>
 #include <QXmlStreamReader>
 
+#include "core/logging.h"
+#include "core/utilities.h"
+#include "opmlcontainer.h"
+
 // Namespace constants must be lower case.
 const char* PodcastParser::kAtomNamespace = "http://www.w3.org/2005/atom";
 const char* PodcastParser::kItunesNamespace =

src/podcasts/podcastservice.cpp

@@ -25,12 +25,6 @@
 #include <QtConcurrentRun>
 
 #include "addpodcastdialog.h"
-#include "opmlcontainer.h"
-#include "podcastbackend.h"
-#include "podcastdeleter.h"
-#include "podcastdownloader.h"
-#include "podcastservicemodel.h"
-#include "podcastupdater.h"
 #include "core/application.h"
 #include "core/logging.h"
 #include "core/mergedproxymodel.h"
@@ -39,6 +33,12 @@
 #include "devices/deviceview.h"
 #include "internet/internetmodel.h"
 #include "library/libraryview.h"
+#include "opmlcontainer.h"
+#include "podcastbackend.h"
+#include "podcastdeleter.h"
+#include "podcastdownloader.h"
+#include "podcastservicemodel.h"
+#include "podcastupdater.h"
 #include "ui/iconloader.h"
 #include "ui/organisedialog.h"
 #include "ui/organiseerrordialog.h"

src/podcasts/podcastsettingspage.cpp

@@ -17,21 +17,22 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "gpoddersync.h"
-#include "podcastdownloader.h"
 #include "podcastsettingspage.h"
 #include "ui_podcastsettingspage.h"
-#include "core/application.h"
-#include "core/closure.h"
-#include "core/timeconstants.h"
-#include "library/librarydirectorymodel.h"
-#include "library/librarymodel.h"
-#include "ui/settingsdialog.h"
 
 #include <QFileDialog>
 #include <QNetworkReply>
 #include <QSettings>
 
+#include "core/application.h"
+#include "core/closure.h"
+#include "core/timeconstants.h"
+#include "gpoddersync.h"
+#include "library/librarydirectorymodel.h"
+#include "library/librarymodel.h"
+#include "podcastdownloader.h"
+#include "ui/settingsdialog.h"
+
 const char* PodcastSettingsPage::kSettingsGroup = "Podcasts";
 
 PodcastSettingsPage::PodcastSettingsPage(SettingsDialog* dialog)

src/podcasts/podcastupdater.cpp

@@ -17,17 +17,18 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "podcastbackend.h"
 #include "podcastupdater.h"
-#include "podcasturlloader.h"
+
+#include <QSettings>
+#include <QTimer>
+
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/qhash_qurl.h"
 #include "core/timeconstants.h"
-
-#include <QSettings>
-#include <QTimer>
+#include "podcastbackend.h"
+#include "podcasturlloader.h"
 
 const char* PodcastUpdater::kSettingsGroup = "Podcasts";