Browse Source

Cleanup header include order

Add missing header.
Cleanup license.
adaptive-webui-19844
Chocobo1 7 years ago
parent
commit
c22e6b4502
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 16
      src/app/upgrade.h
  2. 9
      src/base/bittorrent/magneturi.cpp
  3. 1
      src/base/http/connection.cpp
  4. 3
      src/base/net/dnsupdater.cpp
  5. 15
      src/gui/loglistwidget.cpp
  6. 15
      src/gui/programupdater.cpp
  7. 3
      src/gui/search/searchwidget.cpp
  8. 8
      src/gui/transferlistwidget.cpp

16
src/app/upgrade.h

@ -29,34 +29,34 @@
#ifndef UPGRADE_H #ifndef UPGRADE_H
#define UPGRADE_H #define UPGRADE_H
#include <libtorrent/bencode.hpp>
#include <libtorrent/entry.hpp>
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>
#if LIBTORRENT_VERSION_NUM >= 10100 #if LIBTORRENT_VERSION_NUM >= 10100
#include <libtorrent/bdecode.hpp> #include <libtorrent/bdecode.hpp>
#endif #else
#include <libtorrent/bencode.hpp>
#include <libtorrent/entry.hpp>
#if LIBTORRENT_VERSION_NUM < 10100
#include <libtorrent/lazy_entry.hpp> #include <libtorrent/lazy_entry.hpp>
#endif #endif
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QRegExp>
#include <QString>
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
#include <QMessageBox> #include <QMessageBox>
#endif #endif
#include <QRegExp>
#include <QString>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#include <QSettings> #include <QSettings>
#endif #endif
#include "base/logger.h" #include "base/logger.h"
#include "base/preferences.h"
#include "base/profile.h" #include "base/profile.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "base/utils/string.h" #include "base/utils/string.h"
#include "base/preferences.h"
bool userAcceptsUpgrade() bool userAcceptsUpgrade()
{ {

9
src/base/bittorrent/magneturi.cpp

@ -26,16 +26,17 @@
* exception statement from your version. * exception statement from your version.
*/ */
#include <QByteArray> #include "magneturi.h"
#include <QRegExp>
#include <QStringList>
#include <libtorrent/bencode.hpp> #include <libtorrent/bencode.hpp>
#include <libtorrent/error_code.hpp> #include <libtorrent/error_code.hpp>
#include <libtorrent/magnet_uri.hpp> #include <libtorrent/magnet_uri.hpp>
#include <QByteArray>
#include <QRegExp>
#include <QStringList>
#include "base/utils/string.h" #include "base/utils/string.h"
#include "magneturi.h"
namespace namespace
{ {

1
src/base/http/connection.cpp

@ -30,7 +30,6 @@
#include "connection.h" #include "connection.h"
#include <QRegExp>
#include <QTcpSocket> #include <QTcpSocket>
#include "base/logger.h" #include "base/logger.h"

3
src/base/net/dnsupdater.cpp

@ -26,6 +26,8 @@
* exception statement from your version. * exception statement from your version.
*/ */
#include "dnsupdater.h"
#include <QDebug> #include <QDebug>
#include <QRegExp> #include <QRegExp>
#include <QStringList> #include <QStringList>
@ -34,7 +36,6 @@
#include "base/logger.h" #include "base/logger.h"
#include "base/net/downloadhandler.h" #include "base/net/downloadhandler.h"
#include "base/net/downloadmanager.h" #include "base/net/downloadmanager.h"
#include "dnsupdater.h"
using namespace Net; using namespace Net;

15
src/gui/loglistwidget.cpp

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2011 Christophe Dumez * Copyright (C) 2011 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,17 +24,18 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#include <QKeyEvent>
#include "loglistwidget.h"
#include <QAction>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
#include <QListWidgetItem> #include <QKeyEvent>
#include <QLabel> #include <QLabel>
#include <QListWidgetItem>
#include <QRegExp> #include <QRegExp>
#include <QAction>
#include "loglistwidget.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
LogListWidget::LogListWidget(int maxLines, const Log::MsgTypes &types, QWidget *parent) LogListWidget::LogListWidget(int maxLines, const Log::MsgTypes &types, QWidget *parent)

15
src/gui/programupdater.cpp

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2010 Christophe Dumez * Copyright (C) 2010 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,20 +24,19 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#include <QXmlStreamReader> #include "programupdater.h"
#include <QDesktopServices>
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <QRegExp> #include <QRegExp>
#include <QStringList> #include <QStringList>
#include <QXmlStreamReader>
#include "base/utils/fs.h"
#include "base/net/downloadmanager.h"
#include "base/net/downloadhandler.h" #include "base/net/downloadhandler.h"
#include "programupdater.h" #include "base/net/downloadmanager.h"
#include "base/utils/fs.h"
namespace namespace
{ {

3
src/gui/search/searchwidget.cpp

@ -29,6 +29,8 @@
#include "searchwidget.h" #include "searchwidget.h"
#include <QtGlobal>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <cstdlib> #include <cstdlib>
#endif #endif
@ -41,6 +43,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QMimeData> #include <QMimeData>
#include <QProcess> #include <QProcess>
#include <QRegExp>
#include <QSignalMapper> #include <QSignalMapper>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QStandardItemModel> #include <QStandardItemModel>

8
src/gui/transferlistwidget.cpp

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2006 Christophe Dumez * Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,8 +24,6 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#include "transferlistwidget.h" #include "transferlistwidget.h"
@ -35,14 +33,13 @@
#include <QFileDialog> #include <QFileDialog>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QStylePainter>
#include <QRegExp> #include <QRegExp>
#include <QShortcut> #include <QShortcut>
#include <QStylePainter>
#include <QTableView> #include <QTableView>
#include <QWheelEvent> #include <QWheelEvent>
#include <QWidgetAction> #include <QWidgetAction>
#include "autoexpandabledialog.h"
#include "base/bittorrent/session.h" #include "base/bittorrent/session.h"
#include "base/bittorrent/torrenthandle.h" #include "base/bittorrent/torrenthandle.h"
#include "base/logger.h" #include "base/logger.h"
@ -50,6 +47,7 @@
#include "base/torrentfilter.h" #include "base/torrentfilter.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
#include "base/utils/string.h" #include "base/utils/string.h"
#include "autoexpandabledialog.h"
#include "deletionconfirmationdlg.h" #include "deletionconfirmationdlg.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
#include "mainwindow.h" #include "mainwindow.h"

Loading…
Cancel
Save