Browse Source

- Some more cleanup

adaptive-webui-19844
Christophe Dumez 16 years ago
parent
commit
3164337c3c
  1. 4
      src/bittorrent.cpp
  2. 16
      src/bittorrent.h

4
src/bittorrent.cpp

@ -67,9 +67,6 @@ bittorrent::bittorrent() : timerScan(0), DHTEnabled(false), preAllocateAll(false
timerAlerts = new QTimer(); timerAlerts = new QTimer();
connect(timerAlerts, SIGNAL(timeout()), this, SLOT(readAlerts())); connect(timerAlerts, SIGNAL(timeout()), this, SLOT(readAlerts()));
timerAlerts->start(3000); timerAlerts->start(3000);
fastResumeSaver = new QTimer();
connect(fastResumeSaver, SIGNAL(timeout()), this, SLOT(saveFastResumeAndRatioData()));
fastResumeSaver->start(60000);
// To download from urls // To download from urls
downloader = new downloadThread(this); downloader = new downloadThread(this);
connect(downloader, SIGNAL(downloadFinished(QString, QString)), this, SLOT(processDownloadedFile(QString, QString))); connect(downloader, SIGNAL(downloadFinished(QString, QString)), this, SLOT(processDownloadedFile(QString, QString)));
@ -98,7 +95,6 @@ bittorrent::~bittorrent() {
// Disable directory scanning // Disable directory scanning
disableDirectoryScanning(); disableDirectoryScanning();
// Delete our objects // Delete our objects
delete fastResumeSaver;
delete timerAlerts; delete timerAlerts;
if(BigRatioTimer) if(BigRatioTimer)
delete BigRatioTimer; delete BigRatioTimer;

16
src/bittorrent.h

@ -22,10 +22,7 @@
#define __BITTORRENT_H__ #define __BITTORRENT_H__
#include <QHash> #include <QHash>
#include <QList>
#include <QPair>
#include <QStringList> #include <QStringList>
#include <QDateTime>
#include <QApplication> #include <QApplication>
#include <QPalette> #include <QPalette>
#include <QPointer> #include <QPointer>
@ -48,7 +45,6 @@ class bittorrent : public QObject {
QString scan_dir; QString scan_dir;
QPointer<QTimer> timerScan; QPointer<QTimer> timerScan;
QPointer<QTimer> timerAlerts; QPointer<QTimer> timerAlerts;
QPointer<QTimer> fastResumeSaver;
QPointer<QTimer> BigRatioTimer; QPointer<QTimer> BigRatioTimer;
bool DHTEnabled; bool DHTEnabled;
QPointer<downloadThread> downloader; QPointer<downloadThread> downloader;
@ -174,8 +170,6 @@ class bittorrent : public QObject {
void deleteBigRatios(); void deleteBigRatios();
signals: signals:
//void invalidTorrent(QString path);
//void duplicateTorrent(QString path);
void addedTorrent(QTorrentHandle& h); void addedTorrent(QTorrentHandle& h);
void deletedTorrent(QString hash); void deletedTorrent(QString hash);
void pausedTorrent(QString hash); void pausedTorrent(QString hash);
@ -183,26 +177,16 @@ class bittorrent : public QObject {
void finishedTorrent(QTorrentHandle& h); void finishedTorrent(QTorrentHandle& h);
void fullDiskError(QTorrentHandle& h); void fullDiskError(QTorrentHandle& h);
void trackerError(QString hash, QString time, QString msg); void trackerError(QString hash, QString time, QString msg);
//void portListeningFailure();
void trackerAuthenticationRequired(QTorrentHandle& h); void trackerAuthenticationRequired(QTorrentHandle& h);
void scanDirFoundTorrents(const QStringList& pathList); void scanDirFoundTorrents(const QStringList& pathList);
void newDownloadedTorrent(QString path, QString url); void newDownloadedTorrent(QString path, QString url);
//void aboutToDownloadFromUrl(QString url);
void updateFileSize(QString hash); void updateFileSize(QString hash);
//void peerBlocked(QString);
void downloadFromUrlFailure(QString url, QString reason); void downloadFromUrlFailure(QString url, QString reason);
//void fastResumeDataRejected(QString name);
//void urlSeedProblem(QString url, QString msg);
void torrentFinishedChecking(QString hash); void torrentFinishedChecking(QString hash);
//void torrent_ratio_deleted(QString fileName);
//void UPnPError(QString msg);
//void UPnPSuccess(QString msg);
void updateFinishedTorrentNumber(); void updateFinishedTorrentNumber();
void updateUnfinishedTorrentNumber(); void updateUnfinishedTorrentNumber();
void forceUnfinishedListUpdate(); void forceUnfinishedListUpdate();
void forceFinishedListUpdate(); void forceFinishedListUpdate();
/*void torrentSwitchedtoFinished(QString hash);
void torrentSwitchedtoUnfinished(QString hash);*/
}; };
#endif #endif

Loading…
Cancel
Save