Skip to content

Commit 0e5324a

Browse files
setvisiblesetvisible
committed
Merge branch 'feature-refactor-torrent' into develop
2 parents 556444d + a8dc395 commit 0e5324a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+4471
-4367
lines changed

‎include/Core/Torrent

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/TorrentBaseContext

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/TorrentContext

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/TorrentMessage

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Torrent/ITorrentContext

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/torrent/itorrentcontext.h"

‎include/Torrent/SettingItem

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/torrent/settingitem.h"

‎include/Torrent/Torrent

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/torrent/torrent.h"

‎include/Torrent/TorrentContext

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/torrent/torrentcontext.h"

‎include/Torrent/TorrentMessage

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/torrent/torrentmessage.h"

‎include/Torrent/Utils

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/torrent/utils.h"

‎include/Torrent/WorkerThread

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/torrent/workerthread.h"

‎src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ include(${CMAKE_SOURCE_DIR}/src/core/CMakeLists.txt)
2323
include(${CMAKE_SOURCE_DIR}/src/dialogs/CMakeLists.txt)
2424
include(${CMAKE_SOURCE_DIR}/src/io/CMakeLists.txt)
2525
include(${CMAKE_SOURCE_DIR}/src/ipc/CMakeLists.txt)
26+
include(${CMAKE_SOURCE_DIR}/src/torrent/CMakeLists.txt)
2627
include(${CMAKE_SOURCE_DIR}/src/widgets/CMakeLists.txt)
2728

2829
set(MY_SOURCES ${MY_SOURCES}

‎src/core/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ set(MY_SOURCES ${MY_SOURCES}
2626
${CMAKE_SOURCE_DIR}/src/core/stream.cpp
2727
${CMAKE_SOURCE_DIR}/src/core/streammanager.cpp
2828
${CMAKE_SOURCE_DIR}/src/core/theme.cpp
29-
${CMAKE_SOURCE_DIR}/src/core/torrent.cpp
30-
${CMAKE_SOURCE_DIR}/src/core/torrentbasecontext.cpp
31-
${CMAKE_SOURCE_DIR}/src/core/torrentcontext.cpp
32-
${CMAKE_SOURCE_DIR}/src/core/torrentcontext_p.cpp
33-
${CMAKE_SOURCE_DIR}/src/core/torrentmessage.cpp
3429
${CMAKE_SOURCE_DIR}/src/core/updatechecker.cpp
3530
${CMAKE_SOURCE_DIR}/src/core/updateinstaller.cpp
3631
${CMAKE_SOURCE_DIR}/src/core/utils.cpp

‎src/core/jobfile.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* License along with this program; If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616

17-
#ifndef CORE_DOWNLOAD_FILE_ITEM_H
18-
#define CORE_DOWNLOAD_FILE_ITEM_H
17+
#ifndef CORE_JOB_FILE_H
18+
#define CORE_JOB_FILE_H
1919

2020
#include <Core/AbstractJob>
2121

@@ -58,4 +58,4 @@ private slots:
5858
QString statusToHttp(QNetworkReply::NetworkError error);
5959
};
6060

61-
#endif // CORE_DOWNLOAD_FILE_ITEM_H
61+
#endif // CORE_JOB_FILE_H

‎src/core/jobtorrent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <Core/File>
2020
#include <Core/Format>
2121
#include <Core/ResourceItem>
22-
#include <Core/Torrent>
23-
#include <Core/TorrentContext>
22+
#include <Torrent/Torrent>
23+
#include <Torrent/TorrentContext>
2424

2525

2626
JobTorrent::JobTorrent(QObject *parent, ResourceItem *resource)

‎src/core/jobtorrent.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* License along with this program; If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616

17-
#ifndef CORE_DOWNLOAD_TORRENT_ITEM_H
18-
#define CORE_DOWNLOAD_TORRENT_ITEM_H
17+
#ifndef CORE_JOB_TORRENT_H
18+
#define CORE_JOB_TORRENT_H
1919

2020
#include <Core/AbstractJob>
21-
#include <Core/Torrent>
21+
#include <Torrent/Torrent>
2222

2323
#include <QtCore/QObject>
2424
#include <QtCore/QString>
@@ -52,4 +52,4 @@ private slots:
5252
bool isSeeding() const;
5353
};
5454

55-
#endif // CORE_DOWNLOAD_TORRENT_ITEM_H
55+
#endif // CORE_JOB_TORRENT_H

‎src/core/torrentbasecontext.cpp

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/core/torrentcontext.cpp

Lines changed: 0 additions & 239 deletions
This file was deleted.

0 commit comments

Comments
 (0)