- Added Encryption support!

- Removed old UPnP code
- Removed UPnP in options since libtorrent doesn't allow to disable it. Thus, UPnP is always enabled
- Made options window a bit larger
- Added Arnaud Demaiziere to developpers list
- Updated TODO & Changelog

src/options_imp.h

@@ -59,10 +59,7 @@ class options_imp : public QDialog, private Ui::Dialog{
     QString getScanDir() const;
     bool isDHTEnabled() const;
     int getDHTPort() const;
-#ifndef NO_UPNP
-    bool isUPnPEnabled() const;
-    int getUPnPPort() const;
-#endif
+    int getEncryptionSetting() const;
     bool isPeXDisabled() const;
     // Filter Settings
     bool isFilteringEnabled() const;
@@ -105,9 +102,6 @@ class options_imp : public QDialog, private Ui::Dialog{
     void on_filterBrowse_clicked();
     void disableDownload(int checkBoxValue);
     void disableDHTGroup(int checkBoxValue);
-#ifndef NO_UPNP
-    void disableUPnPGroup(int checkBoxValue);
-#endif
     void disableMaxConnecLimit(int);
     void enableFilter(int checkBoxValue);
     void disableUpload(int checkBoxValue);