Started code reorganizing (Moved libtorrent specific files and webui files to subfolders)

src/GUI.cpp

@@ -52,7 +52,7 @@
 #include "torrentadditiondlg.h"
 #include "searchengine.h"
 #include "rss_imp.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "about_imp.h"
 #include "trackerlogin.h"
 #include "options_imp.h"

src/console_imp.h

@@ -31,7 +31,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "ui_console.h"
 
 using namespace libtorrent;

src/feeddownloader.h

@@ -42,7 +42,7 @@
 #include <QDataStream>
 #include <QFileDialog>
 
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "ui_feeddownloader.h"
 #include "qinisettings.h"
 

src/headlessloader.h

@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QCoreApplication>
 #include "preferences.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 
 class HeadlessLoader: public QObject {
   Q_OBJECT

src/propertieswidget.cpp

@@ -44,7 +44,7 @@
 #include "propertieswidget.h"
 #include "transferlistwidget.h"
 #include "torrentpersistentdata.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "proplistdelegate.h"
 #include "torrentfilesmodel.h"
 #include "peerlistwidget.h"

src/qtlibtorrent/qbtsession.cpp

@@ -39,7 +39,7 @@
 
 #include "smtp.h"
 #include "filesystemwatcher.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "misc.h"
 #include "downloadthread.h"
 #include "filterparserthread.h"

src/qtlibtorrent/qtlibtorrent.pri

@@ -0,0 +1,7 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += $$PWD/qbtsession.h \
+           $$PWD/qtorrenthandle.h
+
+SOURCES += $$PWD/qbtsession.cpp \
+           $$PWD/qtorrenthandle.cpp

src/rss.h

@@ -45,7 +45,7 @@
 
 #include "misc.h"
 #include "feeddownloader.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "downloadthread.h"
 
 #if QT_VERSION >= 0x040500

src/rss_imp.cpp

@@ -40,7 +40,7 @@
 #include "rss_imp.h"
 #include "feeddownloader.h"
 #include "feedList.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "cookiesdlg.h"
 #include "preferences.h"
 #include "rsssettings.h"

src/searchengine.cpp

@@ -48,7 +48,7 @@
 #endif
 
 #include "searchengine.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "downloadthread.h"
 #include "misc.h"
 #include "preferences.h"

src/speedlimitdlg.h

@@ -35,7 +35,7 @@
 #include <QList>
 #include "ui_bandwidth_limit.h"
 #include "misc.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 
 using namespace libtorrent;
 

src/src.pro

@@ -220,10 +220,9 @@ os2 {
 }
 
 # Resource files
-RESOURCES = icons.qrc \
+RESOURCES += icons.qrc \
             lang.qrc \
             search.qrc \
-            webui.qrc \
             about.qrc
 
 # Add GeoIP resource file if the GeoIP database
@@ -276,14 +275,6 @@ TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \
 # Source code
 HEADERS += misc.h \
            downloadthread.h \
-           bittorrent.h \
-           qtorrenthandle.h \
-           httpserver.h \
-           httpconnection.h \
-           httprequestparser.h \
-           httpresponsegenerator.h \
-           json.h \
-           eventmanager.h \
            filterparserthread.h \
            stacktrace.h \
            torrentpersistentdata.h \
@@ -367,6 +358,9 @@ contains(DEFINES, USE_SYSTEM_QTSINGLEAPPLICATION) {
   include(lineedit/lineedit.pri)
 }
 
+include(qtlibtorrent/qtlibtorrent.pri)
+include(webui/webui.pri)
+
 !contains(DEFINES, DISABLE_GUI) {
   FORMS += ui/mainwindow.ui \
            ui/options.ui \
@@ -392,14 +386,7 @@ contains(DEFINES, USE_SYSTEM_QTSINGLEAPPLICATION) {
 }
 
 SOURCES += main.cpp \
-           bittorrent.cpp \
-           qtorrenthandle.cpp \
            downloadthread.cpp \
-           httpserver.cpp \
-           httpconnection.cpp \
-           httprequestparser.cpp \
-           httpresponsegenerator.cpp \
-           eventmanager.cpp \
            scannedfoldersmodel.cpp \
            misc.cpp \
            smtp.cpp

src/statusbar.h

@@ -38,7 +38,7 @@
 #include <QGridLayout>
 #include <QPushButton>
 #include <QHBoxLayout>
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "speedlimitdlg.h"
 #include "preferences.h"
 #include "misc.h"

src/torrentadditiondlg.h

@@ -45,7 +45,7 @@
 #include <libtorrent/version.hpp>
 #include <libtorrent/session.hpp>
 #include <libtorrent/bencode.hpp>
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "misc.h"
 #include "proplistdelegate.h"
 #include "ui_torrentadditiondlg.h"

src/trackerlist.cpp

@@ -40,7 +40,7 @@
 #include "propertieswidget.h"
 #include "trackersadditiondlg.h"
 #include "misc.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "qinisettings.h"
 
 TrackerList::TrackerList(PropertiesWidget *properties): QTreeWidget(), properties(properties) {

src/transferlistwidget.cpp

@@ -29,7 +29,7 @@
  */
 
 #include "transferlistwidget.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "torrentpersistentdata.h"
 #include "transferlistdelegate.h"
 #include "previewselect.h"

src/webui.qrc

@@ -1,37 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-  <file>webui/index.html</file>
-  <file>webui/download.html</file>
-  <file>webui/addtrackers.html</file>
-  <file>webui/upload.html</file>
-  <file>webui/uploadframe.html</file>
-  <file>webui/about.html</file>
-  <file>webui/filters.html</file>
-  <file>webui/transferlist.html</file>
-  <file>webui/prop-general.html</file>
-  <file>webui/prop-trackers.html</file>
-  <file>webui/prop-files.html</file>
-  <file>webui/properties.html</file>
-  <file>webui/uploadlimit.html</file>
-  <file>webui/downloadlimit.html</file>
-  <file>webui/preferences.html</file>
-  <file>webui/preferences_content.html</file>
-  <file>webui/css/Core.css</file>
-  <file>webui/css/Layout.css</file>
-  <file>webui/css/Window.css</file>
-  <file>webui/css/Tabs.css</file>
-  <file>webui/css/dynamicTable.css</file>
-  <file>webui/css/style.css</file>
-  <file>webui/scripts/excanvas-compressed.js</file>
-  <file>webui/scripts/mocha-yc.js</file>
-  <file>webui/scripts/mocha-init.js</file>
-  <file>webui/scripts/mootools-1.2-core-yc.js</file>
-  <file>webui/scripts/mootools-1.2-more.js</file>
-  <file>webui/scripts/dynamicTable.js</file>
-  <file>webui/scripts/client.js</file>
-  <file>webui/scripts/download.js</file>
-  <file>webui/scripts/progressbar.js</file>
-  <file>webui/scripts/contextmenu.js</file>
-  <file>webui/scripts/parametrics.js</file>
-</qresource>
-</RCC>

src/webui/eventmanager.cpp

@@ -31,7 +31,7 @@
 
 #include <libtorrent/version.hpp>
 #include "eventmanager.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "scannedfoldersmodel.h"
 #include "misc.h"
 #include "preferences.h"

src/webui/httpconnection.cpp

@@ -34,7 +34,7 @@
 #include "eventmanager.h"
 #include "preferences.h"
 #include "json.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include "misc.h"
 #include <QTcpSocket>
 #include <QDateTime>
@@ -47,7 +47,7 @@
 #include <QTemporaryFile>
 
 HttpConnection::HttpConnection(QTcpSocket *socket, Bittorrent *BTSession, HttpServer *parent)
-    : QObject(parent), socket(socket), parent(parent), BTSession(BTSession)
+  : QObject(parent), socket(socket), parent(parent), BTSession(BTSession)
 {
   socket->setParent(this);
   connect(socket, SIGNAL(readyRead()), this, SLOT(read()));
@@ -231,10 +231,13 @@ void HttpConnection::respond() {
       return;
     }
   }
-  if (list[0] == "images")
+  if (list[0] == "images") {
     list[0] = "Icons";
-  else
+  } else {
+    if(list.last().endsWith(".html"))
+      list.prepend("html");
     list.prepend("webui");
+  }
   url = ":/" + list.join("/");
   QFile file(url);
   if(!file.open(QIODevice::ReadOnly))

src/webui/httpserver.cpp

@@ -32,7 +32,7 @@
 #include "httpserver.h"
 #include "httpconnection.h"
 #include "eventmanager.h"
-#include "bittorrent.h"
+#include "qbtsession.h"
 #include <QTimer>
 #include <QCryptographicHash>
 #include <QTime>

src/webui/webui.pri

@@ -0,0 +1,16 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += $$PWD/httpserver.h \
+           $$PWD/httpconnection.h \
+           $$PWD/httprequestparser.h \
+           $$PWD/httpresponsegenerator.h \
+           $$PWD/eventmanager.h \
+           $$PWD/json.h
+
+SOURCES += $$PWD/httpserver.cpp \
+           $$PWD/httpconnection.cpp \
+           $$PWD/httprequestparser.cpp \
+           $$PWD/httpresponsegenerator.cpp \
+           $$PWD/eventmanager.cpp
+
+RESOURCES += $$PWD/webui.qrc

src/webui/webui.qrc

@@ -0,0 +1,37 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="webui/">
+  <file>html/index.html</file>
+  <file>html/download.html</file>
+  <file>html/addtrackers.html</file>
+  <file>html/upload.html</file>
+  <file>html/uploadframe.html</file>
+  <file>html/about.html</file>
+  <file>html/filters.html</file>
+  <file>html/transferlist.html</file>
+  <file>html/prop-general.html</file>
+  <file>html/prop-trackers.html</file>
+  <file>html/prop-files.html</file>
+  <file>html/properties.html</file>
+  <file>html/uploadlimit.html</file>
+  <file>html/downloadlimit.html</file>
+  <file>html/preferences.html</file>
+  <file>html/preferences_content.html</file>
+  <file>css/Core.css</file>
+  <file>css/Layout.css</file>
+  <file>css/Window.css</file>
+  <file>css/Tabs.css</file>
+  <file>css/dynamicTable.css</file>
+  <file>css/style.css</file>
+  <file>scripts/excanvas-compressed.js</file>
+  <file>scripts/mocha-yc.js</file>
+  <file>scripts/mocha-init.js</file>
+  <file>scripts/mootools-1.2-core-yc.js</file>
+  <file>scripts/mootools-1.2-more.js</file>
+  <file>scripts/dynamicTable.js</file>
+  <file>scripts/client.js</file>
+  <file>scripts/download.js</file>
+  <file>scripts/progressbar.js</file>
+  <file>scripts/contextmenu.js</file>
+  <file>scripts/parametrics.js</file>
+</qresource>
+</RCC>