Browse Source

BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
c2e5ecaaa0
  1. 1
      Changelog
  2. 2
      src/downloadthread.h
  3. 2
      src/executionlog.h
  4. 2
      src/lineedit/src/lineedit.h
  5. 15
      src/mainwindow.h
  6. 2
      src/powermanagement/powermanagement_x11.h
  7. 5
      src/preferences/options_imp.h
  8. 5
      src/previewselect.h
  9. 9
      src/properties/peerlistwidget.h
  10. 7
      src/properties/propertieswidget.h
  11. 2
      src/properties/proptabbar.h
  12. 1
      src/qtlibtorrent/qbtsession.h
  13. 3
      src/qtlibtorrent/qtorrenthandle.h
  14. 5
      src/rss/automatedrssdownloader.h
  15. 2
      src/rss/cookiesdlg.h
  16. 5
      src/rss/rss_imp.h
  17. 2
      src/rss/rsssettingsdlg.h
  18. 3
      src/searchengine/engineselectdlg.h
  19. 5
      src/searchengine/searchengine.h
  20. 3
      src/searchengine/searchtab.h
  21. 2
      src/smtp.h
  22. 2
      src/torrentimportdlg.h
  23. 7
      src/transferlistwidget.h
  24. 5
      src/webui/httpconnection.h
  25. 5
      src/webui/httpserver.h

1
Changelog

@ -6,6 +6,7 @@
- FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev) - FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)
- FEATURE: Added option to bypass Web UI authentication for localhost - FEATURE: Added option to bypass Web UI authentication for localhost
- FEATURE: Added option to disable program exit confirmation - FEATURE: Added option to disable program exit confirmation
- BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
* Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
- FEATURE: Use system icons (Linux, Qt >= 4.6) - FEATURE: Use system icons (Linux, Qt >= 4.6)

2
src/downloadthread.h

@ -36,7 +36,9 @@
#include <QHash> #include <QHash>
#include <QSslError> #include <QSslError>
QT_BEGIN_NAMESPACE
class QNetworkAccessManager; class QNetworkAccessManager;
QT_END_NAMESPACE
class DownloadThread : public QObject { class DownloadThread : public QObject {
Q_OBJECT Q_OBJECT

2
src/executionlog.h

@ -3,9 +3,11 @@
#include <QWidget> #include <QWidget>
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class ExecutionLog; class ExecutionLog;
} }
QT_END_NAMESPACE
class ExecutionLog : public QWidget class ExecutionLog : public QWidget
{ {

2
src/lineedit/src/lineedit.h

@ -12,7 +12,9 @@
#include <QLineEdit> #include <QLineEdit>
QT_BEGIN_NAMESPACE
class QToolButton; class QToolButton;
QT_END_NAMESPACE
class LineEdit : public QLineEdit class LineEdit : public QLineEdit
{ {

15
src/mainwindow.h

@ -38,18 +38,13 @@
#include "qtorrenthandle.h" #include "qtorrenthandle.h"
class QBtSession; class QBtSession;
class QTimer;
class downloadFromURL; class downloadFromURL;
class SearchEngine; class SearchEngine;
class QCloseEvent;
class RSSImp; class RSSImp;
class QShortcut;
class about; class about;
class options_imp; class options_imp;
class QTabWidget;
class TransferListWidget; class TransferListWidget;
class TransferListFiltersWidget; class TransferListFiltersWidget;
class QSplitter;
class PropertiesWidget; class PropertiesWidget;
class StatusBar; class StatusBar;
class consoleDlg; class consoleDlg;
@ -58,10 +53,18 @@ class TorrentCreatorDlg;
class downloadFromURL; class downloadFromURL;
class HidableTabWidget; class HidableTabWidget;
class LineEdit; class LineEdit;
class QFileSystemWatcher;
class ExecutionLog; class ExecutionLog;
class PowerManagement; class PowerManagement;
QT_BEGIN_NAMESPACE
class QCloseEvent;
class QFileSystemWatcher;
class QShortcut;
class QSplitter;
class QTabWidget;
class QTimer;
QT_END_NAMESPACE
class MainWindow : public QMainWindow, private Ui::MainWindow{ class MainWindow : public QMainWindow, private Ui::MainWindow{
Q_OBJECT Q_OBJECT

2
src/powermanagement/powermanagement_x11.h

@ -33,7 +33,9 @@
#include <QObject> #include <QObject>
QT_BEGIN_NAMESPACE
class QDBusPendingCallWatcher; class QDBusPendingCallWatcher;
QT_END_NAMESPACE
class PowerManagementInhibitor : public QObject class PowerManagementInhibitor : public QObject
{ {

5
src/preferences/options_imp.h

@ -37,9 +37,12 @@
// actions on double-click on torrents // actions on double-click on torrents
enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION}; enum DoubleClickAction {TOGGLE_PAUSE, OPEN_DEST, NO_ACTION};
class QCloseEvent;
class AdvancedSettings; class AdvancedSettings;
QT_BEGIN_NAMESPACE
class QCloseEvent;
QT_END_NAMESPACE
class options_imp : public QDialog, private Ui_Preferences { class options_imp : public QDialog, private Ui_Preferences {
Q_OBJECT Q_OBJECT
private: private:

5
src/previewselect.h

@ -36,9 +36,12 @@
#include "ui_preview.h" #include "ui_preview.h"
#include "qtorrenthandle.h" #include "qtorrenthandle.h"
class QStandardItemModel;
class PreviewListDelegate; class PreviewListDelegate;
QT_BEGIN_NAMESPACE
class QStandardItemModel;
QT_END_NAMESPACE
class PreviewSelect: public QDialog, private Ui::preview { class PreviewSelect: public QDialog, private Ui::preview {
Q_OBJECT Q_OBJECT

9
src/properties/peerlistwidget.h

@ -39,13 +39,16 @@
#include "qtorrenthandle.h" #include "qtorrenthandle.h"
#include "misc.h" #include "misc.h"
class QStandardItemModel;
class QStandardItem;
class QSortFilterProxyModel;
class PeerListDelegate; class PeerListDelegate;
class ReverseResolution; class ReverseResolution;
class PropertiesWidget; class PropertiesWidget;
QT_BEGIN_NAMESPACE
class QSortFilterProxyModel;
class QStandardItem;
class QStandardItemModel;
QT_END_NAMESPACE
#include <boost/version.hpp> #include <boost/version.hpp>
#if BOOST_VERSION < 103500 #if BOOST_VERSION < 103500
#include <libtorrent/asio/ip/tcp.hpp> #include <libtorrent/asio/ip/tcp.hpp>

7
src/properties/propertieswidget.h

@ -37,10 +37,8 @@
class TransferListWidget; class TransferListWidget;
class QTimer;
class TorrentFilesFilterModel; class TorrentFilesFilterModel;
class PropListDelegate; class PropListDelegate;
class QAction;
class torrent_file; class torrent_file;
class PeerListWidget; class PeerListWidget;
class TrackerList; class TrackerList;
@ -50,6 +48,11 @@ class PieceAvailabilityBar;
class PropTabBar; class PropTabBar;
class LineEdit; class LineEdit;
QT_BEGIN_NAMESPACE
class QAction;
class QTimer;
QT_END_NAMESPACE
class PropertiesWidget : public QWidget, private Ui::PropertiesWidget { class PropertiesWidget : public QWidget, private Ui::PropertiesWidget {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(PropertiesWidget) Q_DISABLE_COPY(PropertiesWidget)

2
src/properties/proptabbar.h

@ -33,7 +33,9 @@
#include <QHBoxLayout> #include <QHBoxLayout>
QT_BEGIN_NAMESPACE
class QButtonGroup; class QButtonGroup;
QT_END_NAMESPACE
class PropTabBar : public QHBoxLayout class PropTabBar : public QHBoxLayout
{ {

1
src/qtlibtorrent/qbtsession.h

@ -53,7 +53,6 @@
#define MAX_SAMPLES 20 #define MAX_SAMPLES 20
class DownloadThread; class DownloadThread;
class QTimer;
class FilterParserThread; class FilterParserThread;
class HttpServer; class HttpServer;
class BandwidthScheduler; class BandwidthScheduler;

3
src/qtlibtorrent/qtorrenthandle.h

@ -36,7 +36,10 @@
#include <libtorrent/torrent_info.hpp> #include <libtorrent/torrent_info.hpp>
#include <QString> #include <QString>
QT_BEGIN_NAMESPACE
class QStringList; class QStringList;
QT_END_NAMESPACE
// A wrapper for torrent_handle in libtorrent // A wrapper for torrent_handle in libtorrent
// to interact well with Qt types // to interact well with Qt types

5
src/rss/automatedrssdownloader.h

@ -34,12 +34,17 @@
#include <QDialog> #include <QDialog>
#include "rssdownloadrule.h" #include "rssdownloadrule.h"
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class AutomatedRssDownloader; class AutomatedRssDownloader;
} }
QT_END_NAMESPACE
class RssDownloadRuleList; class RssDownloadRuleList;
QT_BEGIN_NAMESPACE
class QListWidgetItem; class QListWidgetItem;
QT_END_NAMESPACE
class AutomatedRssDownloader : public QDialog class AutomatedRssDownloader : public QDialog
{ {

2
src/rss/cookiesdlg.h

@ -33,9 +33,11 @@
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class CookiesDlg; class CookiesDlg;
} }
QT_END_NAMESPACE
class CookiesDlg : public QDialog class CookiesDlg : public QDialog
{ {

5
src/rss/rss_imp.h

@ -37,10 +37,13 @@
#include "ui_rss.h" #include "ui_rss.h"
class FeedListWidget; class FeedListWidget;
class QTreeWidgetItem;
class RssFolder; class RssFolder;
class RssManager; class RssManager;
QT_BEGIN_NAMESPACE
class QTreeWidgetItem;
QT_END_NAMESPACE
class RSSImp : public QWidget, public Ui::RSS { class RSSImp : public QWidget, public Ui::RSS {
Q_OBJECT Q_OBJECT

2
src/rss/rsssettingsdlg.h

@ -33,9 +33,11 @@
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class RssSettingsDlg; class RssSettingsDlg;
} }
QT_END_NAMESPACE
class RssSettingsDlg : public QDialog class RssSettingsDlg : public QDialog
{ {

3
src/searchengine/engineselectdlg.h

@ -35,7 +35,10 @@
#include "supportedengines.h" #include "supportedengines.h"
class DownloadThread; class DownloadThread;
QT_BEGIN_NAMESPACE
class QDropEvent; class QDropEvent;
QT_END_NAMESPACE
class engineSelectDlg : public QDialog, public Ui::engineSelect{ class engineSelectDlg : public QDialog, public Ui::engineSelect{
Q_OBJECT Q_OBJECT

5
src/searchengine/searchengine.h

@ -42,10 +42,13 @@
#include "supportedengines.h" #include "supportedengines.h"
class DownloadThread; class DownloadThread;
class QTimer;
class SearchEngine; class SearchEngine;
class MainWindow; class MainWindow;
QT_BEGIN_NAMESPACE
class QTimer;
QT_END_NAMESPACE
class SearchEngine : public QWidget, public Ui::search_engine{ class SearchEngine : public QWidget, public Ui::search_engine{
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(SearchEngine) Q_DISABLE_COPY(SearchEngine)

3
src/searchengine/searchtab.h

@ -38,10 +38,13 @@
class SearchListDelegate; class SearchListDelegate;
class SearchEngine; class SearchEngine;
QT_BEGIN_NAMESPACE
class QTreeView; class QTreeView;
class QHeaderView; class QHeaderView;
class QStandardItemModel; class QStandardItemModel;
class QSortFilterProxyModel; class QSortFilterProxyModel;
QT_END_NAMESPACE
class SearchTab: public QWidget, public Ui::search_engine { class SearchTab: public QWidget, public Ui::search_engine {
Q_OBJECT Q_OBJECT

2
src/smtp.h

@ -16,9 +16,11 @@
#include <QObject> #include <QObject>
#include <QByteArray> #include <QByteArray>
QT_BEGIN_NAMESPACE
struct QTextStream; struct QTextStream;
struct QTcpSocket; struct QTcpSocket;
class QTextCodec; class QTextCodec;
QT_END_NAMESPACE
class Smtp : public QObject { class Smtp : public QObject {
Q_OBJECT Q_OBJECT

2
src/torrentimportdlg.h

@ -36,9 +36,11 @@
#include <libtorrent/torrent_info.hpp> #include <libtorrent/torrent_info.hpp>
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>
QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class TorrentImportDlg; class TorrentImportDlg;
} }
QT_END_NAMESPACE
class QBtSession; class QBtSession;

7
src/transferlistwidget.h

@ -35,13 +35,16 @@
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>
#include "qtorrenthandle.h" #include "qtorrenthandle.h"
class QStandardItemModel;
class QSortFilterProxyModel;
class QBtSession; class QBtSession;
class TransferListDelegate; class TransferListDelegate;
class MainWindow; class MainWindow;
class TorrentModel; class TorrentModel;
QT_BEGIN_NAMESPACE
class QSortFilterProxyModel;
class QStandardItemModel;
QT_END_NAMESPACE
enum TorrentFilter {FILTER_ALL, FILTER_DOWNLOADING, FILTER_COMPLETED, FILTER_PAUSED, FILTER_ACTIVE, FILTER_INACTIVE}; enum TorrentFilter {FILTER_ALL, FILTER_DOWNLOADING, FILTER_COMPLETED, FILTER_PAUSED, FILTER_ACTIVE, FILTER_INACTIVE};
class TransferListWidget: public QTreeView { class TransferListWidget: public QTreeView {

5
src/webui/httpconnection.h

@ -36,9 +36,12 @@
#include "httpresponsegenerator.h" #include "httpresponsegenerator.h"
#include <QObject> #include <QObject>
class QTcpSocket;
class HttpServer; class HttpServer;
QT_BEGIN_NAMESPACE
class QTcpSocket;
QT_END_NAMESPACE
class HttpConnection : public QObject class HttpConnection : public QObject
{ {
Q_OBJECT Q_OBJECT

5
src/webui/httpserver.h

@ -38,9 +38,12 @@
#include <QHash> #include <QHash>
#include "preferences.h" #include "preferences.h"
class QTimer;
class EventManager; class EventManager;
QT_BEGIN_NAMESPACE
class QTimer;
QT_END_NAMESPACE
const int MAX_AUTH_FAILED_ATTEMPTS = 5; const int MAX_AUTH_FAILED_ATTEMPTS = 5;
class HttpServer : public QTcpServer { class HttpServer : public QTcpServer {

Loading…
Cancel
Save