- Namespaced QBittorrentSession and QTorrentHandle to avoid possible future conflicts

[qtrapids] / src / engine / QBittorrentSession.h

diff --git a/src/engine/QBittorrentSession.h b/src/engine/QBittorrentSession.h
index a6b6ac2..7d2ea43 100644 (file)
--- a/src/engine/QBittorrentSession.h
+++ b/src/engine/QBittorrentSession.h
@@ -26,6 +26,7 @@
 
 #include <libtorrent/session.hpp>
 #include <libtorrent/torrent_info.hpp>
+#include <libtorrent/alert_types.hpp>
 
 #include "QTorrentHandle.h"
 
@@ -34,9 +35,13 @@
 class AlertWaiterThread;
 typedef libtorrent::session TorrentSession;
 typedef libtorrent::add_torrent_params AddTorrentParams;
-typedef libtorrent::alert TorrentAlert;
+typedef libtorrent::alert Alert;
+typedef        libtorrent::torrent_alert TorrentAlert;
+typedef libtorrent::sha1_hash Sha1Hash;
 
 
+namespace qtrapids {
+
 /**
        @author Lassi Väätämöinen <lassi.vaatamoinen@ixonos.com>
 */
@@ -49,13 +54,14 @@ class QBittorrentSession : public QObject {
     ~QBittorrentSession();
                
                /// @brief Add torrent to session.
-               QTorrentHandle addTorrent(AddTorrentParams const& params);
+               qtrapids::QTorrentHandle addTorrent(AddTorrentParams const& params);
+               void removeTorrent(qtrapids::QTorrentHandle const& handle);
                
        signals:
-               void alert(std::auto_ptr<TorrentAlert> al);
+               void alert(std::auto_ptr<Alert> al);
                
        private slots:
-               void on_alert(TorrentAlert const *al);
+               void on_alert(Alert const *al);
                
        private:
                TorrentSession btSession_;
@@ -63,4 +69,5 @@ class QBittorrentSession : public QObject {
                
 };
 
+} //namespace qtrapids
 #endif