Changeset 13869

Timestamp:

Jan 26, 2013, 1:19:54 AM (8 years ago)

Author:

jordan

Message:

(qt) copyediting: modify more files to the new indentation/whitespace formatting

Location:

trunk/qt

Files:

• about.cc (modified) (1 diff)
• about.h (modified) (1 diff)
• app.cc (modified) (8 diffs)
• app.h (modified) (1 diff)
• details.cc (modified) (38 diffs)
• details.h (modified) (1 diff)
• filterbar.cc (modified) (9 diffs)
• filterbar.h (modified) (3 diffs)
• prefs.h (modified) (1 diff)

trunk/qt/about.cc

@@ -29 +29 @@
 #include "license.h"
 
-AboutDialog :: AboutDialog( QWidget * parent ):
-    QDialog( parent, Qt::Dialog ),
-    myLicenseDialog( new LicenseDialog( this ) )
+AboutDialog :: AboutDialog (QWidget * parent):
+  QDialog (parent, Qt::Dialog),
+  myLicenseDialog (new LicenseDialog (this))
 {
-    setWindowTitle( tr( "About Transmission" ) );
-    QLabel * l;
-    QVBoxLayout * v = new QVBoxLayout( this );
+  setWindowTitle (tr ("About Transmission"));
+  QLabel * l;
+  QVBoxLayout * v = new QVBoxLayout (this);
 
-    l = new QLabel;
-    l->setPixmap( QPixmap( QString::fromAscii( ":/icons/transmission-48.png" ) ) );
-    l->setAlignment( Qt::AlignCenter );
-    v->addWidget( l );
+  l = new QLabel;
+  l->setPixmap (QPixmap (QString::fromAscii (":/icons/transmission-48.png")));
+  l->setAlignment (Qt::AlignCenter);
+  v->addWidget (l);
 
-    QFont f( font( ) );
-    f.setWeight( QFont::Bold );
-    f.setPointSize( int( f.pointSize( ) * 1.2 ) );
-    l = new QLabel( tr( "<big>Transmission %1</big>" ).arg( QString::fromAscii( LONG_VERSION_STRING ) ) );
-    l->setAlignment( Qt::AlignCenter );
-    l->setFont( f );
-    l->setMargin( 8 );
-    v->addWidget( l );
+  QFont f (font ());
+  f.setWeight (QFont::Bold);
+  f.setPointSize (int (f.pointSize () * 1.2));
+  l = new QLabel (tr ("<big>Transmission %1</big>").arg (QString::fromAscii (LONG_VERSION_STRING)));
+  l->setAlignment (Qt::AlignCenter);
+  l->setFont (f);
+  l->setMargin (8);
+  v->addWidget (l);
 
-    l = new QLabel( tr( "A fast and easy BitTorrent client" ) );
-    l->setStyleSheet( QString::fromAscii( "text-align: center" ) );
-    l->setAlignment( Qt::AlignCenter );
-    v->addWidget( l );
+  l = new QLabel (tr ("A fast and easy BitTorrent client"));
+  l->setStyleSheet (QString::fromAscii ("text-align: center"));
+  l->setAlignment (Qt::AlignCenter);
+  v->addWidget (l);
 
-    l = new QLabel( tr( "Copyright (c) The Transmission Project" ) );
-    l->setAlignment( Qt::AlignCenter );
-    v->addWidget( l );
+  l = new QLabel (tr ("Copyright (c) The Transmission Project"));
+  l->setAlignment (Qt::AlignCenter);
+  v->addWidget (l);
 
-    l = new QLabel( QString::fromAscii( "<a href=\"http://www.transmissionbt.com/\">http://www.transmissionbt.com/</a>" ) );
-    l->setOpenExternalLinks( true );
-    l->setAlignment( Qt::AlignCenter );
-    v->addWidget( l );
+  l = new QLabel (QString::fromAscii ("<a href=\"http://www.transmissionbt.com/\">http://www.transmissionbt.com/</a>"));
+  l->setOpenExternalLinks (true);
+  l->setAlignment (Qt::AlignCenter);
+  v->addWidget (l);
 
-    v->addSpacing( HIG::PAD_BIG );
+  v->addSpacing (HIG::PAD_BIG);
 
-    QPushButton * b;
-    QDialogButtonBox * box = new QDialogButtonBox;
+  QPushButton * b;
+  QDialogButtonBox * box = new QDialogButtonBox;
 
-    b = new QPushButton( tr( "C&redits" ), this );
-    box->addButton( b, QDialogButtonBox::ActionRole );
-    connect( b, SIGNAL(clicked()), this, SLOT(showCredits()) );
+  b = new QPushButton (tr ("C&redits"), this);
+  box->addButton (b, QDialogButtonBox::ActionRole);
+  connect (b, SIGNAL (clicked ()), this, SLOT (showCredits ()));
 
-    b = new QPushButton( tr( "&License" ), this );
-    box->addButton( b, QDialogButtonBox::ActionRole );
-    connect( b, SIGNAL(clicked()), myLicenseDialog, SLOT(show()) );
+  b = new QPushButton (tr ("&License"), this);
+  box->addButton (b, QDialogButtonBox::ActionRole);
+  connect (b, SIGNAL (clicked ()), myLicenseDialog, SLOT (show ()));
 
-    box->addButton( QDialogButtonBox::Close );
-    box->setCenterButtons( true );
-    v->addWidget( box );
-    connect( box, SIGNAL(rejected()), this, SLOT(hide()) );
+  box->addButton (QDialogButtonBox::Close);
+  box->setCenterButtons (true);
+  v->addWidget (box);
+  connect (box, SIGNAL (rejected ()), this, SLOT (hide ()));
 }
 
 void
-AboutDialog :: showCredits( )
+AboutDialog :: showCredits ()
 {
-    QMessageBox::about( this, tr( "Credits" ),
-        QString::fromAscii( "Jordan Lee (Backend; Daemon; GTK+; Qt)\n"
-                            "Michell Livingston (Backend; OS X)\n"
-                            "Kevin Glowacz (Web client)" ) );
+  QMessageBox::about (
+    this,
+    tr ("Credits"),
+    QString::fromAscii ("Jordan Lee (Backend; Daemon; GTK+; Qt)\n"
+                        "Michell Livingston (OS X)\n"));
 }
 

trunk/qt/about.h

@@ -18 +18 @@
 class AboutDialog: public QDialog
 {
-        Q_OBJECT
+    Q_OBJECT
 
-    private:
-        QDialog * myLicenseDialog;
+  private:
+    QDialog * myLicenseDialog;
 
-    public:
-        AboutDialog( QWidget * parent = 0 );
-        ~AboutDialog( ) { }
-        QWidget * createAboutTab( );
-        QWidget * createAuthorsTab( );
-        QWidget * createLicenseTab( );
+  public:
+    AboutDialog (QWidget * parent = 0);
+    ~AboutDialog () {}
+    QWidget * createAboutTab ();
+    QWidget * createAuthorsTab ();
+    QWidget * createLicenseTab ();
 
-    public slots:
-        void showCredits( );
+  public slots:
+    void showCredits ();
 
 };

trunk/qt/app.cc

@@ -46 +46 @@
 namespace
 {
-    const QString DBUS_SERVICE     = QString::fromAscii( "com.transmissionbt.Transmission"  );
-    const QString DBUS_OBJECT_PATH = QString::fromAscii( "/com/transmissionbt/Transmission" );
-    const QString DBUS_INTERFACE   = QString::fromAscii( "com.transmissionbt.Transmission"  );
-
-    const char * MY_READABLE_NAME( "transmission-qt" );
-
-    const tr_option opts[] =
-    {
-        { 'g', "config-dir", "Where to look for configuration files", "g", 1, "<path>" },
-        { 'm', "minimized",  "Start minimized in system tray", "m", 0, NULL },
-        { 'p', "port",  "Port to use when connecting to an existing session", "p", 1, "<port>" },
-        { 'r', "remote",  "Connect to an existing session at the specified hostname", "r", 1, "<host>" },
-        { 'u', "username", "Username to use when connecting to an existing session", "u", 1, "<username>" },
-        { 'v', "version", "Show version number and exit", "v", 0, NULL },
-        { 'w', "password", "Password to use when connecting to an existing session", "w", 1, "<password>" },
-        { 0, NULL, NULL, NULL, 0, NULL }
-    };
-
-    const char*
-    getUsage( void )
-    {
-        return "Usage:\n"
-               "  transmission [OPTIONS...] [torrent files]";
-    }
-
-    void
-    showUsage( void )
-    {
-        tr_getopt_usage( MY_READABLE_NAME, getUsage( ), opts );
-        exit( 0 );
-    }
-
-    enum
-    {
-        STATS_REFRESH_INTERVAL_MSEC = 3000,
-        SESSION_REFRESH_INTERVAL_MSEC = 3000,
-        MODEL_REFRESH_INTERVAL_MSEC = 3000
-    };
-}
-
-MyApp :: MyApp( int& argc, char ** argv ):
-    QApplication( argc, argv ),
-    myLastFullUpdateTime( 0 )
-{
-    const QString MY_CONFIG_NAME = QString::fromAscii( "transmission" );
-
-    setApplicationName( MY_CONFIG_NAME );
-
-    // install the qt translator
-    qtTranslator.load( "qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-    installTranslator( &qtTranslator );
-
-    // install the transmission translator
-    appTranslator.load( QString(MY_CONFIG_NAME) + "_" + QLocale::system().name(), QCoreApplication::applicationDirPath() + "/translations" );
-    installTranslator( &appTranslator );
-
-    Formatter::initUnits( );
-
-    // set the default icon
-    QIcon icon;
-    QList<int> sizes;
-    sizes << 16 << 22 << 24 << 32 << 48 << 64 << 72 << 96 << 128 << 192 << 256;
-    foreach( int size, sizes )
-        icon.addPixmap( QPixmap( QString::fromAscii(":/icons/transmission-%1.png" ).arg(size) ) );
-    setWindowIcon( icon );
-
-    // parse the command-line arguments
-    int c;
-    bool minimized = false;
-    const char * optarg;
-    const char * host = 0;
-    const char * port = 0;
-    const char * username = 0;
-    const char * password = 0;
-    const char * configDir = 0;
-    QStringList filenames;
-    while( ( c = tr_getopt( getUsage( ), argc, (const char**)argv, opts, &optarg ) ) ) {
-        switch( c ) {
-            case 'g': configDir = optarg; break;
-            case 'p': port = optarg; break;
-            case 'r': host = optarg; break;
-            case 'u': username = optarg; break;
-            case 'w': password = optarg; break;
-            case 'm': minimized = true; break;
-            case 'v': std::cerr << MY_READABLE_NAME << ' ' << LONG_VERSION_STRING << std::endl; ::exit( 0 ); break;
-            case TR_OPT_ERR: Utils::toStderr( QObject::tr( "Invalid option" ) ); showUsage( ); break;
-            default:         filenames.append( optarg ); break;
+  const QString DBUS_SERVICE     = QString::fromAscii ("com.transmissionbt.Transmission" );
+  const QString DBUS_OBJECT_PATH = QString::fromAscii ("/com/transmissionbt/Transmission");
+  const QString DBUS_INTERFACE   = QString::fromAscii ("com.transmissionbt.Transmission" );
+
+  const char * MY_READABLE_NAME ("transmission-qt");
+
+  const tr_option opts[] =
+  {
+    { 'g', "config-dir", "Where to look for configuration files", "g", 1, "<path>" },
+    { 'm', "minimized",  "Start minimized in system tray", "m", 0, NULL },
+    { 'p', "port",  "Port to use when connecting to an existing session", "p", 1, "<port>" },
+    { 'r', "remote",  "Connect to an existing session at the specified hostname", "r", 1, "<host>" },
+    { 'u', "username", "Username to use when connecting to an existing session", "u", 1, "<username>" },
+    { 'v', "version", "Show version number and exit", "v", 0, NULL },
+    { 'w', "password", "Password to use when connecting to an existing session", "w", 1, "<password>" },
+    { 0, NULL, NULL, NULL, 0, NULL }
+  };
+
+  const char*
+  getUsage (void)
+  {
+    return "Usage:\n"
+           "  transmission [OPTIONS...] [torrent files]";
+  }
+
+  void
+  showUsage (void)
+  {
+    tr_getopt_usage (MY_READABLE_NAME, getUsage (), opts);
+    exit (0);
+  }
+
+  enum
+  {
+    STATS_REFRESH_INTERVAL_MSEC   = 3000,
+    SESSION_REFRESH_INTERVAL_MSEC = 3000,
+    MODEL_REFRESH_INTERVAL_MSEC   = 3000
+  };
+}
+
+MyApp :: MyApp (int& argc, char ** argv):
+  QApplication (argc, argv),
+  myLastFullUpdateTime (0)
+{
+  const QString MY_CONFIG_NAME = QString::fromAscii ("transmission");
+
+  setApplicationName (MY_CONFIG_NAME);
+
+  // install the qt translator
+  qtTranslator.load ("qt_" + QLocale::system ().name (), QLibraryInfo::location (QLibraryInfo::TranslationsPath));
+  installTranslator (&qtTranslator);
+
+  // install the transmission translator
+  appTranslator.load (QString (MY_CONFIG_NAME) + "_" + QLocale::system ().name (), QCoreApplication::applicationDirPath () + "/translations");
+  installTranslator (&appTranslator);
+
+  Formatter::initUnits ();
+
+  // set the default icon
+  QIcon icon;
+  QList<int> sizes;
+  sizes << 16 << 22 << 24 << 32 << 48 << 64 << 72 << 96 << 128 << 192 << 256;
+  foreach (int size, sizes)
+    icon.addPixmap (QPixmap (QString::fromAscii (":/icons/transmission-%1.png").arg (size)));
+  setWindowIcon (icon);
+
+  // parse the command-line arguments
+  int c;
+  bool minimized = false;
+  const char * optarg;
+  const char * host = 0;
+  const char * port = 0;
+  const char * username = 0;
+  const char * password = 0;
+  const char * configDir = 0;
+  QStringList filenames;
+  while ((c = tr_getopt (getUsage(), argc, (const char**)argv, opts, &optarg)))
+    {
+      switch (c)
+        {
+          case 'g': configDir = optarg; break;
+          case 'p': port = optarg; break;
+          case 'r': host = optarg; break;
+          case 'u': username = optarg; break;
+          case 'w': password = optarg; break;
+          case 'm': minimized = true; break;
+          case 'v': std::cerr << MY_READABLE_NAME << ' ' << LONG_VERSION_STRING << std::endl; ::exit (0); break;
+          case TR_OPT_ERR: Utils::toStderr (QObject::tr ("Invalid option")); showUsage (); break;
+          default:         filenames.append (optarg); break;
         }
     }
 
-    // set the fallback config dir
-    if( configDir == 0 )
-        configDir = tr_getDefaultConfigDir( "transmission" );
-
-    // ensure our config directory exists
-    QDir dir( configDir );
-    if( !dir.exists() )
-        dir.mkpath( configDir );
-
-    // is this the first time we've run transmission?
-    const bool firstTime = !QFile(QDir(configDir).absoluteFilePath("settings.json")).exists();
-
-    // initialize the prefs
-    myPrefs = new Prefs ( configDir );
-    if( host != 0 )
-        myPrefs->set( Prefs::SESSION_REMOTE_HOST, host );
-    if( port != 0 )
-        myPrefs->set( Prefs::SESSION_REMOTE_PORT, port );
-    if( username != 0 )
-        myPrefs->set( Prefs::SESSION_REMOTE_USERNAME, username );
-    if( password != 0 )
-        myPrefs->set( Prefs::SESSION_REMOTE_PASSWORD, password );
-    if( ( host != 0 ) || ( port != 0 ) || ( username != 0 ) || ( password != 0 ) )
-        myPrefs->set( Prefs::SESSION_IS_REMOTE, true );
-    if ( myPrefs->getBool( Prefs::START_MINIMIZED) )
-        minimized = true;
-
-    // start as minimized only if the system tray present
-    if ( !myPrefs->getBool( Prefs::SHOW_TRAY_ICON ) )
-      minimized = false;
-
-    mySession = new Session( configDir, *myPrefs );
-    myModel = new TorrentModel( *myPrefs );
-    myWindow = new TrMainWindow( *mySession, *myPrefs, *myModel, minimized );
-    myWatchDir = new WatchDir( *myModel );
-
-    // when the session gets torrent info, update the model
-    connect( mySession, SIGNAL(torrentsUpdated(tr_variant*,bool)), myModel, SLOT(updateTorrents(tr_variant*,bool)) );
-    connect( mySession, SIGNAL(torrentsUpdated(tr_variant*,bool)), myWindow, SLOT(refreshActionSensitivity()) );
-    connect( mySession, SIGNAL(torrentsRemoved(tr_variant*)), myModel, SLOT(removeTorrents(tr_variant*)) );
-    // when the session source gets changed, request a full refresh
-    connect( mySession, SIGNAL(sourceChanged()), this, SLOT(onSessionSourceChanged()) );
-    // when the model sees a torrent for the first time, ask the session for full info on it
-    connect( myModel, SIGNAL(torrentsAdded(QSet<int>)), mySession, SLOT(initTorrents(QSet<int>)) );
-    connect( myModel, SIGNAL(torrentsAdded(QSet<int>)), this, SLOT(onTorrentsAdded(QSet<int>)) );
-
-    mySession->initTorrents( );
-    mySession->refreshSessionStats( );
-
-    // when torrents are added to the watch directory, tell the session
-    connect( myWatchDir, SIGNAL(torrentFileAdded(QString)), this, SLOT(addTorrent(QString)) );
-
-    // init from preferences
-    QList<int> initKeys;
-    initKeys << Prefs::DIR_WATCH;
-    foreach( int key, initKeys )
-        refreshPref( key );
-    connect( myPrefs, SIGNAL(changed(int)), this, SLOT(refreshPref(const int)) );
-
-    QTimer * timer = &myModelTimer;
-    connect( timer, SIGNAL(timeout()), this, SLOT(refreshTorrents()) );
-    timer->setSingleShot( false );
-    timer->setInterval( MODEL_REFRESH_INTERVAL_MSEC );
-    timer->start( );
-
-    timer = &myStatsTimer;
-    connect( timer, SIGNAL(timeout()), mySession, SLOT(refreshSessionStats()) );
-    timer->setSingleShot( false );
-    timer->setInterval( STATS_REFRESH_INTERVAL_MSEC );
-    timer->start( );
-
-    timer = &mySessionTimer;
-    connect( timer, SIGNAL(timeout()), mySession, SLOT(refreshSessionInfo()) );
-    timer->setSingleShot( false );
-    timer->setInterval( SESSION_REFRESH_INTERVAL_MSEC );
-    timer->start( );
-
-    maybeUpdateBlocklist( );
-
-    if( !firstTime )
-        mySession->restart( );
-    else {
-        QDialog * d = new SessionDialog( *mySession, *myPrefs, myWindow );
-        d->show( );
-    }
-
-    if( !myPrefs->getBool( Prefs::USER_HAS_GIVEN_INFORMED_CONSENT ))
-    {
-        QDialog * dialog = new QDialog( myWindow );
-        dialog->setModal( true );
-        QVBoxLayout * v = new QVBoxLayout( dialog );
-        QLabel * l = new QLabel(tr("Transmission is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility."));
-        l->setWordWrap( true );
-        v->addWidget( l );
-        QDialogButtonBox * box = new QDialogButtonBox;
-        box->addButton( new QPushButton( tr( "&Cancel" ) ), QDialogButtonBox::RejectRole );
-        QPushButton * agree = new QPushButton( tr( "I &Agree" ) );
-        agree->setDefault( true );
-        box->addButton( agree, QDialogButtonBox::AcceptRole );
-        box->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
-        box->setOrientation( Qt::Horizontal );
-        v->addWidget( box );
-        connect( box, SIGNAL(rejected()), this, SLOT(quit()) );
-        connect( box, SIGNAL(accepted()), dialog, SLOT(deleteLater()) );
-        connect( box, SIGNAL(accepted()), this, SLOT(consentGiven()) );
-        dialog->show();
-    }
-
-    for( QStringList::const_iterator it=filenames.begin(), end=filenames.end(); it!=end; ++it )
-        addTorrent( *it );
-
-    // register as the dbus handler for Transmission
-    new TrDBusAdaptor( this );
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    if( !bus.registerService( DBUS_SERVICE ) )
-        std::cerr << "couldn't register " << qPrintable(DBUS_SERVICE) << std::endl;
-    if( !bus.registerObject( DBUS_OBJECT_PATH, this ) )
-        std::cerr << "couldn't register " << qPrintable(DBUS_OBJECT_PATH) << std::endl;
+  // set the fallback config dir
+  if (configDir == 0)
+    configDir = tr_getDefaultConfigDir ("transmission");
+
+  // ensure our config directory exists
+  QDir dir (configDir);
+  if (!dir.exists ())
+    dir.mkpath (configDir);
+
+  // is this the first time we've run transmission?
+  const bool firstTime = !QFile (QDir (configDir).absoluteFilePath ("settings.json")).exists ();
+
+  // initialize the prefs
+  myPrefs = new Prefs (configDir);
+  if (host != 0)
+    myPrefs->set (Prefs::SESSION_REMOTE_HOST, host);
+  if (port != 0)
+    myPrefs->set (Prefs::SESSION_REMOTE_PORT, port);
+  if (username != 0)
+    myPrefs->set (Prefs::SESSION_REMOTE_USERNAME, username);
+  if (password != 0)
+    myPrefs->set (Prefs::SESSION_REMOTE_PASSWORD, password);
+  if ((host != 0) || (port != 0) || (username != 0) || (password != 0))
+    myPrefs->set (Prefs::SESSION_IS_REMOTE, true);
+  if (myPrefs->getBool (Prefs::START_MINIMIZED))
+    minimized = true;
+
+  // start as minimized only if the system tray present
+  if (!myPrefs->getBool (Prefs::SHOW_TRAY_ICON))
+    minimized = false;
+
+  mySession = new Session (configDir, *myPrefs);
+  myModel = new TorrentModel (*myPrefs);
+  myWindow = new TrMainWindow (*mySession, *myPrefs, *myModel, minimized);
+  myWatchDir = new WatchDir (*myModel);
+
+  // when the session gets torrent info, update the model
+  connect (mySession, SIGNAL (torrentsUpdated (tr_variant*,bool)), myModel, SLOT (updateTorrents (tr_variant*,bool)));
+  connect (mySession, SIGNAL (torrentsUpdated (tr_variant*,bool)), myWindow, SLOT (refreshActionSensitivity ()));
+  connect (mySession, SIGNAL (torrentsRemoved (tr_variant*)), myModel, SLOT (removeTorrents (tr_variant*)));
+  // when the session source gets changed, request a full refresh
+  connect (mySession, SIGNAL (sourceChanged ()), this, SLOT (onSessionSourceChanged ()));
+  // when the model sees a torrent for the first time, ask the session for full info on it
+  connect (myModel, SIGNAL (torrentsAdded (QSet<int>)), mySession, SLOT (initTorrents (QSet<int>)));
+  connect (myModel, SIGNAL (torrentsAdded (QSet<int>)), this, SLOT (onTorrentsAdded (QSet<int>)));
+
+  mySession->initTorrents ();
+  mySession->refreshSessionStats ();
+
+  // when torrents are added to the watch directory, tell the session
+  connect (myWatchDir, SIGNAL (torrentFileAdded (QString)), this, SLOT (addTorrent (QString)));
+
+  // init from preferences
+  QList<int> initKeys;
+  initKeys << Prefs::DIR_WATCH;
+  foreach (int key, initKeys)
+    refreshPref (key);
+  connect (myPrefs, SIGNAL (changed (int)), this, SLOT (refreshPref (const int)));
+
+  QTimer * timer = &myModelTimer;
+  connect (timer, SIGNAL (timeout ()), this, SLOT (refreshTorrents ()));
+  timer->setSingleShot (false);
+  timer->setInterval (MODEL_REFRESH_INTERVAL_MSEC);
+  timer->start ();
+
+  timer = &myStatsTimer;
+  connect (timer, SIGNAL (timeout ()), mySession, SLOT (refreshSessionStats ()));
+  timer->setSingleShot (false);
+  timer->setInterval (STATS_REFRESH_INTERVAL_MSEC);
+  timer->start ();
+
+  timer = &mySessionTimer;
+  connect (timer, SIGNAL (timeout ()), mySession, SLOT (refreshSessionInfo ()));
+  timer->setSingleShot (false);
+  timer->setInterval (SESSION_REFRESH_INTERVAL_MSEC);
+  timer->start ();
+
+  maybeUpdateBlocklist ();
+
+  if (!firstTime)
+    {
+      mySession->restart ();
+    }
+  else
+    {
+      QDialog * d = new SessionDialog (*mySession, *myPrefs, myWindow);
+      d->show ();
+    }
+
+  if (!myPrefs->getBool (Prefs::USER_HAS_GIVEN_INFORMED_CONSENT))
+    {
+      QDialog * dialog = new QDialog (myWindow);
+      dialog->setModal (true);
+      QVBoxLayout * v = new QVBoxLayout (dialog);
+      QLabel * l = new QLabel (tr ("Transmission is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility."));
+      l->setWordWrap (true);
+      v->addWidget (l);
+      QDialogButtonBox * box = new QDialogButtonBox;
+      box->addButton (new QPushButton (tr ("&Cancel")), QDialogButtonBox::RejectRole);
+      QPushButton * agree = new QPushButton (tr ("I &Agree"));
+      agree->setDefault (true);
+      box->addButton (agree, QDialogButtonBox::AcceptRole);
+      box->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
+      box->setOrientation (Qt::Horizontal);
+      v->addWidget (box);
+      connect (box, SIGNAL (rejected ()), this, SLOT (quit ()));
+      connect (box, SIGNAL (accepted ()), dialog, SLOT (deleteLater ()));
+      connect (box, SIGNAL (accepted ()), this, SLOT (consentGiven ()));
+      dialog->show ();
+    }
+
+  for (QStringList::const_iterator it=filenames.begin (), end=filenames.end (); it!=end; ++it)
+    addTorrent (*it);
+
+  // register as the dbus handler for Transmission
+  new TrDBusAdaptor (this);
+  QDBusConnection bus = QDBusConnection::sessionBus ();
+  if (!bus.registerService (DBUS_SERVICE))
+    std::cerr << "couldn't register " << qPrintable (DBUS_SERVICE) << std::endl;
+  if (!bus.registerObject (DBUS_OBJECT_PATH, this))
+    std::cerr << "couldn't register " << qPrintable (DBUS_OBJECT_PATH) << std::endl;
 }
 
@@ -259 +264 @@
 
 void
-MyApp :: onTorrentsAdded( QSet<int> torrents )
-{
-    if( !myPrefs->getBool( Prefs::SHOW_NOTIFICATION_ON_ADD ) )
-        return;
-
-    foreach( int id, torrents )
-    {
-        Torrent * tor = myModel->getTorrentFromId( id );
-
-        if( tor->name().isEmpty( ) ) // wait until the torrent's INFO fields are loaded
-            connect( tor, SIGNAL(torrentChanged(int)), this, SLOT(onNewTorrentChanged(int)) );
-        else {
-            onNewTorrentChanged( id );
-            if( !tor->isSeed( ) )
-                connect( tor, SIGNAL(torrentCompleted(int)), this, SLOT(onTorrentCompleted(int)) );
+MyApp :: onTorrentsAdded (QSet<int> torrents)
+{
+  if (!myPrefs->getBool (Prefs::SHOW_NOTIFICATION_ON_ADD))
+    return;
+
+  foreach (int id, torrents)
+    {
+      Torrent * tor = myModel->getTorrentFromId (id);
+
+      if (tor->name ().isEmpty ()) // wait until the torrent's INFO fields are loaded
+        {
+          connect (tor, SIGNAL (torrentChanged (int)), this, SLOT (onNewTorrentChanged (int)));
         }
-    }
-}
-
-void
-MyApp :: onTorrentCompleted( int id )
+      else
+        {
+          onNewTorrentChanged (id);
+
+          if (!tor->isSeed ())
+            connect (tor, SIGNAL (torrentCompleted (int)), this, SLOT (onTorrentCompleted (int)));
+        }
+    }
+}
+
+void
+MyApp :: onTorrentCompleted (int id)
 {
   Torrent * tor = myModel->getTorrentFromId (id);
@@ -286 +295 @@
     {
       if (myPrefs->getBool (Prefs::SHOW_NOTIFICATION_ON_COMPLETE))
-        notify (tr("Torrent Completed"), tor->name());
+        notify (tr ("Torrent Completed"), tor->name ());
 
       if (myPrefs->getBool (Prefs::COMPLETE_SOUND_ENABLED))
         {
-#if defined( Q_OS_WIN ) || defined( Q_OS_MAC )
-          QApplication::beep();
+#if defined (Q_OS_WIN) || defined (Q_OS_MAC)
+          QApplication::beep ();
 #else
-          QProcess::execute (myPrefs->getString(Prefs::COMPLETE_SOUND_COMMAND));
+          QProcess::execute (myPrefs->getString (Prefs::COMPLETE_SOUND_COMMAND));
 #endif
         }
 
-      disconnect( tor, SIGNAL(torrentCompleted(int)), this, SLOT(onTorrentCompleted(int)) );
-    }
-}
-
-void
-MyApp :: onNewTorrentChanged( int id )
-{
-    Torrent * tor = myModel->getTorrentFromId( id );
-
-    if( tor && !tor->name().isEmpty() )
-    {
-        const int age_secs = tor->dateAdded().secsTo(QDateTime::currentDateTime());
-        if( age_secs < 30 )
-            notify( tr( "Torrent Added" ), tor->name( ) );
-
-        disconnect( tor, SIGNAL(torrentChanged(int)), this, SLOT(onNewTorrentChanged(int)) );
-
-        if( !tor->isSeed( ) )
-            connect( tor, SIGNAL(torrentCompleted(int)), this, SLOT(onTorrentCompleted(int)) );
+      disconnect (tor, SIGNAL (torrentCompleted (int)), this, SLOT (onTorrentCompleted (int)));
+    }
+}
+
+void
+MyApp :: onNewTorrentChanged (int id)
+{
+  Torrent * tor = myModel->getTorrentFromId (id);
+
+  if (tor && !tor->name ().isEmpty ())
+    {
+      const int age_secs = tor->dateAdded ().secsTo (QDateTime::currentDateTime ());
+      if (age_secs < 30)
+        notify (tr ("Torrent Added"), tor->name ());
+
+      disconnect (tor, SIGNAL (torrentChanged (int)), this, SLOT (onNewTorrentChanged (int)));
+
+      if (!tor->isSeed ())
+        connect (tor, SIGNAL (torrentCompleted (int)), this, SLOT (onTorrentCompleted (int)));
     }
 }
@@ -324 +333 @@
 
 void
-MyApp :: consentGiven( )
-{
-    myPrefs->set<bool>( Prefs::USER_HAS_GIVEN_INFORMED_CONSENT, true );
-}
-
-MyApp :: ~MyApp( )
-{
-    const QRect mainwinRect( myWindow->geometry( ) );
-    delete myWatchDir;
-    delete myWindow;
-    delete myModel;
-    delete mySession;
-
-    myPrefs->set( Prefs :: MAIN_WINDOW_HEIGHT, std::max( 100, mainwinRect.height( ) ) );
-    myPrefs->set( Prefs :: MAIN_WINDOW_WIDTH, std::max( 100, mainwinRect.width( ) ) );
-    myPrefs->set( Prefs :: MAIN_WINDOW_X, mainwinRect.x( ) );
-    myPrefs->set( Prefs :: MAIN_WINDOW_Y, mainwinRect.y( ) );
-    delete myPrefs;
+MyApp :: consentGiven ()
+{
+  myPrefs->set<bool> (Prefs::USER_HAS_GIVEN_INFORMED_CONSENT, true);
+}
+
+MyApp :: ~MyApp ()
+{
+  const QRect mainwinRect (myWindow->geometry ());
+  delete myWatchDir;
+  delete myWindow;
+  delete myModel;
+  delete mySession;
+
+  myPrefs->set (Prefs :: MAIN_WINDOW_HEIGHT, std::max (100, mainwinRect.height ()));
+  myPrefs->set (Prefs :: MAIN_WINDOW_WIDTH, std::max (100, mainwinRect.width ()));
+  myPrefs->set (Prefs :: MAIN_WINDOW_X, mainwinRect.x ());
+  myPrefs->set (Prefs :: MAIN_WINDOW_Y, mainwinRect.y ());
+  delete myPrefs;
 }
 
@@ -349 +358 @@
 
 void
-MyApp :: refreshPref( int key )
-{
-    switch( key )
-    {
-        case Prefs :: BLOCKLIST_UPDATES_ENABLED:
-            maybeUpdateBlocklist( );
-            break;
-
-        case Prefs :: DIR_WATCH:
-        case Prefs :: DIR_WATCH_ENABLED: {
-            const QString path( myPrefs->getString( Prefs::DIR_WATCH ) );
-            const bool isEnabled( myPrefs->getBool( Prefs::DIR_WATCH_ENABLED ) );
-            myWatchDir->setPath( path, isEnabled );
-            break;
+MyApp :: refreshPref (int key)
+{
+  switch (key)
+    {
+      case Prefs :: BLOCKLIST_UPDATES_ENABLED:
+        maybeUpdateBlocklist ();
+        break;
+
+      case Prefs :: DIR_WATCH:
+      case Prefs :: DIR_WATCH_ENABLED:
+        {
+          const QString path (myPrefs->getString (Prefs::DIR_WATCH));
+          const bool isEnabled (myPrefs->getBool (Prefs::DIR_WATCH_ENABLED));
+          myWatchDir->setPath (path, isEnabled);
+          break;
         }
 
-        default:
-            break;
-    }
-}
-
-void
-MyApp :: maybeUpdateBlocklist( )
-{
-    if( !myPrefs->getBool( Prefs :: BLOCKLIST_UPDATES_ENABLED ) )
-        return;
-
-     const QDateTime lastUpdatedAt = myPrefs->getDateTime( Prefs :: BLOCKLIST_DATE );
-     const QDateTime nextUpdateAt = lastUpdatedAt.addDays( 7 );
-     const QDateTime now = QDateTime::currentDateTime( );
-     if( now < nextUpdateAt )
-     {
-         mySession->updateBlocklist( );
-         myPrefs->set( Prefs :: BLOCKLIST_DATE, now );
-     }
-}
-
-void
-MyApp :: onSessionSourceChanged( )
-{
-    mySession->initTorrents( );
-    mySession->refreshSessionStats( );
-    mySession->refreshSessionInfo( );
-}
-
-void
-MyApp :: refreshTorrents( )
-{
-    // usually we just poll the torrents that have shown recent activity,
-    // but we also periodically ask for updates on the others to ensure
-    // nothing's falling through the cracks.
-    const time_t now = time( NULL );
-    if( myLastFullUpdateTime + 60 >= now )
-        mySession->refreshActiveTorrents( );
-    else {
-        myLastFullUpdateTime = now;
-        mySession->refreshAllTorrents( );
+      default:
+        break;
+    }
+}
+
+void
+MyApp :: maybeUpdateBlocklist ()
+{
+  if (!myPrefs->getBool (Prefs :: BLOCKLIST_UPDATES_ENABLED))
+    return;
+
+  const QDateTime lastUpdatedAt = myPrefs->getDateTime (Prefs :: BLOCKLIST_DATE);
+  const QDateTime nextUpdateAt = lastUpdatedAt.addDays (7);
+  const QDateTime now = QDateTime::currentDateTime ();
+
+  if (now < nextUpdateAt)
+    {
+      mySession->updateBlocklist ();
+      myPrefs->set (Prefs :: BLOCKLIST_DATE, now);
+    }
+}
+
+void
+MyApp :: onSessionSourceChanged ()
+{
+  mySession->initTorrents ();
+  mySession->refreshSessionStats ();
+  mySession->refreshSessionInfo ();
+}
+
+void
+MyApp :: refreshTorrents ()
+{
+  // usually we just poll the torrents that have shown recent activity,
+  // but we also periodically ask for updates on the others to ensure
+  // nothing's falling through the cracks.
+  const time_t now = time (NULL);
+  if (myLastFullUpdateTime + 60 >= now)
+    {
+      mySession->refreshActiveTorrents ();
+    }
+  else
+    {
+      myLastFullUpdateTime = now;
+      mySession->refreshAllTorrents ();
     }
 }
@@ -414 +428 @@
 
 void
-MyApp :: addTorrent( const QString& key )
-{
-    const AddData addme( key );
-
-    if( addme.type != addme.NONE )
-        addTorrent( addme );
-}
-
-void
-MyApp :: addTorrent( const AddData& addme )
-{
-    if( !myPrefs->getBool( Prefs :: OPTIONS_PROMPT ) )
-    {
-        mySession->addTorrent( addme );
-    }
-    else if( addme.type == addme.URL )
-    {
-        myWindow->openURL( addme.url.toString( ) );
-    }
-    else if( addme.type == addme.MAGNET )
-    {
-        myWindow->openURL( addme.magnet );
-    }
-    else
-    {
-        Options * o = new Options( *mySession, *myPrefs, addme, myWindow );
-        o->show( );
-    }
-
-    raise( );
+MyApp :: addTorrent (const QString& key)
+{
+  const AddData addme (key);
+
+  if (addme.type != addme.NONE)
+    addTorrent (addme);
+}
+
+void
+MyApp :: addTorrent (const AddData& addme)
+{
+  if (!myPrefs->getBool (Prefs :: OPTIONS_PROMPT))
+    {
+      mySession->addTorrent (addme);
+    }
+  else if (addme.type == addme.URL)
+    {
+      myWindow->openURL (addme.url.toString ());
+    }
+  else if (addme.type == addme.MAGNET)
+    {
+      myWindow->openURL (addme.magnet);
+    }
+  else
+    {
+      Options * o = new Options (*mySession, *myPrefs, addme, myWindow);
+      o->show ();
+    }
+
+  raise ();
 }
 
@@ -451 +465 @@
 
 void
-MyApp :: raise( )
-{
-    QApplication :: alert ( myWindow );
+MyApp :: raise ()
+{
+  QApplication :: alert (myWindow);
 }
 
 bool
-MyApp :: notify( const QString& title, const QString& body ) const
-{
-    const QString dbusServiceName   = QString::fromAscii( "org.freedesktop.Notifications" );
-    const QString dbusInterfaceName = QString::fromAscii( "org.freedesktop.Notifications" );
-    const QString dbusPath          = QString::fromAscii( "/org/freedesktop/Notifications" );
-
-    QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, QString::fromAscii("Notify"));
-    QList<QVariant> args;
-    args.append( QString::fromAscii( "Transmission" ) ); // app_name
-    args.append( 0U );                                   // replaces_id
-    args.append( QString::fromAscii( "transmission" ) ); // icon
-    args.append( title );                                // summary
-    args.append( body );                                 // body
-    args.append( QStringList( ) );                       // actions - unused for plain passive popups
-    args.append( QVariantMap( ) );                       // hints - unused atm
-    args.append( int32_t(-1) );                          // use the default timeout period
-    m.setArguments( args );
-    QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m);
-    //std::cerr << qPrintable(replyMsg.errorName()) << std::endl;
-    //std::cerr << qPrintable(replyMsg.errorMessage()) << std::endl;
-    return (replyMsg.type() == QDBusMessage::ReplyMessage) && !replyMsg.arguments().isEmpty();
+MyApp :: notify (const QString& title, const QString& body) const
+{
+  const QString dbusServiceName   = QString::fromAscii ("org.freedesktop.Notifications");
+  const QString dbusInterfaceName = QString::fromAscii ("org.freedesktop.Notifications");
+  const QString dbusPath          = QString::fromAscii ("/org/freedesktop/Notifications");
+
+  QDBusMessage m = QDBusMessage::createMethodCall (dbusServiceName, dbusPath, dbusInterfaceName, QString::fromAscii ("Notify"));
+  QList<QVariant> args;
+  args.append (QString::fromAscii ("Transmission")); // app_name
+  args.append (0U);                                   // replaces_id
+  args.append (QString::fromAscii ("transmission")); // icon
+  args.append (title);                                // summary
+  args.append (body);                                 // body
+  args.append (QStringList ());                       // actions - unused for plain passive popups
+  args.append (QVariantMap ());                       // hints - unused atm
+  args.append (int32_t (-1));                          // use the default timeout period
+  m.setArguments (args);
+  QDBusMessage replyMsg = QDBusConnection::sessionBus ().call (m);
+  //std::cerr << qPrintable (replyMsg.errorName ()) << std::endl;
+  //std::cerr << qPrintable (replyMsg.errorMessage ()) << std::endl;
+  return (replyMsg.type () == QDBusMessage::ReplyMessage) && !replyMsg.arguments ().isEmpty ();
 }
 
@@ -485 +499 @@
 
 int
-main( int argc, char * argv[] )
-{
-    // find .torrents, URLs, magnet links, etc in the command-line args
-    int c;
-    QStringList addme;
-    const char * optarg;
-    char ** argvv = argv;
-    while( ( c = tr_getopt( getUsage( ), argc, (const char **)argvv, opts, &optarg ) ) )
-        if( c == TR_OPT_UNK )
-            addme.append( optarg );
-
-    // try to delegate the work to an existing copy of Transmission
-    // before starting ourselves...
-    bool delegated = false;
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    for( int i=0, n=addme.size(); i<n; ++i )
-    {
-        QDBusMessage request = QDBusMessage::createMethodCall( DBUS_SERVICE,
-                                                               DBUS_OBJECT_PATH,
-                                                               DBUS_INTERFACE,
-                                                               QString::fromAscii("AddMetainfo") );
-        QList<QVariant> arguments;
-        AddData a( addme[i] );
-        switch( a.type ) {
-            case AddData::URL:      arguments.push_back( a.url.toString( ) ); break;
-            case AddData::MAGNET:   arguments.push_back( a.magnet ); break;
-            case AddData::FILENAME: arguments.push_back( a.toBase64().constData() ); break;
-            case AddData::METAINFO: arguments.push_back( a.toBase64().constData() ); break;
-            default:                break;
+main (int argc, char * argv[])
+{
+  // find .torrents, URLs, magnet links, etc in the command-line args
+  int c;
+  QStringList addme;
+  const char * optarg;
+  char ** argvv = argv;
+  while ( (c = tr_getopt (getUsage (), argc, (const char **)argvv, opts, &optarg)))
+    if (c == TR_OPT_UNK)
+      addme.append (optarg);
+
+  // try to delegate the work to an existing copy of Transmission
+  // before starting ourselves...
+  bool delegated = false;
+  QDBusConnection bus = QDBusConnection::sessionBus ();
+  for (int i=0, n=addme.size (); i<n; ++i)
+    {
+      QDBusMessage request = QDBusMessage::createMethodCall (DBUS_SERVICE,
+                                                             DBUS_OBJECT_PATH,
+                                                             DBUS_INTERFACE,
+                                                             QString::fromAscii ("AddMetainfo"));
+      QList<QVariant> arguments;
+      AddData a (addme[i]);
+      switch (a.type)
+        {
+          case AddData::URL:      arguments.push_back (a.url.toString ()); break;
+          case AddData::MAGNET:   arguments.push_back (a.magnet); break;
+          case AddData::FILENAME: arguments.push_back (a.toBase64 ().constData ()); break;
+          case AddData::METAINFO: arguments.push_back (a.toBase64 ().constData ()); break;
+          default:                break;
         }
-        request.setArguments( arguments );
-
-        QDBusMessage response = bus.call( request );
-        //std::cerr << qPrintable(response.errorName()) << std::endl;
-        //std::cerr << qPrintable(response.errorMessage()) << std::endl;
-        arguments = response.arguments( );
-        delegated |= (arguments.size()==1) && arguments[0].toBool();
-    }
-
-    if( delegated )
-        return 0;
-
-    tr_optind = 1;
-    MyApp app( argc, argv );
-    return app.exec( );
-}
+      request.setArguments (arguments);
+
+      QDBusMessage response = bus.call (request);
+      //std::cerr << qPrintable (response.errorName ()) << std::endl;
+      //std::cerr << qPrintable (response.errorMessage ()) << std::endl;
+      arguments = response.arguments ();
+      delegated |= (arguments.size ()==1) && arguments[0].toBool ();
+    }
+
+  if (delegated)
+    return 0;
+
+  tr_optind = 1;
+  MyApp app (argc, argv);
+  return app.exec ();
+}

trunk/qt/app.h

@@ -30 +30 @@
 class MyApp: public QApplication
 {
-        Q_OBJECT
+    Q_OBJECT
 
-    public:
-        MyApp( int& argc, char ** argv );
-        virtual ~MyApp( );
+  public:
+    MyApp (int& argc, char ** argv);
+    virtual ~MyApp ();
 
-    public:
-        void raise( );
-        bool notify( const QString& title, const QString& body ) const;
+  public:
+    void raise ();
+    bool notify (const QString& title, const QString& body) const;
 
-    public:
-        Favicons favicons;
+  public:
+    Favicons favicons;
 
-    private:
-        Prefs * myPrefs;
-        Session * mySession;
-        TorrentModel * myModel;
-        TrMainWindow * myWindow;
-        WatchDir * myWatchDir;
-        QTimer myModelTimer;
-        QTimer myStatsTimer;
-        QTimer mySessionTimer;
-        time_t myLastFullUpdateTime;
-        QTranslator qtTranslator;
-        QTranslator appTranslator;
+  private:
+    Prefs * myPrefs;
+    Session * mySession;
+    TorrentModel * myModel;
+    TrMainWindow * myWindow;
+    WatchDir * myWatchDir;
+    QTimer myModelTimer;
+    QTimer myStatsTimer;
+    QTimer mySessionTimer;
+    time_t myLastFullUpdateTime;
+    QTranslator qtTranslator;
+    QTranslator appTranslator;
 
-    private slots:
-        void consentGiven( );
-        void onSessionSourceChanged( );
-        void refreshPref( int key );
-        void refreshTorrents( );
-        void onTorrentsAdded( QSet<int> );
-        void onTorrentCompleted( int );
-        void onNewTorrentChanged( int );
+  private slots:
+    void consentGiven ();
+    void onSessionSourceChanged ();
+    void refreshPref (int key);
+    void refreshTorrents ();
+    void onTorrentsAdded (QSet<int>);
+    void onTorrentCompleted (int);
+    void onNewTorrentChanged (int);
 
-    public slots:
-        void addTorrent( const QString& );
-        void addTorrent( const AddData& );
+  public slots:
+    void addTorrent (const QString&);
+    void addTorrent (const AddData&);
 
-    private:
-        void maybeUpdateBlocklist( );
+  private:
+    void maybeUpdateBlocklist ();
 };
 

trunk/qt/details.cc

@@ -45 +45 @@
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h> // tr_getRatio()
+#include <libtransmission/utils.h> // tr_getRatio ()
 
 #include "details.h"
@@ -71 +71 @@
     const int REFRESH_INTERVAL_MSEC = 4000;
 
-    const char * PREF_KEY( "pref-key" );
+    const char * PREF_KEY ("pref-key");
 
     enum // peer columns
@@ -97 +97 @@
 
     public:
-        virtual ~PeerItem( ) { }
-        PeerItem( const Peer& p ) {
+        virtual ~PeerItem () { }
+        PeerItem (const Peer& p) {
             peer = p;
             int q[4];
-            if( sscanf( p.address.toUtf8().constData(), "%d.%d.%d.%d", q+0, q+1, q+2, q+3 ) == 4 )
-                collatedAddress.sprintf( "%03d.%03d.%03d.%03d", q[0], q[1], q[2], q[3] );
+            if (sscanf (p.address.toUtf8 ().constData (), "%d.%d.%d.%d", q+0, q+1, q+2, q+3) == 4)
+                collatedAddress.sprintf ("%03d.%03d.%03d.%03d", q[0], q[1], q[2], q[3]);
             else
                 collatedAddress = p.address;
         }
     public:
-        void refresh( const Peer& p ) { peer = p; }
-        void setStatus( const QString& s ) { status = s; }
-        virtual bool operator< ( const QTreeWidgetItem & other ) const {
-            const PeerItem * i = dynamic_cast<const PeerItem*>(&other);
-            QTreeWidget * tw( treeWidget( ) );
-            const int column = tw ? tw->sortColumn() : 0;
-            switch( column ) {
+        void refresh (const Peer& p) { peer = p; }
+        void setStatus (const QString& s) { status = s; }
+        virtual bool operator< (const QTreeWidgetItem & other) const {
+            const PeerItem * i = dynamic_cast<const PeerItem*> (&other);
+            QTreeWidget * tw (treeWidget ());
+            const int column = tw ? tw->sortColumn () : 0;
+            switch (column) {
                 case COL_UP: return peer.rateToPeer < i->peer.rateToPeer;
                 case COL_DOWN: return peer.rateToClient < i->peer.rateToClient;
@@ -130 +130 @@
 
 QIcon
-Details :: getStockIcon( const QString& freedesktop_name, int fallback )
-{
-    QIcon icon = QIcon::fromTheme( freedesktop_name );
-
-    if( icon.isNull( ) )
-        icon = style()->standardIcon( QStyle::StandardPixmap( fallback ), 0, this );
+Details :: getStockIcon (const QString& freedesktop_name, int fallback)
+{
+    QIcon icon = QIcon::fromTheme (freedesktop_name);
+
+    if (icon.isNull ())
+        icon = style ()->standardIcon (QStyle::StandardPixmap (fallback), 0, this);
 
     return icon;
 }
 
-Details :: Details( Session& session, Prefs& prefs, TorrentModel& model, QWidget * parent ):
-    QDialog( parent, Qt::Dialog ),
-    mySession( session ),
-    myPrefs( prefs ),
-    myModel( model ),
-    myChangedTorrents( false ),
-    myHavePendingRefresh( false )
-{
-    QVBoxLayout * layout = new QVBoxLayout( this );
-
-    setWindowTitle( tr( "Torrent Properties" ) );
-
-    QTabWidget * t = new QTabWidget( this );
+Details :: Details (Session& session, Prefs& prefs, TorrentModel& model, QWidget * parent):
+    QDialog (parent, Qt::Dialog),
+    mySession (session),
+    myPrefs (prefs),
+    myModel (model),
+    myChangedTorrents (false),
+    myHavePendingRefresh (false)
+{
+    QVBoxLayout * layout = new QVBoxLayout (this);
+
+    setWindowTitle (tr ("Torrent Properties"));
+
+    QTabWidget * t = new QTabWidget (this);
     QWidget * w;
-    t->addTab( w = createInfoTab( ),      tr( "Information" ) );
+    t->addTab (w = createInfoTab (),      tr ("Information"));
     myWidgets << w;
-    t->addTab( w = createPeersTab( ),     tr( "Peers" ) );
+    t->addTab (w = createPeersTab (),     tr ("Peers"));
     myWidgets << w;
-    t->addTab( w = createTrackerTab( ),   tr( "Tracker" ) );
+    t->addTab (w = createTrackerTab (),   tr ("Tracker"));
     myWidgets << w;
-    t->addTab( w = createFilesTab( ),     tr( "Files" ) );
+    t->addTab (w = createFilesTab (),     tr ("Files"));
     myWidgets << w;
-    t->addTab( w = createOptionsTab( ),   tr( "Options" ) );
+    t->addTab (w = createOptionsTab (),   tr ("Options"));
     myWidgets << w;
-    layout->addWidget( t );
-
-    QDialogButtonBox * buttons = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
-    connect( buttons, SIGNAL(rejected()), this, SLOT(close()));
-    layout->addWidget( buttons );
-    QWidget::setAttribute( Qt::WA_DeleteOnClose, true );
+    layout->addWidget (t);
+
+    QDialogButtonBox * buttons = new QDialogButtonBox (QDialogButtonBox::Close, Qt::Horizontal, this);
+    connect (buttons, SIGNAL (rejected ()), this, SLOT (close ()));
+    layout->addWidget (buttons);
+    QWidget::setAttribute (Qt::WA_DeleteOnClose, true);
 
     QList<int> initKeys;
     initKeys << Prefs :: SHOW_TRACKER_SCRAPES
              << Prefs :: SHOW_BACKUP_TRACKERS;
-    foreach( int key, initKeys )
-        refreshPref( key );
-
-    connect( &myTimer, SIGNAL(timeout()), this, SLOT(onTimer()));
-    connect( &myPrefs, SIGNAL(changed(int)), this, SLOT(refreshPref(int)) );
-
-    onTimer( );
-    myTimer.setSingleShot( false );
-    myTimer.start( REFRESH_INTERVAL_MSEC );
-}
-
-Details :: ~Details( )
-{
-    myTrackerDelegate->deleteLater();
-    myTrackerFilter->deleteLater();
-    myTrackerModel->deleteLater();
-}
-
-void
-Details :: setIds( const QSet<int>& ids )
-{
-    if( ids == myIds )
+    foreach (int key, initKeys)
+        refreshPref (key);
+
+    connect (&myTimer, SIGNAL (timeout ()), this, SLOT (onTimer ()));
+    connect (&myPrefs, SIGNAL (changed (int)), this, SLOT (refreshPref (int)));
+
+    onTimer ();
+    myTimer.setSingleShot (false);
+    myTimer.start (REFRESH_INTERVAL_MSEC);
+}
+
+Details :: ~Details ()
+{
+    myTrackerDelegate->deleteLater ();
+    myTrackerFilter->deleteLater ();
+    myTrackerModel->deleteLater ();
+}
+
+void
+Details :: setIds (const QSet<int>& ids)
+{
+    if (ids == myIds)
         return;
 
@@ -201 +201 @@
 
     // stop listening to the old torrents
-    foreach( int id, myIds ) {
-        const Torrent * tor = myModel.getTorrentFromId( id );
-        if( tor ) {
-            disconnect( tor, SIGNAL(torrentChanged(int)), this, SLOT(onTorrentChanged()) );
-            disconnect( tor, SIGNAL(torrentFileListRebuilt(int)), this, SLOT(onTorrentFileListRebuilt()) );
-        }
-    }
-
-    myFileTreeView->clear( );
+    foreach (int id, myIds) {
+        const Torrent * tor = myModel.getTorrentFromId (id);
+        if (tor) {
+            disconnect (tor, SIGNAL (torrentChanged (int)), this, SLOT (onTorrentChanged ()));
+            disconnect (tor, SIGNAL (torrentFileListRebuilt (int)), this, SLOT (onTorrentFileListRebuilt ()));
+        }
+    }
+
+    myFileTreeView->clear ();
     myIds = ids;
-    myTrackerModel->refresh( myModel, myIds );
+    myTrackerModel->refresh (myModel, myIds);
 
     // listen to the new torrents
-    foreach( int id, myIds ) {
-        const Torrent * tor = myModel.getTorrentFromId( id );
-        if( tor ) {
-            connect( tor, SIGNAL(torrentChanged(int)), this, SLOT(onTorrentChanged()) );
-            connect( tor, SIGNAL(torrentFileListRebuilt(int)), this, SLOT(onTorrentFileListRebuilt()) );
-        }
-    }
-
-    foreach( QWidget * w, myWidgets )
-        w->setEnabled( false );
-
-    onTimer( );
-}
-
-void
-Details :: refreshPref( int key )
+    foreach (int id, myIds) {
+        const Torrent * tor = myModel.getTorrentFromId (id);
+        if (tor) {
+            connect (tor, SIGNAL (torrentChanged (int)), this, SLOT (onTorrentChanged ()));
+            connect (tor, SIGNAL (torrentFileListRebuilt (int)), this, SLOT (onTorrentFileListRebuilt ()));
+        }
+    }
+
+    foreach (QWidget * w, myWidgets)
+        w->setEnabled (false);
+
+    onTimer ();
+}
+
+void
+Details :: refreshPref (int key)
 {
     QString str;
 
-    switch( key )
+    switch (key)
     {
         case Prefs :: SHOW_TRACKER_SCRAPES: {
-            QItemSelectionModel * selectionModel( myTrackerView->selectionModel( ) );
-            const QItemSelection selection( selectionModel->selection( ) );
-            const QModelIndex currentIndex( selectionModel->currentIndex( ) );
-            myTrackerDelegate->setShowMore( myPrefs.getBool( key ) );
-            selectionModel->clear( );
-            myTrackerView->reset( );
-            selectionModel->select( selection, QItemSelectionModel::Select );
-            selectionModel->setCurrentIndex( currentIndex, QItemSelectionModel::NoUpdate );
+            QItemSelectionModel * selectionModel (myTrackerView->selectionModel ());
+            const QItemSelection selection (selectionModel->selection ());
+            const QModelIndex currentIndex (selectionModel->currentIndex ());
+            myTrackerDelegate->setShowMore (myPrefs.getBool (key));
+            selectionModel->clear ();
+            myTrackerView->reset ();
+            selectionModel->select (selection, QItemSelectionModel::Select);
+            selectionModel->setCurrentIndex (currentIndex, QItemSelectionModel::NoUpdate);
             break;
         }
 
         case Prefs :: SHOW_BACKUP_TRACKERS:
-            myTrackerFilter->setShowBackupTrackers( myPrefs.getBool( key ) );
+            myTrackerFilter->setShowBackupTrackers (myPrefs.getBool (key));
             break;
 
@@ -262 +262 @@
 
 QString
-Details :: timeToStringRounded( int seconds )
-{
-    if( seconds > 60 ) seconds -= ( seconds % 60 );
-    return Formatter::timeToString ( seconds );
-}
-
-void
-Details :: onTimer( )
-{
-    getNewData( );
-}
-
-void
-Details :: getNewData( )
-{
-    if( !myIds.empty( ) )
+Details :: timeToStringRounded (int seconds)
+{
+    if (seconds > 60) seconds -= (seconds % 60);
+    return Formatter::timeToString (seconds);
+}
+
+void
+Details :: onTimer ()
+{
+    getNewData ();
+}
+
+void
+Details :: getNewData ()
+{
+    if (!myIds.empty ())
     {
         QSet<int> infos;
-        foreach( int id, myIds ) {
-            const Torrent * tor = myModel.getTorrentFromId( id );
-            if( tor->isMagnet() )
-                infos.insert( tor->id() );
-        }
-        if( !infos.isEmpty() )
-            mySession.initTorrents( infos );
-        mySession.refreshExtraStats( myIds );
-    }
-}
-
-void
-Details :: onTorrentChanged( )
-{
-    if( !myHavePendingRefresh ) {
+        foreach (int id, myIds) {
+            const Torrent * tor = myModel.getTorrentFromId (id);
+            if (tor->isMagnet ())
+                infos.insert (tor->id ());
+        }
+        if (!infos.isEmpty ())
+            mySession.initTorrents (infos);
+        mySession.refreshExtraStats (myIds);
+    }
+}
+
+void
+Details :: onTorrentChanged ()
+{
+    if (!myHavePendingRefresh) {
         myHavePendingRefresh = true;
-        QTimer::singleShot( 100, this, SLOT(refresh()));
-    }
-}
-
-void
-Details :: onTorrentFileListRebuilt( )
+        QTimer::singleShot (100, this, SLOT (refresh ()));
+    }
+}
+
+void
+Details :: onTorrentFileListRebuilt ()
 {
   myFilesDirty = true;
-  onTorrentChanged( );
+  onTorrentChanged ();
 }
 
 namespace
 {
-    void setIfIdle( QComboBox * box, int i )
-    {
-        if( !box->hasFocus( ) )
+    void setIfIdle (QComboBox * box, int i)
+    {
+        if (!box->hasFocus ())
         {
-            box->blockSignals( true );
-            box->setCurrentIndex( i );
-            box->blockSignals( false );
-        }
-    }
-
-    void setIfIdle( QDoubleSpinBox * spin, double value )
-    {
-        if( !spin->hasFocus( ) )
+            box->blockSignals (true);
+            box->setCurrentIndex (i);
+            box->blockSignals (false);
+        }
+    }
+
+    void setIfIdle (QDoubleSpinBox * spin, double value)
+    {
+        if (!spin->hasFocus ())
         {
-            spin->blockSignals( true );
-            spin->setValue( value );
-            spin->blockSignals( false );
-        }
-    }
-
-    void setIfIdle( QSpinBox * spin, int value )
-    {
-        if( !spin->hasFocus( ) )
+            spin->blockSignals (true);
+            spin->setValue (value);
+            spin->blockSignals (false);
+        }
+    }
+
+    void setIfIdle (QSpinBox * spin, int value)
+    {
+        if (!spin->hasFocus ())
         {
-            spin->blockSignals( true );
-            spin->setValue( value );
-            spin->blockSignals( false );
-        }
-    }
-}
-
-void
-Details :: refresh( )
-{
-    const int n = myIds.size( );
+            spin->blockSignals (true);
+            spin->setValue (value);
+            spin->blockSignals (false);
+        }
+    }
+}
+
+void
+Details :: refresh ()
+{
+    const int n = myIds.size ();
     const bool single = n == 1;
     const QString blank;
-    const QFontMetrics fm( fontMetrics( ) );
+    const QFontMetrics fm (fontMetrics ());
     QList<const Torrent*> torrents;
     QString string;
-    const QString none = tr( "None" );
-    const QString mixed = tr( "Mixed" );
-    const QString unknown = tr( "Unknown" );
+    const QString none = tr ("None");
+    const QString mixed = tr ("Mixed");
+    const QString unknown = tr ("Unknown");
 
     // build a list of torrents
-    foreach( int id, myIds ) {
-        const Torrent * tor = myModel.getTorrentFromId( id );
-        if( tor )
+    foreach (int id, myIds) {
+        const Torrent * tor = myModel.getTorrentFromId (id);
+        if (tor)
             torrents << tor;
     }
@@ -365 +365 @@
 
     // myStateLabel
-    if( torrents.empty( ) )
+    if (torrents.empty ())
         string = none;
     else {
@@ -371 +371 @@
         bool allPaused = true;
         bool allFinished = true;
-        const tr_torrent_activity baseline = torrents[0]->getActivity( );
-        foreach( const Torrent * t, torrents ) {
-            const tr_torrent_activity activity = t->getActivity( );
-            if( activity != baseline )
+        const tr_torrent_activity baseline = torrents[0]->getActivity ();
+        foreach (const Torrent * t, torrents) {
+            const tr_torrent_activity activity = t->getActivity ();
+            if (activity != baseline)
                 isMixed = true;
-            if( activity != TR_STATUS_STOPPED )
+            if (activity != TR_STATUS_STOPPED)
                 allPaused = allFinished = false;
-            if( !t->isFinished( ) )
+            if (!t->isFinished ())
                 allFinished = false;
         }
-        if( isMixed )
+        if (isMixed)
             string = mixed;
-        else if( allFinished )
-            string = tr( "Finished" );
-        else if( allPaused )
-            string = tr( "Paused" );
+        else if (allFinished)
+            string = tr ("Finished");
+        else if (allPaused)
+            string = tr ("Paused");
         else
-            string = torrents[0]->activityString( );
-    }
-    myStateLabel->setText( string );
+            string = torrents[0]->activityString ();
+    }
+    myStateLabel->setText (string);
     const QString stateString = string;
 
@@ -401 +401 @@
     int64_t haveUnverified = 0;
     int64_t verifiedPieces = 0;
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        foreach( const Torrent * t, torrents ) {
-            if( t->hasMetadata( ) ) {
-                haveTotal += t->haveTotal( );
-                haveUnverified += t->haveUnverified( );
-                const uint64_t v = t->haveVerified( );
+    if (torrents.empty ())
+        string = none;
+    else {
+        foreach (const Torrent * t, torrents) {
+            if (t->hasMetadata ()) {
+                haveTotal += t->haveTotal ();
+                haveUnverified += t->haveUnverified ();
+                const uint64_t v = t->haveVerified ();
                 haveVerified += v;
-                if( t->pieceSize( ) )
-                    verifiedPieces += v / t->pieceSize( );
-                sizeWhenDone += t->sizeWhenDone( );
-                leftUntilDone += t->leftUntilDone( );
-                available += t->sizeWhenDone() - t->leftUntilDone() + t->desiredAvailable();
+                if (t->pieceSize ())
+                    verifiedPieces += v / t->pieceSize ();
+                sizeWhenDone += t->sizeWhenDone ();
+                leftUntilDone += t->leftUntilDone ();
+                available += t->sizeWhenDone () - t->leftUntilDone () + t->desiredAvailable ();
             }
         }
         {
-            const double d = 100.0 * ( sizeWhenDone ? ( sizeWhenDone - leftUntilDone ) / sizeWhenDone : 1 );
-            QString pct = Formatter::percentToString( d );
-
-            if( !haveUnverified && !leftUntilDone )
+            const double d = 100.0 * (sizeWhenDone ? (sizeWhenDone - leftUntilDone) / sizeWhenDone : 1);
+            QString pct = Formatter::percentToString (d);
+
+            if (!haveUnverified && !leftUntilDone)
             {
-                string = tr( "%1 (100%)" )
-                             .arg( Formatter::sizeToString( haveVerified ) );
+                string = tr ("%1 (100%)")
+                             .arg (Formatter::sizeToString (haveVerified));
             }
-            else if( !haveUnverified )
+            else if (!haveUnverified)
             {
-                string = tr( "%1 of %2 (%3%)" )
-                             .arg( Formatter::sizeToString( haveVerified ) )
-                             .arg( Formatter::sizeToString( sizeWhenDone ) )
-                             .arg( pct );
+                string = tr ("%1 of %2 (%3%)")
+                             .arg (Formatter::sizeToString (haveVerified))
+                             .arg (Formatter::sizeToString (sizeWhenDone))
+                             .arg (pct);
             }
             else
             {
-                string = tr( "%1 of %2 (%3%), %4 Unverified" )
-                             .arg( Formatter::sizeToString( haveVerified + haveUnverified ) )
-                             .arg( Formatter::sizeToString( sizeWhenDone ) )
-                             .arg( pct )
-                             .arg( Formatter::sizeToString( haveUnverified ) );
+                string = tr ("%1 of %2 (%3%), %4 Unverified")
+                             .arg (Formatter::sizeToString (haveVerified + haveUnverified))
+                             .arg (Formatter::sizeToString (sizeWhenDone))
+                             .arg (pct)
+                             .arg (Formatter::sizeToString (haveUnverified));
             }
         }
     }
-    myHaveLabel->setText( string );
+    myHaveLabel->setText (string);
 
     // myAvailabilityLabel
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        if( sizeWhenDone == 0 )
+    if (torrents.empty ())
+        string = none;
+    else {
+        if (sizeWhenDone == 0)
             string = none;
         else
-            string = QString( "%1%" ).arg( Formatter::percentToString( ( 100.0 * available ) / sizeWhenDone ) );
-    }
-    myAvailabilityLabel->setText( string );
+            string = QString ("%1%").arg (Formatter::percentToString ( (100.0 * available) / sizeWhenDone));
+    }
+    myAvailabilityLabel->setText (string);
 
     // myDownloadedLabel
-    if( torrents.empty( ) )
+    if (torrents.empty ())
         string = none;
     else {
         uint64_t d = 0;
         uint64_t f = 0;
-        foreach( const Torrent * t, torrents ) {
-            d += t->downloadedEver( );
-            f += t->failedEver( );
-        }
-        const QString dstr = Formatter::sizeToString( d );
-        const QString fstr = Formatter::sizeToString( f );
-        if( f )
-            string = tr( "%1 (%2 corrupt)" ).arg( dstr ).arg( fstr );
+        foreach (const Torrent * t, torrents) {
+            d += t->downloadedEver ();
+            f += t->failedEver ();
+        }
+        const QString dstr = Formatter::sizeToString (d);
+        const QString fstr = Formatter::sizeToString (f);
+        if (f)
+            string = tr ("%1 (%2 corrupt)").arg (dstr).arg (fstr);
         else
             string = dstr;
     }
-    myDownloadedLabel->setText( string );
-
-    if( torrents.empty( ) )
+    myDownloadedLabel->setText (string);
+
+    if (torrents.empty ())
         string = none;
     else {
         uint64_t u = 0;
         uint64_t d = 0;
-        foreach( const Torrent * t, torrents ) {
-            u += t->uploadedEver( );
-            d += t->downloadedEver( );
-        }
-        string = tr( "%1 (Ratio: %2)" )
-                   .arg( Formatter::sizeToString( u ) )
-                   .arg( Formatter::ratioToString( tr_getRatio( u, d ) ) );
-    }
-    myUploadedLabel->setText( string );
-
-    const QDateTime qdt_now = QDateTime::currentDateTime( );
+        foreach (const Torrent * t, torrents) {
+            u += t->uploadedEver ();
+            d += t->downloadedEver ();
+        }
+        string = tr ("%1 (Ratio: %2)")
+                   .arg (Formatter::sizeToString (u))
+                   .arg (Formatter::ratioToString (tr_getRatio (u, d)));
+    }
+    myUploadedLabel->setText (string);
+
+    const QDateTime qdt_now = QDateTime::currentDateTime ();
 
     // myRunTimeLabel
-    if( torrents.empty( ) )
+    if (torrents.empty ())
         string = none;
     else {
         bool allPaused = true;
-        QDateTime baseline = torrents[0]->lastStarted( );
-        foreach( const Torrent * t, torrents ) {
-            if( baseline != t->lastStarted( ) )
-                baseline = QDateTime( );
-            if( !t->isPaused( ) )
+        QDateTime baseline = torrents[0]->lastStarted ();
+        foreach (const Torrent * t, torrents) {
+            if (baseline != t->lastStarted ())
+                baseline = QDateTime ();
+            if (!t->isPaused ())
                 allPaused = false;
         }
-        if( allPaused )
+        if (allPaused)
             string = stateString; // paused || finished
-        else if( baseline.isNull( ) )
+        else if (baseline.isNull ())
             string = mixed;
         else
-            string = Formatter::timeToString( baseline.secsTo( qdt_now ) );
-    }
-    myRunTimeLabel->setText( string );
+            string = Formatter::timeToString (baseline.secsTo (qdt_now));
+    }
+    myRunTimeLabel->setText (string);
 
 
     // myETALabel
-    string.clear( );
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        int baseline = torrents[0]->getETA( );
-        foreach( const Torrent * t, torrents ) {
-            if( baseline != t->getETA( ) ) {
+    string.clear ();
+    if (torrents.empty ())
+        string = none;
+    else {
+        int baseline = torrents[0]->getETA ();
+        foreach (const Torrent * t, torrents) {
+            if (baseline != t->getETA ()) {
                 string = mixed;
                 break;
             }
         }
-        if( string.isEmpty( ) ) {
-            if( baseline < 0 )
-                string = tr( "Unknown" );
+        if (string.isEmpty ()) {
+            if (baseline < 0)
+                string = tr ("Unknown");
             else
-                string = Formatter::timeToString( baseline );
+                string = Formatter::timeToString (baseline);
        }
     }
-    myETALabel->setText( string );
+    myETALabel->setText (string);
 
 
     // myLastActivityLabel
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        QDateTime latest = torrents[0]->lastActivity( );
-        foreach( const Torrent * t, torrents ) {
-            const QDateTime dt = t->lastActivity( );
-            if( latest < dt )
+    if (torrents.empty ())
+        string = none;
+    else {
+        QDateTime latest = torrents[0]->lastActivity ();
+        foreach (const Torrent * t, torrents) {
+            const QDateTime dt = t->lastActivity ();
+            if (latest < dt)
                 latest = dt;
         }
-        const int seconds = latest.isValid() ? latest.secsTo( qdt_now ) : -1;
-        if( seconds < 0 )
+        const int seconds = latest.isValid () ? latest.secsTo (qdt_now) : -1;
+        if (seconds < 0)
             string = none;
-        else if( seconds < 5 )
-            string = tr( "Active now" );
+        else if (seconds < 5)
+            string = tr ("Active now");
         else
-            string = tr( "%1 ago" ).arg( Formatter::timeToString( seconds ) );
-    }
-    myLastActivityLabel->setText( string );
-
-
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        string = torrents[0]->getError( );
-        foreach( const Torrent * t, torrents ) {
-            if( string != t->getError( ) ) {
+            string = tr ("%1 ago").arg (Formatter::timeToString (seconds));
+    }
+    myLastActivityLabel->setText (string);
+
+
+    if (torrents.empty ())
+        string = none;
+    else {
+        string = torrents[0]->getError ();
+        foreach (const Torrent * t, torrents) {
+            if (string != t->getError ()) {
                 string = mixed;
                 break;
@@ -568 +568 @@
         }
     }
-    if( string.isEmpty( ) )
-        string = none;
-    myErrorLabel->setText( string );
+    if (string.isEmpty ())
+        string = none;
+    myErrorLabel->setText (string);
 
 
@@ -578 +578 @@
 
     // mySizeLabel
-    if( torrents.empty( ) )
+    if (torrents.empty ())
         string = none;
     else {
         int pieces = 0;
         uint64_t size = 0;
-        uint32_t pieceSize = torrents[0]->pieceSize( );
-        foreach( const Torrent * t, torrents ) {
-            pieces += t->pieceCount( );
-            size += t->totalSize( );
-            if( pieceSize != t->pieceSize( ) )
+        uint32_t pieceSize = torrents[0]->pieceSize ();
+        foreach (const Torrent * t, torrents) {
+            pieces += t->pieceCount ();
+            size += t->totalSize ();
+            if (pieceSize != t->pieceSize ())
                 pieceSize = 0;
         }
-        if( !size )
+        if (!size)
             string = none;
-        else if( pieceSize > 0 )
-            string = tr( "%1 (%Ln pieces @ %2)", "", pieces )
-                     .arg( Formatter::sizeToString( size ) )
-                     .arg( Formatter::memToString( pieceSize ) );
+        else if (pieceSize > 0)
+            string = tr ("%1 (%Ln pieces @ %2)", "", pieces)
+                     .arg (Formatter::sizeToString (size))
+                     .arg (Formatter::memToString (pieceSize));
         else
-            string = tr( "%1 (%Ln pieces)", "", pieces )
-                     .arg( Formatter::sizeToString( size ) );
-    }
-    mySizeLabel->setText( string );
+            string = tr ("%1 (%Ln pieces)", "", pieces)
+                     .arg (Formatter::sizeToString (size));
+    }
+    mySizeLabel->setText (string);
 
     // myHashLabel
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        string = torrents[0]->hashString( );
-        foreach( const Torrent * t, torrents ) {
-            if( string != t->hashString( ) ) {
+    if (torrents.empty ())
+        string = none;
+    else {
+        string = torrents[0]->hashString ();
+        foreach (const Torrent * t, torrents) {
+            if (string != t->hashString ()) {
                 string = mixed;
                 break;
@@ -614 +614 @@
         }
     }
-    myHashLabel->setText( string );
+    myHashLabel->setText (string);
 
     // myPrivacyLabel
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        bool b = torrents[0]->isPrivate( );
-        string = b ? tr( "Private to this tracker -- DHT and PEX disabled" )
-                   : tr( "Public torrent" );
-        foreach( const Torrent * t, torrents ) {
-            if( b != t->isPrivate( ) ) {
+    if (torrents.empty ())
+        string = none;
+    else {
+        bool b = torrents[0]->isPrivate ();
+        string = b ? tr ("Private to this tracker -- DHT and PEX disabled")
+                   : tr ("Public torrent");
+        foreach (const Torrent * t, torrents) {
+            if (b != t->isPrivate ()) {
                 string = mixed;
                 break;
@@ -630 +630 @@
         }
     }
-    myPrivacyLabel->setText( string );
+    myPrivacyLabel->setText (string);
 
     // myCommentBrowser
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        string = torrents[0]->comment( );
-        foreach( const Torrent * t, torrents ) {
-            if( string != t->comment( ) ) {
+    if (torrents.empty ())
+        string = none;
+    else {
+        string = torrents[0]->comment ();
+        foreach (const Torrent * t, torrents) {
+            if (string != t->comment ()) {
                 string = mixed;
                 break;
@@ -644 +644 @@
         }
     }
-    myCommentBrowser->setText( string );
-    myCommentBrowser->setMaximumHeight( QWIDGETSIZE_MAX );
+    myCommentBrowser->setText (string);
+    myCommentBrowser->setMaximumHeight (QWIDGETSIZE_MAX);
 
     // myOriginLabel
-    if( torrents.empty( ) )
+    if (torrents.empty ())
         string = none;
     else {
         bool mixed_creator=false, mixed_date=false;
-        const QString creator = torrents[0]->creator();
-        const QString date = torrents[0]->dateCreated().toString();
-        foreach( const Torrent * t, torrents ) {
-            mixed_creator |= ( creator != t->creator() );
-            mixed_date |=  ( date != t->dateCreated().toString() );
-        }
-        if( mixed_creator && mixed_date )
+        const QString creator = torrents[0]->creator ();
+        const QString date = torrents[0]->dateCreated ().toString ();
+        foreach (const Torrent * t, torrents) {
+            mixed_creator |= (creator != t->creator ());
+            mixed_date |= (date != t->dateCreated ().toString ());
+        }
+        if (mixed_creator && mixed_date)
             string = mixed;
-        else if( mixed_date && !creator.isEmpty())
-            string = tr( "Created by %1" ).arg( creator );
-        else if( mixed_creator && !date.isEmpty())
-            string = tr( "Created on %1" ).arg( date );
-        else if( creator.isEmpty() && date.isEmpty())
-            string = tr( "N/A" );
+        else if (mixed_date && !creator.isEmpty ())
+            string = tr ("Created by %1").arg (creator);
+        else if (mixed_creator && !date.isEmpty ())
+            string = tr ("Created on %1").arg (date);
+        else if (creator.isEmpty () && date.isEmpty ())
+            string = tr ("N/A");
         else
-            string = tr( "Created by %1 on %2" ).arg( creator ).arg( date );
-    }
-    myOriginLabel->setText( string );
+            string = tr ("Created by %1 on %2").arg (creator).arg (date);
+    }
+    myOriginLabel->setText (string);
 
     // myLocationLabel
-    if( torrents.empty( ) )
-        string = none;
-    else {
-        string = torrents[0]->getPath( );
-        foreach( const Torrent * t, torrents ) {
-            if( string != t->getPath( ) ) {
+    if (torrents.empty ())
+        string = none;
+    else {
+        string = torrents[0]->getPath ();
+        foreach (const Torrent * t, torrents) {
+            if (string != t->getPath ()) {
                 string = mixed;
                 break;
@@ -683 +683 @@
         }
     }
-    myLocationLabel->setText( string );
+    myLocationLabel->setText (string);
 
 
@@ -690 +690 @@
     ///
 
-    if( myChangedTorrents && !torrents.empty( ) )
+    if (myChangedTorrents && !torrents.empty ())
     {
         int i;
-        const Torrent * baseline = *torrents.begin();
+        const Torrent * baseline = *torrents.begin ();
         const Torrent * tor;
         bool uniform;
@@ -701 +701 @@
         // mySessionLimitCheck
         uniform = true;
-        baselineFlag = baseline->honorsSessionLimits( );
-        foreach( tor, torrents ) if( baselineFlag != tor->honorsSessionLimits( ) ) { uniform = false; break; }
-        mySessionLimitCheck->setChecked( uniform && baselineFlag );
+        baselineFlag = baseline->honorsSessionLimits ();
+        foreach (tor, torrents) if (baselineFlag != tor->honorsSessionLimits ()) { uniform = false; break; }
+        mySessionLimitCheck->setChecked (uniform && baselineFlag);
 
         // mySingleDownCheck
         uniform = true;
-        baselineFlag = baseline->downloadIsLimited( );
-        foreach( tor, torrents ) if( baselineFlag != tor->downloadIsLimited( ) ) { uniform = false; break; }
-        mySingleDownCheck->setChecked( uniform && baselineFlag );
+        baselineFlag = baseline->downloadIsLimited ();
+        foreach (tor, torrents) if (baselineFlag != tor->downloadIsLimited ()) { uniform = false; break; }
+        mySingleDownCheck->setChecked (uniform && baselineFlag);
 
         // mySingleUpCheck
         uniform = true;
-        baselineFlag = baseline->uploadIsLimited( );
-        foreach( tor, torrents ) if( baselineFlag != tor->uploadIsLimited( ) ) { uniform = false; break; }
-        mySingleUpCheck->setChecked( uniform && baselineFlag );
+        baselineFlag = baseline->uploadIsLimited ();
+        foreach (tor, torrents) if (baselineFlag != tor->uploadIsLimited ()) { uniform = false; break; }
+        mySingleUpCheck->setChecked (uniform && baselineFlag);
 
         // myBandwidthPriorityCombo
         uniform = true;
-        baselineInt = baseline->getBandwidthPriority( );
-        foreach( tor, torrents ) if ( baselineInt != tor->getBandwidthPriority( ) ) { uniform = false; break; }
-        if( uniform )
-            i = myBandwidthPriorityCombo->findData( baselineInt );
+        baselineInt = baseline->getBandwidthPriority ();
+        foreach (tor, torrents) if (baselineInt != tor->getBandwidthPriority ()) { uniform = false; break; }
+        if (uniform)
+            i = myBandwidthPriorityCombo->findData (baselineInt);
         else
             i = -1;
-        setIfIdle( myBandwidthPriorityCombo, i );
-
-        setIfIdle( mySingleDownSpin, int(tor->downloadLimit().KBps()) );
-        setIfIdle( mySingleUpSpin, int(tor->uploadLimit().KBps()) );
-        setIfIdle( myPeerLimitSpin, tor->peerLimit() );
-    }
-
-    if( !torrents.empty( ) )
+        setIfIdle (myBandwidthPriorityCombo, i);
+
+        setIfIdle (mySingleDownSpin, int (tor->downloadLimit ().KBps ()));
+        setIfIdle (mySingleUpSpin, int (tor->uploadLimit ().KBps ()));
+        setIfIdle (myPeerLimitSpin, tor->peerLimit ());
+    }
+
+    if (!torrents.empty ())
     {
         const Torrent * tor;
@@ -738 +738 @@
         // ratio
         bool uniform = true;
-        int baselineInt = torrents[0]->seedRatioMode( );
-        foreach( tor, torrents ) if( baselineInt != tor->seedRatioMode( ) ) { uniform = false; break; }
-
-        setIfIdle( myRatioCombo, uniform ? myRatioCombo->findData( baselineInt ) : -1 );
-        myRatioSpin->setVisible( uniform && ( baselineInt == TR_RATIOLIMIT_SINGLE ) );
-
-        setIfIdle( myRatioSpin, tor->seedRatioLimit( ) );
+        int baselineInt = torrents[0]->seedRatioMode ();
+        foreach (tor, torrents) if (baselineInt != tor->seedRatioMode ()) { uniform = false; break; }
+
+        setIfIdle (myRatioCombo, uniform ? myRatioCombo->findData (baselineInt) : -1);
+        myRatioSpin->setVisible (uniform && (baselineInt == TR_RATIOLIMIT_SINGLE));
+
+        setIfIdle (myRatioSpin, tor->seedRatioLimit ());
 
         // idle
         uniform = true;
-        baselineInt = torrents[0]->seedIdleMode( );
-        foreach( tor, torrents ) if( baselineInt != tor->seedIdleMode( ) ) { uniform = false; break; }
-
-        setIfIdle( myIdleCombo, uniform ? myIdleCombo->findData( baselineInt ) : -1 );
-        myIdleSpin->setVisible( uniform && ( baselineInt == TR_RATIOLIMIT_SINGLE ) );
-
-        setIfIdle( myIdleSpin, tor->seedIdleLimit( ) );
+        baselineInt = torrents[0]->seedIdleMode ();
+        foreach (tor, torrents) if (baselineInt != tor->seedIdleMode ()) { uniform = false; break; }
+
+        setIfIdle (myIdleCombo, uniform ? myIdleCombo->findData (baselineInt) : -1);
+        myIdleSpin->setVisible (uniform && (baselineInt == TR_RATIOLIMIT_SINGLE));
+
+        setIfIdle (myIdleSpin, tor->seedIdleLimit ());
     }
 
@@ -761 +761 @@
     ///
 
-    myTrackerModel->refresh( myModel, myIds );
+    myTrackerModel->refresh (myModel, myIds);
 
     ///
@@ -769 +769 @@
     QMap<QString,QTreeWidgetItem*> peers2;
     QList<QTreeWidgetItem*> newItems;
-    foreach( const Torrent * t, torrents )
-    {
-        const QString idStr( QString::number( t->id( ) ) );
-        PeerList peers = t->peers( );
-
-        foreach( const Peer& peer, peers )
+    foreach (const Torrent * t, torrents)
+    {
+        const QString idStr (QString::number (t->id ()));
+        PeerList peers = t->peers ();
+
+        foreach (const Peer& peer, peers)
         {
             const QString key = idStr + ":" + peer.address;
-            PeerItem * item = (PeerItem*) myPeers.value( key, 0 );
-
-            if( item == 0 ) // new peer has connected
+            PeerItem * item = (PeerItem*) myPeers.value (key, 0);
+
+            if (item == 0) // new peer has connected
             {
-                static const QIcon myEncryptionIcon( ":/icons/encrypted.png" );
+                static const QIcon myEncryptionIcon (":/icons/encrypted.png");
                 static const QIcon myEmptyIcon;
-                item = new PeerItem( peer );
-                item->setTextAlignment( COL_UP, Qt::AlignRight|Qt::AlignVCenter );
-                item->setTextAlignment( COL_DOWN, Qt::AlignRight|Qt::AlignVCenter );
-                item->setTextAlignment( COL_PERCENT, Qt::AlignRight|Qt::AlignVCenter );
-                item->setIcon( COL_LOCK, peer.isEncrypted ? myEncryptionIcon : myEmptyIcon );
-                item->setToolTip( COL_LOCK, peer.isEncrypted ? tr( "Encrypted connection" ) : "" );
-                item->setText( COL_ADDRESS, peer.address );
-                item->setText( COL_CLIENT, peer.clientName );
+                item = new PeerItem (peer);
+                item->setTextAlignment (COL_UP, Qt::AlignRight|Qt::AlignVCenter);
+                item->setTextAlignment (COL_DOWN, Qt::AlignRight|Qt::AlignVCenter);
+                item->setTextAlignment (COL_PERCENT, Qt::AlignRight|Qt::AlignVCenter);
+                item->setIcon (COL_LOCK, peer.isEncrypted ? myEncryptionIcon : myEmptyIcon);
+                item->setToolTip (COL_LOCK, peer.isEncrypted ? tr ("Encrypted connection") : "");
+                item->setText (COL_ADDRESS, peer.address);
+                item->setText (COL_CLIENT, peer.clientName);
                 newItems << item;
             }
 
             const QString code = peer.flagStr;
-            item->setStatus( code );
-            item->refresh( peer );
+            item->setStatus (code);
+            item->refresh (peer);
 
             QString codeTip;
-            foreach( QChar ch, code ) {
+            foreach (QChar ch, code) {
                 QString txt;
-                switch( ch.toAscii() ) {
-                    case 'O': txt = tr( "Optimistic unchoke" ); break;
-                    case 'D': txt = tr( "Downloading from this peer" ); break;
-                    case 'd': txt = tr( "We would download from this peer if they would let us" ); break;
-                    case 'U': txt = tr( "Uploading to peer" ); break;
-                    case 'u': txt = tr( "We would upload to this peer if they asked" ); break;
-                    case 'K': txt = tr( "Peer has unchoked us, but we're not interested" ); break;
-                    case '?': txt = tr( "We unchoked this peer, but they're not interested" ); break;
-                    case 'E': txt = tr( "Encrypted connection" ); break;
-                    case 'H': txt = tr( "Peer was discovered through DHT" ); break;
-                    case 'X': txt = tr( "Peer was discovered through Peer Exchange (PEX)" ); break;
-                    case 'I': txt = tr( "Peer is an incoming connection" ); break;
-                    case 'T': txt = tr( "Peer is connected over uTP" ); break;
+                switch (ch.toAscii ()) {
+                    case 'O': txt = tr ("Optimistic unchoke"); break;
+                    case 'D': txt = tr ("Downloading from this peer"); break;
+                    case 'd': txt = tr ("We would download from this peer if they would let us"); break;
+                    case 'U': txt = tr ("Uploading to peer"); break;
+                    case 'u': txt = tr ("We would upload to this peer if they asked"); break;
+                    case 'K': txt = tr ("Peer has unchoked us, but we're not interested"); break;
+                    case '?': txt = tr ("We unchoked this peer, but they're not interested"); break;
+                    case 'E': txt = tr ("Encrypted connection"); break;
+                    case 'H': txt = tr ("Peer was discovered through DHT"); break;
+                    case 'X': txt = tr ("Peer was discovered through Peer Exchange (PEX)"); break;
+                    case 'I': txt = tr ("Peer is an incoming connection"); break;
+                    case 'T': txt = tr ("Peer is connected over uTP"); break;
                 }
-                if( !txt.isEmpty( ) )
-                    codeTip += QString("%1: %2\n").arg(ch).arg(txt);
+                if (!txt.isEmpty ())
+                    codeTip += QString ("%1: %2\n").arg (ch).arg (txt);
             }
 
-            if( !codeTip.isEmpty() )
-                codeTip.resize( codeTip.size()-1 ); // eat the trailing linefeed
-
-            item->setText( COL_UP, peer.rateToPeer.isZero() ? "" : Formatter::speedToString( peer.rateToPeer ) );
-            item->setText( COL_DOWN, peer.rateToClient.isZero() ? "" : Formatter::speedToString( peer.rateToClient ) );
-            item->setText( COL_PERCENT, peer.progress > 0 ? QString( "%1%" ).arg( (int)( peer.progress * 100.0 ) ) : "" );
-            item->setText( COL_STATUS, code );
-            item->setToolTip( COL_STATUS, codeTip );
-
-            peers2.insert( key, item );
-        }
-    }
-    myPeerTree->addTopLevelItems( newItems );
-    foreach( QString key, myPeers.keys() ) {
-        if( !peers2.contains( key ) ) { // old peer has disconnected
-            QTreeWidgetItem * item = myPeers.value( key, 0 );
-            myPeerTree->takeTopLevelItem( myPeerTree->indexOfTopLevelItem( item ) );
+            if (!codeTip.isEmpty ())
+                codeTip.resize (codeTip.size ()-1); // eat the trailing linefeed
+
+            item->setText (COL_UP, peer.rateToPeer.isZero () ? "" : Formatter::speedToString (peer.rateToPeer));
+            item->setText (COL_DOWN, peer.rateToClient.isZero () ? "" : Formatter::speedToString (peer.rateToClient));
+            item->setText (COL_PERCENT, peer.progress > 0 ? QString ("%1%").arg ( (int) (peer.progress * 100.0)) : "");
+            item->setText (COL_STATUS, code);
+            item->setToolTip (COL_STATUS, codeTip);
+
+            peers2.insert (key, item);
+        }
+    }
+    myPeerTree->addTopLevelItems (newItems);
+    foreach (QString key, myPeers.keys ()) {
+        if (!peers2.contains (key)) { // old peer has disconnected
+            QTreeWidgetItem * item = myPeers.value (key, 0);
+            myPeerTree->takeTopLevelItem (myPeerTree->indexOfTopLevelItem (item));
             delete item;
         }
@@ -841 +841 @@
     myPeers = peers2;
 
-    if( !single || myFilesDirty )
-        myFileTreeView->clear( );
-    if( single )
-        myFileTreeView->update( torrents[0]->files( ) , myFilesDirty || myChangedTorrents );
+    if (!single || myFilesDirty)
+        myFileTreeView->clear ();
+    if (single)
+        myFileTreeView->update (torrents[0]->files () , myFilesDirty || myChangedTorrents);
 
     myFilesDirty = false;
     myChangedTorrents = false;
     myHavePendingRefresh = false;
-    foreach( QWidget * w, myWidgets )
-        w->setEnabled( true );
-}
-
-void
-Details :: enableWhenChecked( QCheckBox * box, QWidget * w )
-{
-    connect( box, SIGNAL(toggled(bool)), w, SLOT(setEnabled(bool)) );
-    w->setEnabled( box->isChecked( ) );
+    foreach (QWidget * w, myWidgets)
+        w->setEnabled (true);
+}
+
+void
+Details :: enableWhenChecked (QCheckBox * box, QWidget * w)
+{
+    connect (box, SIGNAL (toggled (bool)), w, SLOT (setEnabled (bool)));
+    w->setEnabled (box->isChecked ());
 }
 
@@ -866 +866 @@
 
 QWidget *
-Details :: createInfoTab( )
-{
-    HIG * hig = new HIG( this );
-
-    hig->addSectionTitle( tr( "Activity" ) );
-    hig->addRow( tr( "Have:" ), myHaveLabel = new SqueezeLabel );
-    hig->addRow( tr( "Availability:" ), myAvailabilityLabel = new SqueezeLabel );
-    hig->addRow( tr( "Downloaded:" ), myDownloadedLabel = new SqueezeLabel );
-    hig->addRow( tr( "Uploaded:" ), myUploadedLabel = new SqueezeLabel );
-    hig->addRow( tr( "State:" ), myStateLabel = new SqueezeLabel );
-    hig->addRow( tr( "Running time:" ), myRunTimeLabel = new SqueezeLabel );
-    hig->addRow( tr( "Remaining time:" ), myETALabel = new SqueezeLabel );
-    hig->addRow( tr( "Last activity:" ), myLastActivityLabel = new SqueezeLabel );
-    hig->addRow( tr( "Error:" ), myErrorLabel = new SqueezeLabel );
-    hig->addSectionDivider( );
-
-    hig->addSectionDivider( );
-    hig->addSectionTitle( tr( "Details" ) );
-    hig->addRow( tr( "Size:" ), mySizeLabel = new SqueezeLabel );
-    hig->addRow( tr( "Location:" ), myLocationLabel = new SqueezeLabel );
-    hig->addRow( tr( "Hash:" ), myHashLabel = new SqueezeLabel );
-    hig->addRow( tr( "Privacy:" ), myPrivacyLabel = new SqueezeLabel );
-    hig->addRow( tr( "Origin:" ), myOriginLabel = new SqueezeLabel );
-    myOriginLabel->setMinimumWidth( 325 ); // stop long origin strings from resizing the widgit
-    hig->addRow( tr( "Comment:" ), myCommentBrowser = new QTextBrowser );
-    const int h = QFontMetrics(myCommentBrowser->font()).lineSpacing() * 4;
-    myCommentBrowser->setFixedHeight( h );
-
-    hig->finish( );
+Details :: createInfoTab ()
+{
+    HIG * hig = new HIG (this);
+
+    hig->addSectionTitle (tr ("Activity"));
+    hig->addRow (tr ("Have:"), myHaveLabel = new SqueezeLabel);
+    hig->addRow (tr ("Availability:"), myAvailabilityLabel = new SqueezeLabel);
+    hig->addRow (tr ("Downloaded:"), myDownloadedLabel = new SqueezeLabel);
+    hig->addRow (tr ("Uploaded:"), myUploadedLabel = new SqueezeLabel);
+    hig->addRow (tr ("State:"), myStateLabel = new SqueezeLabel);
+    hig->addRow (tr ("Running time:"), myRunTimeLabel = new SqueezeLabel);
+    hig->addRow (tr ("Remaining time:"), myETALabel = new SqueezeLabel);
+    hig->addRow (tr ("Last activity:"), myLastActivityLabel = new SqueezeLabel);
+    hig->addRow (tr ("Error:"), myErrorLabel = new SqueezeLabel);
+    hig->addSectionDivider ();
+
+    hig->addSectionDivider ();
+    hig->addSectionTitle (tr ("Details"));
+    hig->addRow (tr ("Size:"), mySizeLabel = new SqueezeLabel);
+    hig->addRow (tr ("Location:"), myLocationLabel = new SqueezeLabel);
+    hig->addRow (tr ("Hash:"), myHashLabel = new SqueezeLabel);
+    hig->addRow (tr ("Privacy:"), myPrivacyLabel = new SqueezeLabel);
+    hig->addRow (tr ("Origin:"), myOriginLabel = new SqueezeLabel);
+    myOriginLabel->setMinimumWidth (325); // stop long origin strings from resizing the widgit
+    hig->addRow (tr ("Comment:"), myCommentBrowser = new QTextBrowser);
+    const int h = QFontMetrics (myCommentBrowser->font ()).lineSpacing () * 4;
+    myCommentBrowser->setFixedHeight (h);
+
+    hig->finish ();
 
     return hig;
@@ -930 +930 @@
 Details :: onSpinBoxEditingFinished ()
 {
-  const QObject * spin = sender();
-  const tr_quark key = spin->property(PREF_KEY).toInt();
-  const QDoubleSpinBox * d = qobject_cast<const QDoubleSpinBox*>( spin );
+  const QObject * spin = sender ();
+  const tr_quark key = spin->property (PREF_KEY).toInt ();
+  const QDoubleSpinBox * d = qobject_cast<const QDoubleSpinBox*> (spin);
   if (d)
-    mySession.torrentSet( myIds, key, d->value( ) );
+    mySession.torrentSet (myIds, key, d->value ());
   else
-    mySession.torrentSet( myIds, key, qobject_cast<const QSpinBox*>(spin)->value( ) );
-  getNewData( );
+    mySession.torrentSet (myIds, key, qobject_cast<const QSpinBox*> (spin)->value ());
+  getNewData ();
 }
 
@@ -950 +950 @@
 Details :: onIdleModeChanged (int index)
 {
-  const int val = myIdleCombo->itemData(index).toInt();
+  const int val = myIdleCombo->itemData (index).toInt ();
   mySession.torrentSet (myIds, TR_KEY_seedIdleMode, val);
   getNewData ();
@@ -958 +958 @@
 Details :: onRatioModeChanged (int index)
 {
-  const int val = myRatioCombo->itemData(index).toInt();
+  const int val = myRatioCombo->itemData (index).toInt ();
   mySession.torrentSet (myIds, TR_KEY_seedRatioMode, val);
 }
@@ -965 +965 @@
 Details :: onBandwidthPriorityChanged (int index)
 {
-  if( index != -1 )
-    {
-      const int priority = myBandwidthPriorityCombo->itemData(index).toInt();
-      mySession.torrentSet( myIds, TR_KEY_bandwidthPriority, priority );
-      getNewData( );
+  if (index != -1)
+    {
+      const int priority = myBandwidthPriorityCombo->itemData (index).toInt ();
+      mySession.torrentSet (myIds, TR_KEY_bandwidthPriority, priority);
+      getNewData ();
     }
 }
@@ -976 +976 @@
 Details :: onTrackerSelectionChanged ()
 {
-  const int selectionCount = myTrackerView->selectionModel()->selectedRows().size();
+  const int selectionCount = myTrackerView->selectionModel ()->selectedRows ().size ();
   myEditTrackerButton->setEnabled (selectionCount == 1);
   myRemoveTrackerButton->setEnabled (selectionCount > 0);
@@ -986 +986 @@
   bool ok = false;
   const QString url = QInputDialog::getText (this,
-                                             tr("Add URL "),
-                                             tr("Add tracker announce URL:"),
-                                             QLineEdit::Normal, QString(), &ok);
-  if(!ok)
+                                             tr ("Add URL "),
+                                             tr ("Add tracker announce URL:"),
+                                             QLineEdit::Normal, QString (), &ok);
+  if (!ok)
     {
       // user pressed "cancel" -- noop
     }
-  else if (!QUrl(url).isValid())
-    {
-      QMessageBox::warning( this, tr("Error"), tr("Invalid URL \"%1\"").arg(url));
+  else if (!QUrl (url).isValid ())
+    {
+      QMessageBox::warning (this, tr ("Error"), tr ("Invalid URL \"%1\"").arg (url));
     }
   else
@@ -1002 +1002 @@
 
       foreach (int id, myIds)
-        if (myTrackerModel->find(id,url) == -1)
+        if (myTrackerModel->find (id,url) == -1)
           ids.insert (id);
 
-      if (ids.empty()) // all the torrents already have this tracker
+      if (ids.empty ()) // all the torrents already have this tracker
         {
-          QMessageBox::warning (this, tr("Error"), tr("Tracker already exists."));
+          QMessageBox::warning (this, tr ("Error"), tr ("Tracker already exists."));
         }
         else
@@ -1022 +1022 @@
 Details :: onEditTrackerClicked ()
 {
-  QItemSelectionModel * selectionModel = myTrackerView->selectionModel();
-  QModelIndexList selectedRows = selectionModel->selectedRows();
-  assert (selectedRows.size() == 1);
-  QModelIndex i = selectionModel->currentIndex();
-  const TrackerInfo trackerInfo = myTrackerView->model()->data(i, TrackerModel::TrackerRole).value<TrackerInfo>();
+  QItemSelectionModel * selectionModel = myTrackerView->selectionModel ();
+  QModelIndexList selectedRows = selectionModel->selectedRows ();
+  assert (selectedRows.size () == 1);
+  QModelIndex i = selectionModel->currentIndex ();
+  const TrackerInfo trackerInfo = myTrackerView->model ()->data (i, TrackerModel::TrackerRole).value<TrackerInfo> ();
 
   bool ok = false;
   const QString newval = QInputDialog::getText (this,
-                                                tr("Edit URL "),
-                                                tr("Edit tracker announce URL:"),
+                                                tr ("Edit URL "),
+                                                tr ("Edit tracker announce URL:"),
                                                 QLineEdit::Normal,
                                                 trackerInfo.st.announce, &ok);
@@ -1039 +1039 @@
       // user pressed "cancel" -- noop
     }
-  else if( !QUrl(newval).isValid( ) )
-    {
-      QMessageBox::warning (this, tr("Error"), tr("Invalid URL \"%1\"").arg(newval));
+  else if (!QUrl (newval).isValid ())
+    {
+      QMessageBox::warning (this, tr ("Error"), tr ("Invalid URL \"%1\"").arg (newval));
     }
     else
@@ -1056 +1056 @@
 
 void
-Details :: onRemoveTrackerClicked( )
+Details :: onRemoveTrackerClicked ()
 {
     // make a map of torrentIds to announce URLs to remove
-    QItemSelectionModel * selectionModel = myTrackerView->selectionModel( );
-    QModelIndexList selectedRows = selectionModel->selectedRows( );
+    QItemSelectionModel * selectionModel = myTrackerView->selectionModel ();
+    QModelIndexList selectedRows = selectionModel->selectedRows ();
     QMap<int,int> torrentId_to_trackerIds;
-    foreach( QModelIndex i, selectedRows )
-    {
-        const TrackerInfo inf = myTrackerView->model()->data( i, TrackerModel::TrackerRole ).value<TrackerInfo>();
-        torrentId_to_trackerIds.insertMulti( inf.torrentId, inf.st.id );
+    foreach (QModelIndex i, selectedRows)
+    {
+        const TrackerInfo inf = myTrackerView->model ()->data (i, TrackerModel::TrackerRole).value<TrackerInfo> ();
+        torrentId_to_trackerIds.insertMulti (inf.torrentId, inf.st.id);
     }
 
     // batch all of a tracker's torrents into one command
-    foreach( int id, torrentId_to_trackerIds.uniqueKeys( ) )
+    foreach (int id, torrentId_to_trackerIds.uniqueKeys ())
     {
         QSet<int> ids;
         ids << id;
-        mySession.torrentSet( ids, TR_KEY_trackerRemove, torrentId_to_trackerIds.values( id ) );
-    }
-
-    selectionModel->clearSelection( );
-    getNewData( );
+        mySession.torrentSet (ids, TR_KEY_trackerRemove, torrentId_to_trackerIds.values (id));
+    }
+
+    selectionModel->clearSelection ();
+    getNewData ();
 }
 
 QWidget *
-Details :: createOptionsTab( )
+Details :: createOptionsTab ()
 {
     QSpinBox * s;
@@ -1088 +1088 @@
     QHBoxLayout * h;
     QDoubleSpinBox * ds;
-    const QString speed_K_str = Formatter::unitStr( Formatter::SPEED, Formatter::KB );
-
-    HIG * hig = new HIG( this );
-    hig->addSectionTitle( tr( "Speed" ) );
-
-    c = new QCheckBox( tr( "Honor global &limits" ) );
+    const QString speed_K_str = Formatter::unitStr (Formatter::SPEED, Formatter::KB);
+
+    HIG * hig = new HIG (this);
+    hig->addSectionTitle (tr ("Speed"));
+
+    c = new QCheckBox (tr ("Honor global &limits"));
     mySessionLimitCheck = c;
-    hig->addWideControl( c );
-    connect( c, SIGNAL(clicked(bool)), this, SLOT(onHonorsSessionLimitsToggled(bool)) );
-
-    c = new QCheckBox( tr( "Limit &download speed (%1):" ).arg( speed_K_str ) );
+    hig->addWideControl (c);
+    connect (c, SIGNAL (clicked (bool)), this, SLOT (onHonorsSessionLimitsToggled (bool)));
+
+    c = new QCheckBox (tr ("Limit &download speed (%1):").arg (speed_K_str));
     mySingleDownCheck = c;
-    s = new QSpinBox( );
+    s = new QSpinBox ();
     s->setProperty (PREF_KEY, TR_KEY_downloadLimit);
-    s->setSingleStep( 5 );
-    s->setRange( 0, INT_MAX );
+    s->setSingleStep (5);
+    s->setRange (0, INT_MAX);
     mySingleDownSpin = s;
-    hig->addRow( c, s );
-    enableWhenChecked( c, s );
-    connect( c, SIGNAL(clicked(bool)), this, SLOT(onDownloadLimitedToggled(bool)) );
-    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
-
-    c = new QCheckBox( tr( "Limit &upload speed (%1):" ).arg( speed_K_str ) );
+    hig->addRow (c, s);
+    enableWhenChecked (c, s);
+    connect (c, SIGNAL (clicked (bool)), this, SLOT (onDownloadLimitedToggled (bool)));
+    connect (s, SIGNAL (editingFinished ()), this, SLOT (onSpinBoxEditingFinished ()));
+
+    c = new QCheckBox (tr ("Limit &upload speed (%1):").arg (speed_K_str));
     mySingleUpCheck = c;
-    s = new QSpinBox( );
-    s->setSingleStep( 5 );
-    s->setRange( 0, INT_MAX );
-    s->setProperty( PREF_KEY, TR_KEY_uploadLimit );
+    s = new QSpinBox ();
+    s->setSingleStep (5);
+    s->setRange (0, INT_MAX);
+    s->setProperty (PREF_KEY, TR_KEY_uploadLimit);
     mySingleUpSpin = s;
-    hig->addRow( c, s );
-    enableWhenChecked( c, s );
-    connect( c, SIGNAL(clicked(bool)), this, SLOT(onUploadLimitedToggled(bool)) );
-    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
+    hig->addRow (c, s);
+    enableWhenChecked (c, s);
+    connect (c, SIGNAL (clicked (bool)), this, SLOT (onUploadLimitedToggled (bool)));
+    connect (s, SIGNAL (editingFinished ()), this, SLOT (onSpinBoxEditingFinished ()));
 
     m = new QComboBox;
-    m->addItem( tr( "High" ),   TR_PRI_HIGH );
-    m->addItem( tr( "Normal" ), TR_PRI_NORMAL );
-    m->addItem( tr( "Low" ),    TR_PRI_LOW );
-    connect( m, SIGNAL(currentIndexChanged(int)), this, SLOT(onBandwidthPriorityChanged(int)));
-    hig->addRow( tr( "Torrent &priority:" ), m );
+    m->addItem (tr ("High"),   TR_PRI_HIGH);
+    m->addItem (tr ("Normal"), TR_PRI_NORMAL);
+    m->addItem (tr ("Low"),    TR_PRI_LOW);
+    connect (m, SIGNAL (currentIndexChanged (int)), this, SLOT (onBandwidthPriorityChanged (int)));
+    hig->addRow (tr ("Torrent &priority:"), m);
     myBandwidthPriorityCombo = m;
 
-    hig->addSectionDivider( );
-    hig->addSectionTitle( tr( "Seeding Limits" ) );
-
-    h = new QHBoxLayout( );
-    h->setSpacing( HIG :: PAD );
+    hig->addSectionDivider ();
+    hig->addSectionTitle (tr ("Seeding Limits"));
+
+    h = new QHBoxLayout ();
+    h->setSpacing (HIG :: PAD);
     m = new QComboBox;
-    m->addItem( tr( "Use Global Settings" ),      TR_RATIOLIMIT_GLOBAL );
-    m->addItem( tr( "Seed regardless of ratio" ), TR_RATIOLIMIT_UNLIMITED );
-    m->addItem( tr( "Stop seeding at ratio:" ),   TR_RATIOLIMIT_SINGLE );
-    connect( m, SIGNAL(currentIndexChanged(int)), this, SLOT(onRatioModeChanged(int)));
-    h->addWidget( myRatioCombo = m );
-    ds = new QDoubleSpinBox( );
-    ds->setRange( 0.5, INT_MAX );
-    ds->setProperty( PREF_KEY, TR_KEY_seedRatioLimit );
-    connect( ds, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
-    h->addWidget( myRatioSpin = ds );
-    hig->addRow( tr( "&Ratio:" ), h, m );
-
-    h = new QHBoxLayout( );
-    h->setSpacing( HIG :: PAD );
+    m->addItem (tr ("Use Global Settings"),      TR_RATIOLIMIT_GLOBAL);
+    m->addItem (tr ("Seed regardless of ratio"), TR_RATIOLIMIT_UNLIMITED);
+    m->addItem (tr ("Stop seeding at ratio:"),   TR_RATIOLIMIT_SINGLE);
+    connect (m, SIGNAL (currentIndexChanged (int)), this, SLOT (onRatioModeChanged (int)));
+    h->addWidget (myRatioCombo = m);
+    ds = new QDoubleSpinBox ();
+    ds->setRange (0.5, INT_MAX);
+    ds->setProperty (PREF_KEY, TR_KEY_seedRatioLimit);
+    connect (ds, SIGNAL (editingFinished ()), this, SLOT (onSpinBoxEditingFinished ()));
+    h->addWidget (myRatioSpin = ds);
+    hig->addRow (tr ("&Ratio:"), h, m);
+
+    h = new QHBoxLayout ();
+    h->setSpacing (HIG :: PAD);
     m = new QComboBox;
-    m->addItem( tr( "Use Global Settings" ),                 TR_IDLELIMIT_GLOBAL );
-    m->addItem( tr( "Seed regardless of activity" ),         TR_IDLELIMIT_UNLIMITED );
-    m->addItem( tr( "Stop seeding if idle for N minutes:" ), TR_IDLELIMIT_SINGLE );
-    connect( m, SIGNAL(currentIndexChanged(int)), this, SLOT(onIdleModeChanged(int)));
-    h->addWidget( myIdleCombo = m );
-    s = new QSpinBox( );
-    s->setSingleStep( 5 );
-    s->setRange( 1, 9999 );
-    s->setProperty( PREF_KEY, TR_KEY_seedIdleLimit );
-    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
-    h->addWidget( myIdleSpin = s );
-    hig->addRow( tr( "&Idle:" ), h, m );
-
-
-    hig->addSectionDivider( );
-    hig->addSectionTitle( tr( "Peer Connections" ) );
-
-    s = new QSpinBox( );
-    s->setSingleStep( 5 );
-    s->setRange( 1, 300 );
-    s->setProperty( PREF_KEY, TR_KEY_peer_limit );
-    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
+    m->addItem (tr ("Use Global Settings"),                 TR_IDLELIMIT_GLOBAL);
+    m->addItem (tr ("Seed regardless of activity"),         TR_IDLELIMIT_UNLIMITED);
+    m->addItem (tr ("Stop seeding if idle for N minutes:"), TR_IDLELIMIT_SINGLE);
+    connect (m, SIGNAL (currentIndexChanged (int)), this, SLOT (onIdleModeChanged (int)));
+    h->addWidget (myIdleCombo = m);
+    s = new QSpinBox ();
+    s->setSingleStep (5);
+    s->setRange (1, 9999);
+    s->setProperty (PREF_KEY, TR_KEY_seedIdleLimit);
+    connect (s, SIGNAL (editingFinished ()), this, SLOT (onSpinBoxEditingFinished ()));
+    h->addWidget (myIdleSpin = s);
+    hig->addRow (tr ("&Idle:"), h, m);
+
+
+    hig->addSectionDivider ();
+    hig->addSectionTitle (tr ("Peer Connections"));
+
+    s = new QSpinBox ();
+    s->setSingleStep (5);
+    s->setRange (1, 300);
+    s->setProperty (PREF_KEY, TR_KEY_peer_limit);
+    connect (s, SIGNAL (editingFinished ()), this, SLOT (onSpinBoxEditingFinished ()));
     myPeerLimitSpin = s;
-    hig->addRow( tr( "&Maximum peers:" ), s );
-
-    hig->finish( );
+    hig->addRow (tr ("&Maximum peers:"), s);
+
+    hig->finish ();
 
     return hig;
@@ -1186 +1186 @@
 
 QWidget *
-Details :: createTrackerTab( )
+Details :: createTrackerTab ()
 {
     QCheckBox * c;
     QPushButton * p;
     QWidget * top = new QWidget;
-    QVBoxLayout * v = new QVBoxLayout( top );
-    QHBoxLayout * h = new QHBoxLayout();
-    QVBoxLayout * v2 = new QVBoxLayout();
-
-    v->setSpacing( HIG::PAD_BIG );
-    v->setContentsMargins( HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG );
-
-    h->setSpacing( HIG::PAD );
-    h->setContentsMargins( HIG::PAD_SMALL, HIG::PAD_SMALL, HIG::PAD_SMALL, HIG::PAD_SMALL );
-
-    v2->setSpacing( HIG::PAD );
+    QVBoxLayout * v = new QVBoxLayout (top);
+    QHBoxLayout * h = new QHBoxLayout ();
+    QVBoxLayout * v2 = new QVBoxLayout ();
+
+    v->setSpacing (HIG::PAD_BIG);
+    v->setContentsMargins (HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG);
+
+    h->setSpacing (HIG::PAD);
+    h->setContentsMargins (HIG::PAD_SMALL, HIG::PAD_SMALL, HIG::PAD_SMALL, HIG::PAD_SMALL);
+
+    v2->setSpacing (HIG::PAD);
 
     myTrackerModel = new TrackerModel;
     myTrackerFilter = new TrackerModelFilter;
-    myTrackerFilter->setSourceModel( myTrackerModel );
+    myTrackerFilter->setSourceModel (myTrackerModel);
     myTrackerView = new QTreeView;
-    myTrackerView->setModel( myTrackerFilter );
-    myTrackerView->setHeaderHidden( true );
-    myTrackerView->setSelectionMode( QTreeWidget::ExtendedSelection );
-    myTrackerView->setRootIsDecorated( false );
-    myTrackerView->setIndentation( 2 );
-    myTrackerView->setItemsExpandable( false );
-    myTrackerView->setAlternatingRowColors( true );
-    myTrackerView->setItemDelegate( myTrackerDelegate = new TrackerDelegate( ) );
-    connect( myTrackerView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(onTrackerSelectionChanged()));
-    h->addWidget( myTrackerView, 1 );
-
-    p = new QPushButton();
-    p->setIcon( getStockIcon( "list-add", QStyle::SP_DialogOpenButton ) );
-    p->setToolTip( tr( "Add Tracker" ));
+    myTrackerView->setModel (myTrackerFilter);
+    myTrackerView->setHeaderHidden (true);
+    myTrackerView->setSelectionMode (QTreeWidget::ExtendedSelection);
+    myTrackerView->setRootIsDecorated (false);
+    myTrackerView->setIndentation (2);
+    myTrackerView->setItemsExpandable (false);
+    myTrackerView->setAlternatingRowColors (true);
+    myTrackerView->setItemDelegate (myTrackerDelegate = new TrackerDelegate ());
+    connect (myTrackerView->selectionModel (), SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)), this, SLOT (onTrackerSelectionChanged ()));
+    h->addWidget (myTrackerView, 1);
+
+    p = new QPushButton ();
+    p->setIcon (getStockIcon ("list-add", QStyle::SP_DialogOpenButton));
+    p->setToolTip (tr ("Add Tracker"));
     myAddTrackerButton = p;
-    v2->addWidget( p, 1 );
-    connect( p, SIGNAL(clicked(bool)), this, SLOT(onAddTrackerClicked()));
-
-    p = new QPushButton();
-    p->setIcon( getStockIcon( "document-properties", QStyle::SP_DesktopIcon ) );
-    p->setToolTip( tr( "Edit Tracker" ));
+    v2->addWidget (p, 1);
+    connect (p, SIGNAL (clicked (bool)), this, SLOT (onAddTrackerClicked ()));
+
+    p = new QPushButton ();
+    p->setIcon (getStockIcon ("document-properties", QStyle::SP_DesktopIcon));
+    p->setToolTip (tr ("Edit Tracker"));
     myAddTrackerButton = p;
-    p->setEnabled( false );
+    p->setEnabled (false);
     myEditTrackerButton = p;
-    v2->addWidget( p, 1 );
-    connect( p, SIGNAL(clicked(bool)), this, SLOT(onEditTrackerClicked()));
-
-    p = new QPushButton();
-    p->setIcon( getStockIcon( "list-remove", QStyle::SP_TrashIcon ) );
-    p->setToolTip( tr( "Remove Trackers" ));
-    p->setEnabled( false );
+    v2->addWidget (p, 1);
+    connect (p, SIGNAL (clicked (bool)), this, SLOT (onEditTrackerClicked ()));
+
+    p = new QPushButton ();
+    p->setIcon (getStockIcon ("list-remove", QStyle::SP_TrashIcon));
+    p->setToolTip (tr ("Remove Trackers"));
+    p->setEnabled (false);
     myRemoveTrackerButton = p;
-    v2->addWidget( p, 1 );
-    connect( p, SIGNAL(clicked(bool)), this, SLOT(onRemoveTrackerClicked()));
-
-    v2->addStretch( 1 );
-
-    h->addLayout( v2, 1 );
-    h->setStretch( 1, 0 );
-
-    v->addLayout( h, 1 );
-
-    c = new QCheckBox( tr( "Show &more details" ) );
-    c->setChecked( myPrefs.getBool( Prefs::SHOW_TRACKER_SCRAPES ) );
+    v2->addWidget (p, 1);
+    connect (p, SIGNAL (clicked (bool)), this, SLOT (onRemoveTrackerClicked ()));
+
+    v2->addStretch (1);
+
+    h->addLayout (v2, 1);
+    h->setStretch (1, 0);
+
+    v->addLayout (h, 1);
+
+    c = new QCheckBox (tr ("Show &more details"));
+    c->setChecked (myPrefs.getBool (Prefs::SHOW_TRACKER_SCRAPES));
     myShowTrackerScrapesCheck = c;
-    v->addWidget( c, 1 );
-    connect( c, SIGNAL(clicked(bool)), this, SLOT(onShowTrackerScrapesToggled(bool)) );
-
-    c = new QCheckBox( tr( "Show &backup trackers" ) );
-    c->setChecked( myPrefs.getBool( Prefs::SHOW_BACKUP_TRACKERS ) );
+    v->addWidget (c, 1);
+    connect (c, SIGNAL (clicked (bool)), this, SLOT (onShowTrackerScrapesToggled (bool)));
+
+    c = new QCheckBox (tr ("Show &backup trackers"));
+    c->setChecked (myPrefs.getBool (Prefs::SHOW_BACKUP_TRACKERS));
     myShowBackupTrackersCheck = c;
-    v->addWidget( c, 1 );
-    connect( c, SIGNAL(clicked(bool)), this, SLOT(onShowBackupTrackersToggled(bool)) );
+    v->addWidget (c, 1);
+    connect (c, SIGNAL (clicked (bool)), this, SLOT (onShowBackupTrackersToggled (bool)));
 
     return top;
@@ -1269 +1269 @@
 
 QWidget *
-Details :: createPeersTab( )
+Details :: createPeersTab ()
 {
     QWidget * top = new QWidget;
-    QVBoxLayout * v = new QVBoxLayout( top );
-    v->setSpacing( HIG :: PAD_BIG );
-    v->setContentsMargins( HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG );
+    QVBoxLayout * v = new QVBoxLayout (top);
+    v->setSpacing (HIG :: PAD_BIG);
+    v->setContentsMargins (HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG);
 
     QStringList headers;
-    headers << QString() << tr("Up") << tr("Down") << tr("%") << tr("Status") << tr("Address") << tr("Client");
+    headers << QString () << tr ("Up") << tr ("Down") << tr ("%") << tr ("Status") << tr ("Address") << tr ("Client");
     myPeerTree = new QTreeWidget;
-    myPeerTree->setUniformRowHeights( true );
-    myPeerTree->setHeaderLabels( headers );
-    myPeerTree->setColumnWidth( 0, 20 );
-    myPeerTree->setSortingEnabled( true );
-    myPeerTree->sortByColumn( COL_ADDRESS, Qt::AscendingOrder );
-    myPeerTree->setRootIsDecorated( false );
-    myPeerTree->setTextElideMode( Qt::ElideRight );
-    v->addWidget( myPeerTree, 1 );
-
-    const QFontMetrics m( font( ) );
-    QSize size = m.size( 0, "1024 MiB/s" );
-    myPeerTree->setColumnWidth( COL_UP, size.width( ) );
-    myPeerTree->setColumnWidth( COL_DOWN, size.width( ) );
-    size = m.size( 0, " 100% " );
-    myPeerTree->setColumnWidth( COL_PERCENT, size.width( ) );
-    size = m.size( 0, "ODUK?EXI" );
-    myPeerTree->setColumnWidth( COL_STATUS, size.width( ) );
-    size = m.size( 0, "888.888.888.888" );
-    myPeerTree->setColumnWidth( COL_ADDRESS, size.width( ) );
-    size = m.size( 0, "Some BitTorrent Client" );
-    myPeerTree->setColumnWidth( COL_CLIENT, size.width( ) );
-    myPeerTree->setAlternatingRowColors( true );
+    myPeerTree->setUniformRowHeights (true);
+    myPeerTree->setHeaderLabels (headers);
+    myPeerTree->setColumnWidth (0, 20);
+    myPeerTree->setSortingEnabled (true);
+    myPeerTree->sortByColumn (COL_ADDRESS, Qt::AscendingOrder);
+    myPeerTree->setRootIsDecorated (false);
+    myPeerTree->setTextElideMode (Qt::ElideRight);
+    v->addWidget (myPeerTree, 1);
+
+    const QFontMetrics m (font ());
+    QSize size = m.size (0, "1024 MiB/s");
+    myPeerTree->setColumnWidth (COL_UP, size.width ());
+    myPeerTree->setColumnWidth (COL_DOWN, size.width ());
+    size = m.size (0, " 100% ");
+    myPeerTree->setColumnWidth (COL_PERCENT, size.width ());
+    size = m.size (0, "ODUK?EXI");
+    myPeerTree->setColumnWidth (COL_STATUS, size.width ());
+    size = m.size (0, "888.888.888.888");
+    myPeerTree->setColumnWidth (COL_ADDRESS, size.width ());
+    size = m.size (0, "Some BitTorrent Client");
+    myPeerTree->setColumnWidth (COL_CLIENT, size.width ());
+    myPeerTree->setAlternatingRowColors (true);
 
     return top;
@@ -1310 +1310 @@
 
 QWidget *
-Details :: createFilesTab( )
-{
-    myFileTreeView = new FileTreeView( );
-
-    connect( myFileTreeView, SIGNAL(      priorityChanged(const QSet<int>&, int)),
-             this,           SLOT(  onFilePriorityChanged(const QSet<int>&, int)));
-
-    connect( myFileTreeView, SIGNAL(      wantedChanged(const QSet<int>&, bool)),
-             this,           SLOT(  onFileWantedChanged(const QSet<int>&, bool)));
-
-    connect( myFileTreeView, SIGNAL( pathEdited(const QString&, const QString&)),
-             this,           SLOT (onPathEdited(const QString&, const QString&)));
+Details :: createFilesTab ()
+{
+    myFileTreeView = new FileTreeView ();
+
+    connect (myFileTreeView, SIGNAL (     priorityChanged (const QSet<int>&, int)),
+             this,           SLOT ( onFilePriorityChanged (const QSet<int>&, int)));
+
+    connect (myFileTreeView, SIGNAL (     wantedChanged (const QSet<int>&, bool)),
+             this,           SLOT ( onFileWantedChanged (const QSet<int>&, bool)));
+
+    connect (myFileTreeView, SIGNAL (pathEdited (const QString&, const QString&)),
+             this,           SLOT (onPathEdited (const QString&, const QString&)));
 
     return myFileTreeView;
@@ -1346 +1346 @@
     }
 
-  mySession.torrentSet (myIds, key, indices.toList());
-    getNewData( );
+  mySession.torrentSet (myIds, key, indices.toList ());
+    getNewData ();
 }
 
@@ -1354 +1354 @@
 {
   const tr_quark key = wanted ? TR_KEY_files_wanted : TR_KEY_files_unwanted;
-  mySession.torrentSet (myIds, key, indices.toList());
+  mySession.torrentSet (myIds, key, indices.toList ());
   getNewData ();
 }

trunk/qt/details.h

@@ -43 +43 @@
 class Details: public QDialog
 {
-        Q_OBJECT
+    Q_OBJECT
 
-    private:
-        void getNewData( );
+  private:
+    void getNewData ();
 
-    private slots:
-        void onTorrentChanged( );
-        void onTorrentFileListRebuilt( );
-        void onTimer( );
+  private slots:
+    void onTorrentChanged ();
+    void onTorrentFileListRebuilt ();
+    void onTimer ();
 
-    public:
-        Details( Session&, Prefs&, TorrentModel&, QWidget * parent = 0 );
-        ~Details( );
-        void setIds( const QSet<int>& ids );
+  public:
+    Details (Session&, Prefs&, TorrentModel&, QWidget * parent = 0);
+    ~Details ();
+    void setIds (const QSet<int>& ids);
 
-    private:
-        QWidget * createPeersTab( );
-        QWidget * createTrackerTab( );
-        QWidget * createInfoTab( );
-        QWidget * createFilesTab( );
-        QWidget * createOptionsTab( );
+  private:
+    QWidget * createPeersTab ();
+    QWidget * createTrackerTab ();
+    QWidget * createInfoTab ();
+    QWidget * createFilesTab ();
+    QWidget * createOptionsTab ();
 
-    private:
-        QIcon getStockIcon( const QString& freedesktop_name, int fallback );
-        QString timeToStringRounded( int seconds );
-        QString trimToDesiredWidth( const QString& str );
-        void enableWhenChecked( QCheckBox *, QWidget * );
+  private:
+    QIcon getStockIcon (const QString& freedesktop_name, int fallback);
+    QString timeToStringRounded (int seconds);
+    QString trimToDesiredWidth (const QString& str);
+    void enableWhenChecked (QCheckBox *, QWidget *);
 
-    private:
-        Session& mySession;
-        Prefs& myPrefs;
-        TorrentModel& myModel;
-        QSet<int> myIds;
-        QTimer myTimer;
-        bool myChangedTorrents;
-        bool myHavePendingRefresh;
+  private:
+    Session& mySession;
+    Prefs& myPrefs;
+    TorrentModel& myModel;
+    QSet<int> myIds;
+    QTimer myTimer;
+    bool myChangedTorrents;
+    bool myHavePendingRefresh;
 
-        QLabel * myStateLabel;
-        QLabel * myHaveLabel;
-        QLabel * myAvailabilityLabel;
-        QLabel * myDownloadedLabel;
-        QLabel * myUploadedLabel;
-        QLabel * myErrorLabel;
-        QLabel * myRunTimeLabel;
-        QLabel * myETALabel;
-        QLabel * myLastActivityLabel;
+    QLabel * myStateLabel;
+    QLabel * myHaveLabel;
+    QLabel * myAvailabilityLabel;
+    QLabel * myDownloadedLabel;
+    QLabel * myUploadedLabel;
+    QLabel * myErrorLabel;
+    QLabel * myRunTimeLabel;
+    QLabel * myETALabel;
+    QLabel * myLastActivityLabel;
 
-        QCheckBox * mySessionLimitCheck;
-        QCheckBox * mySingleDownCheck;
-        QCheckBox * mySingleUpCheck;
-        QCheckBox * myShowTrackerScrapesCheck;
-        QCheckBox * myShowBackupTrackersCheck;
-        QPushButton * myAddTrackerButton;
-        QPushButton * myEditTrackerButton;
-        QPushButton * myRemoveTrackerButton;
-        QSpinBox * mySingleDownSpin;
-        QSpinBox * mySingleUpSpin;
-        QComboBox * myRatioCombo;
-        QDoubleSpinBox * myRatioSpin;
-        QComboBox * myIdleCombo;
-        QSpinBox * myIdleSpin;
-        QSpinBox * myPeerLimitSpin;
-        QComboBox * myBandwidthPriorityCombo;
+    QCheckBox * mySessionLimitCheck;
+    QCheckBox * mySingleDownCheck;
+    QCheckBox * mySingleUpCheck;
+    QCheckBox * myShowTrackerScrapesCheck;
+    QCheckBox * myShowBackupTrackersCheck;
+    QPushButton * myAddTrackerButton;
+    QPushButton * myEditTrackerButton;
+    QPushButton * myRemoveTrackerButton;
+    QSpinBox * mySingleDownSpin;
+    QSpinBox * mySingleUpSpin;
+    QComboBox * myRatioCombo;
+    QDoubleSpinBox * myRatioSpin;
+    QComboBox * myIdleCombo;
+    QSpinBox * myIdleSpin;
+    QSpinBox * myPeerLimitSpin;
+    QComboBox * myBandwidthPriorityCombo;
 
-        QLabel * mySizeLabel;
-        QLabel * myHashLabel;
-        QLabel * myPrivacyLabel;
-        QLabel * myOriginLabel;
-        QLabel * myLocationLabel;
-        QTextBrowser * myCommentBrowser;
+    QLabel * mySizeLabel;
+    QLabel * myHashLabel;
+    QLabel * myPrivacyLabel;
+    QLabel * myOriginLabel;
+    QLabel * myLocationLabel;
+    QTextBrowser * myCommentBrowser;
 
-        QLabel * myTrackerLabel;
-        QLabel * myScrapeTimePrevLabel;
-        QLabel * myScrapeTimeNextLabel;
-        QLabel * myScrapeResponseLabel;
-        QLabel * myAnnounceTimePrevLabel;
-        QLabel * myAnnounceTimeNextLabel;
-        QLabel * myAnnounceResponseLabel;
-        QLabel * myAnnounceManualLabel;
+    QLabel * myTrackerLabel;
+    QLabel * myScrapeTimePrevLabel;
+    QLabel * myScrapeTimeNextLabel;
+    QLabel * myScrapeResponseLabel;
+    QLabel * myAnnounceTimePrevLabel;
+    QLabel * myAnnounceTimeNextLabel;
+    QLabel * myAnnounceResponseLabel;
+    QLabel * myAnnounceManualLabel;
 
-        TrackerModel * myTrackerModel;
-        TrackerModelFilter * myTrackerFilter;
-        TrackerDelegate * myTrackerDelegate;
-        QTreeView * myTrackerView;
-        //QMap<QString,QTreeWidgetItem*> myTrackerTiers;
-        //QMap<QString,QTreeWidgetItem*> myTrackerItems;
+    TrackerModel * myTrackerModel;
+    TrackerModelFilter * myTrackerFilter;
+    TrackerDelegate * myTrackerDelegate;
+    QTreeView * myTrackerView;
+    //QMap<QString,QTreeWidgetItem*> myTrackerTiers;
+    //QMap<QString,QTreeWidgetItem*> myTrackerItems;
 
-        QTreeWidget * myPeerTree;
-        QMap<QString,QTreeWidgetItem*> myPeers;
+    QTreeWidget * myPeerTree;
+    QMap<QString,QTreeWidgetItem*> myPeers;
 
-        QWidgetList myWidgets;
+    QWidgetList myWidgets;
 
-        FileTreeView * myFileTreeView;
+    FileTreeView * myFileTreeView;
 
-        bool myFilesDirty;
+    bool myFilesDirty;
 
-    private slots:
-        void refreshPref( int key );
-        void onBandwidthPriorityChanged( int );
-        void onFilePriorityChanged( const QSet<int>& fileIndices, int );
-        void onFileWantedChanged( const QSet<int>& fileIndices, bool );
-        void onPathEdited (const QString& oldpath, const QString& newname);
-        void onHonorsSessionLimitsToggled( bool );
-        void onDownloadLimitedToggled( bool );
-        void onSpinBoxEditingFinished( );
-        void onUploadLimitedToggled( bool );
-        void onRatioModeChanged( int );
-        void onIdleModeChanged( int );
-        void onShowTrackerScrapesToggled( bool );
-        void onShowBackupTrackersToggled( bool );
-        void onTrackerSelectionChanged( );
-        void onAddTrackerClicked( );
-        void onEditTrackerClicked( );
-        void onRemoveTrackerClicked( );
-        void refresh( );
+  private slots:
+    void refreshPref (int key);
+    void onBandwidthPriorityChanged (int);
+    void onFilePriorityChanged (const QSet<int>& fileIndices, int);
+    void onFileWantedChanged (const QSet<int>& fileIndices, bool);
+    void onPathEdited (const QString& oldpath, const QString& newname);
+    void onHonorsSessionLimitsToggled (bool);
+    void onDownloadLimitedToggled (bool);
+    void onSpinBoxEditingFinished ();
+    void onUploadLimitedToggled (bool);
+    void onRatioModeChanged (int);
+    void onIdleModeChanged (int);
+    void onShowTrackerScrapesToggled (bool);
+    void onShowBackupTrackersToggled (bool);
+    void onTrackerSelectionChanged ();
+    void onAddTrackerClicked ();
+    void onEditTrackerClicked ();
+    void onRemoveTrackerClicked ();
+    void refresh ();
 };
 

trunk/qt/filterbar.cc

@@ -39 +39 @@
 namespace
 {
-    int getHSpacing( QWidget * w )
-    {
-        return qMax( int(HIG::PAD_SMALL), w->style()->pixelMetric( QStyle::PM_LayoutHorizontalSpacing, 0, w ) );
-    }
-}
-
-FilterBarComboBoxDelegate :: FilterBarComboBoxDelegate( QObject * parent, QComboBox * combo ):
-    QItemDelegate( parent ),
-    myCombo( combo )
+  int getHSpacing (QWidget * w)
+  {
+    return qMax (int (HIG::PAD_SMALL), w->style ()->pixelMetric (QStyle::PM_LayoutHorizontalSpacing, 0, w));
+  }
+}
+
+FilterBarComboBoxDelegate :: FilterBarComboBoxDelegate (QObject * parent, QComboBox * combo):
+  QItemDelegate (parent),
+  myCombo (combo)
 {
 }
 
 bool
-FilterBarComboBoxDelegate :: isSeparator( const QModelIndex &index )
-{
-    return index.data(Qt::AccessibleDescriptionRole).toString() == QLatin1String("separator");
-}
-void
-FilterBarComboBoxDelegate :: setSeparator( QAbstractItemModel * model, const QModelIndex& index )
-{
-    model->setData( index, QString::fromLatin1("separator"), Qt::AccessibleDescriptionRole );
-
-    if( QStandardItemModel *m = qobject_cast<QStandardItemModel*>(model) )
-       if (QStandardItem *item = m->itemFromIndex(index))
-           item->setFlags(item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled));
-}
-
-void
-FilterBarComboBoxDelegate :: paint( QPainter                    * painter,
+FilterBarComboBoxDelegate :: isSeparator (const QModelIndex &index)
+{
+  return index.data (Qt::AccessibleDescriptionRole).toString () == QLatin1String ("separator");
+}
+void
+FilterBarComboBoxDelegate :: setSeparator (QAbstractItemModel * model, const QModelIndex& index)
+{
+  model->setData (index, QString::fromLatin1 ("separator"), Qt::AccessibleDescriptionRole);
+
+  if (QStandardItemModel *m = qobject_cast<QStandardItemModel*> (model))
+    if (QStandardItem *item = m->itemFromIndex (index))
+      item->setFlags (item->flags () & ~ (Qt::ItemIsSelectable|Qt::ItemIsEnabled));
+}
+
+void
+FilterBarComboBoxDelegate :: paint (QPainter                    * painter,
                                     const QStyleOptionViewItem  & option,
-                                    const QModelIndex           & index ) const
-{
-    if( isSeparator( index ) )
-    {
-        QRect rect = option.rect;
-        if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3*>(&option))
-            if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*>(v3->widget))
-                rect.setWidth(view->viewport()->width());
-        QStyleOption opt;
-        opt.rect = rect;
-        myCombo->style()->drawPrimitive(QStyle::PE_IndicatorToolBarSeparator, &opt, painter, myCombo);
-    }
-    else
-    {
-        QStyleOptionViewItem disabledOption = option;
-        disabledOption.state &= ~( QStyle::State_Enabled | QStyle::State_Selected );
-        QRect boundingBox = option.rect;
-
-        const int hmargin = getHSpacing( myCombo );
-        boundingBox.setLeft( boundingBox.left() + hmargin );
-        boundingBox.setRight( boundingBox.right() - hmargin );
-
-        QRect decorationRect = rect( option, index, Qt::DecorationRole );
-        decorationRect.moveLeft( decorationRect.left( ) );
-        decorationRect.setSize( myCombo->iconSize( ) );
-        decorationRect = QStyle::alignedRect( Qt::LeftToRight,
-                                              Qt::AlignLeft|Qt::AlignVCenter,
-                                              decorationRect.size(), boundingBox );
-        boundingBox.setLeft( decorationRect.right() + hmargin );
-
-        QRect countRect  = rect( option, index, TorrentCountRole );
-        countRect = QStyle::alignedRect( Qt::LeftToRight,
-                                         Qt::AlignRight|Qt::AlignVCenter,
-                                         countRect.size(), boundingBox );
-        boundingBox.setRight( countRect.left() - hmargin );
-        const QRect displayRect = boundingBox;
-
-        drawBackground( painter, option, index );
-        QStyleOptionViewItem option2 = option;
-        option2.decorationSize = myCombo->iconSize( );
-        drawDecoration( painter, option, decorationRect, decoration(option2,index.data(Qt::DecorationRole)) );
-        drawDisplay( painter, option, displayRect, index.data(Qt::DisplayRole).toString() );
-        drawDisplay( painter, disabledOption, countRect, index.data(TorrentCountRole).toString() );
-        drawFocus( painter, option, displayRect|countRect );
+                                    const QModelIndex           & index) const
+{
+  if (isSeparator (index))
+    {
+      QRect rect = option.rect;
+      if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3*> (&option))
+        if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*> (v3->widget))
+          rect.setWidth (view->viewport ()->width ());
+      QStyleOption opt;
+      opt.rect = rect;
+      myCombo->style ()->drawPrimitive (QStyle::PE_IndicatorToolBarSeparator, &opt, painter, myCombo);
+    }
+  else
+    {
+      QStyleOptionViewItem disabledOption = option;
+      disabledOption.state &= ~ (QStyle::State_Enabled | QStyle::State_Selected);
+      QRect boundingBox = option.rect;
+
+      const int hmargin = getHSpacing (myCombo);
+      boundingBox.setLeft (boundingBox.left () + hmargin);
+      boundingBox.setRight (boundingBox.right () - hmargin);
+
+      QRect decorationRect = rect (option, index, Qt::DecorationRole);
+      decorationRect.moveLeft (decorationRect.left ());
+      decorationRect.setSize (myCombo->iconSize ());
+      decorationRect = QStyle::alignedRect (Qt::LeftToRight,
+                                            Qt::AlignLeft|Qt::AlignVCenter,
+                                            decorationRect.size (), boundingBox);
+      boundingBox.setLeft (decorationRect.right () + hmargin);
+
+      QRect countRect  = rect (option, index, TorrentCountRole);
+      countRect = QStyle::alignedRect (Qt::LeftToRight,
+                                       Qt::AlignRight|Qt::AlignVCenter,
+                                       countRect.size (), boundingBox);
+      boundingBox.setRight (countRect.left () - hmargin);
+      const QRect displayRect = boundingBox;
+
+      drawBackground (painter, option, index);
+      QStyleOptionViewItem option2 = option;
+      option2.decorationSize = myCombo->iconSize ();
+      drawDecoration (painter, option, decorationRect, decoration (option2,index.data (Qt::DecorationRole)));
+      drawDisplay (painter, option, displayRect, index.data (Qt::DisplayRole).toString ());
+      drawDisplay (painter, disabledOption, countRect, index.data (TorrentCountRole).toString ());
+      drawFocus (painter, option, displayRect|countRect);
     }
 }
 
 QSize
-FilterBarComboBoxDelegate :: sizeHint( const QStyleOptionViewItem & option,
-                                       const QModelIndex          & index ) const
-{
-    if( isSeparator( index ) )
-    {
-        const int pm = myCombo->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, myCombo);
-        return QSize( pm, pm + 10 );
-    }
-    else
-    {
-        QStyle * s = myCombo->style( );
-        const int hmargin = getHSpacing( myCombo );
-
-        QSize size = QItemDelegate::sizeHint( option, index );
-        size.setHeight( qMax( size.height(), myCombo->iconSize().height() + 6 ) );
-        size.rwidth() += s->pixelMetric( QStyle::PM_FocusFrameHMargin, 0, myCombo );
-        size.rwidth() += rect(option,index,TorrentCountRole).width();
-        size.rwidth() += hmargin * 4;
-        return size;
+FilterBarComboBoxDelegate :: sizeHint (const QStyleOptionViewItem & option,
+                                       const QModelIndex          & index) const
+{
+  if (isSeparator (index))
+    {
+      const int pm = myCombo->style ()->pixelMetric (QStyle::PM_DefaultFrameWidth, 0, myCombo);
+      return QSize (pm, pm + 10);
+    }
+  else
+    {
+      QStyle * s = myCombo->style ();
+      const int hmargin = getHSpacing (myCombo);
+
+      QSize size = QItemDelegate::sizeHint (option, index);
+      size.setHeight (qMax (size.height (), myCombo->iconSize ().height () + 6));
+      size.rwidth () += s->pixelMetric (QStyle::PM_FocusFrameHMargin, 0, myCombo);
+      size.rwidth () += rect (option,index,TorrentCountRole).width ();
+      size.rwidth () += hmargin * 4;
+      return size;
     }
 }
@@ -143 +143 @@
 **/
 
-FilterBarComboBox :: FilterBarComboBox( QWidget * parent ):
-    QComboBox( parent )
-{
-}
-
-void
-FilterBarComboBox :: paintEvent( QPaintEvent * e )
-{
-    Q_UNUSED( e );
-
-    QStylePainter painter(this);
-    painter.setPen(palette().color(QPalette::Text));
-
-    // draw the combobox frame, focusrect and selected etc.
-    QStyleOptionComboBox opt;
-    initStyleOption(&opt);
-    painter.drawComplexControl(QStyle::CC_ComboBox, opt);
-
-    // draw the icon and text
-    const QModelIndex modelIndex = model()->index( currentIndex(), 0, rootModelIndex() );
-    if( modelIndex.isValid( ) )
-    {
-        QStyle * s = style();
-        QRect rect = s->subControlRect( QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxEditField, this );
-        const int hmargin = getHSpacing( this );
-        rect.setRight( rect.right() - hmargin );
-
-        // draw the icon
-        QPixmap pixmap;
-        QVariant variant = modelIndex.data( Qt::DecorationRole );
-        switch( variant.type( ) ) {
-            case QVariant::Pixmap: pixmap = qvariant_cast<QPixmap>(variant); break;
-            case QVariant::Icon:   pixmap = qvariant_cast<QIcon>(variant).pixmap(iconSize()); break;
-            default: break;
-        }
-        if( !pixmap.isNull() ) {
-            s->drawItemPixmap( &painter, rect, Qt::AlignLeft|Qt::AlignVCenter, pixmap );
-            rect.setLeft( rect.left() + pixmap.width() + hmargin );
-        }
-
-        // draw the count
-        QString text = modelIndex.data(TorrentCountRole).toString();
-        if( !text.isEmpty( ) )
-        {
-            const QPen pen = painter.pen( );
-            painter.setPen( opt.palette.color( QPalette::Disabled, QPalette::Text ) );
-            QRect r = s->itemTextRect( painter.fontMetrics(), rect, Qt::AlignRight|Qt::AlignVCenter, false, text );
-            painter.drawText( r, 0, text );
-            rect.setRight( r.left() - hmargin );
-            painter.setPen( pen );
-        }
-
-        // draw the text
-        text = modelIndex.data( Qt::DisplayRole ).toString();
-        text = painter.fontMetrics().elidedText ( text, Qt::ElideRight, rect.width() );
-        s->drawItemText( &painter, rect, Qt::AlignLeft|Qt::AlignVCenter, opt.palette, true, text );
+FilterBarComboBox :: FilterBarComboBox (QWidget * parent):
+  QComboBox (parent)
+{
+}
+
+void
+FilterBarComboBox :: paintEvent (QPaintEvent * e)
+{
+  Q_UNUSED (e);
+
+  QStylePainter painter (this);
+  painter.setPen (palette ().color (QPalette::Text));
+
+  // draw the combobox frame, focusrect and selected etc.
+  QStyleOptionComboBox opt;
+  initStyleOption (&opt);
+  painter.drawComplexControl (QStyle::CC_ComboBox, opt);
+
+  // draw the icon and text
+  const QModelIndex modelIndex = model ()->index (currentIndex (), 0, rootModelIndex ());
+  if (modelIndex.isValid ())
+    {
+      QStyle * s = style ();
+      QRect rect = s->subControlRect (QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxEditField, this);
+      const int hmargin = getHSpacing (this);
+      rect.setRight (rect.right () - hmargin);
+
+      // draw the icon
+      QPixmap pixmap;
+      QVariant variant = modelIndex.data (Qt::DecorationRole);
+      switch (variant.type ())
+        {
+          case QVariant::Pixmap: pixmap = qvariant_cast<QPixmap> (variant); break;
+          case QVariant::Icon:   pixmap = qvariant_cast<QIcon> (variant).pixmap (iconSize ()); break;
+          default: break;
+        }
+      if (!pixmap.isNull ())
+        {
+          s->drawItemPixmap (&painter, rect, Qt::AlignLeft|Qt::AlignVCenter, pixmap);
+          rect.setLeft (rect.left () + pixmap.width () + hmargin);
+        }
+
+      // draw the count
+      QString text = modelIndex.data (TorrentCountRole).toString ();
+      if (!text.isEmpty ())
+        {
+          const QPen pen = painter.pen ();
+          painter.setPen (opt.palette.color (QPalette::Disabled, QPalette::Text));
+          QRect r = s->itemTextRect (painter.fontMetrics (), rect, Qt::AlignRight|Qt::AlignVCenter, false, text);
+          painter.drawText (r, 0, text);
+          rect.setRight (r.left () - hmargin);
+          painter.setPen (pen);
+        }
+
+      // draw the text
+      text = modelIndex.data (Qt::DisplayRole).toString ();
+      text = painter.fontMetrics ().elidedText (text, Qt::ElideRight, rect.width ());
+      s->drawItemText (&painter, rect, Qt::AlignLeft|Qt::AlignVCenter, opt.palette, true, text);
     }
 }
@@ -209 +211 @@
 
 QComboBox*
-FilterBar :: createActivityCombo( )
-{
-    QComboBox * c = new FilterBarComboBox( this );
-    FilterBarComboBoxDelegate * delegate = new FilterBarComboBoxDelegate( 0, c );
-    c->setItemDelegate( delegate );
-
-    QPixmap blankPixmap( c->iconSize( ) );
-    blankPixmap.fill( Qt::transparent );
-    QIcon blankIcon( blankPixmap );
-
-    QStandardItemModel * model = new QStandardItemModel;
-
-    QStandardItem * row = new QStandardItem( tr( "All" ) );
-    row->setData( FilterMode::SHOW_ALL, ActivityRole );
-    model->appendRow( row );
-
-    model->appendRow( new QStandardItem ); // separator
-    delegate->setSeparator( model, model->index( 1, 0 ) );
-
-    row = new QStandardItem( QIcon::fromTheme( "system-run", blankIcon ), tr( "Active" ) );
-    row->setData( FilterMode::SHOW_ACTIVE, ActivityRole );
-    model->appendRow( row );
-
-    row = new QStandardItem( QIcon::fromTheme( "go-down", blankIcon ), tr( "Downloading" ) );
-    row->setData( FilterMode::SHOW_DOWNLOADING, ActivityRole );
-    model->appendRow( row );
-
-    row = new QStandardItem( QIcon::fromTheme( "go-up", blankIcon ), tr( "Seeding" ) );
-    row->setData( FilterMode::SHOW_SEEDING, ActivityRole );
-    model->appendRow( row );
-
-    row = new QStandardItem( QIcon::fromTheme( "media-playback-pause", blankIcon ), tr( "Paused" ) );
-    row->setData( FilterMode::SHOW_PAUSED, ActivityRole );
-    model->appendRow( row );
-
-    row = new QStandardItem( blankIcon, tr( "Finished" ) );
-    row->setData( FilterMode::SHOW_FINISHED, ActivityRole );
-    model->appendRow( row );
-
-    row = new QStandardItem( QIcon::fromTheme( "view-refresh", blankIcon ), tr( "Verifying" ) );
-    row->setData( FilterMode::SHOW_VERIFYING, ActivityRole );
-    model->appendRow( row );
-
-    row = new QStandardItem( QIcon::fromTheme( "dialog-error", blankIcon ), tr( "Error" ) );
-    row->setData( FilterMode::SHOW_ERROR, ActivityRole );
-    model->appendRow( row );
-
-    c->setModel( model );
-    return c;
+FilterBar :: createActivityCombo ()
+{
+  QComboBox * c = new FilterBarComboBox (this);
+  FilterBarComboBoxDelegate * delegate = new FilterBarComboBoxDelegate (0, c);
+  c->setItemDelegate (delegate);
+
+  QPixmap blankPixmap (c->iconSize ());
+  blankPixmap.fill (Qt::transparent);
+  QIcon blankIcon (blankPixmap);
+
+  QStandardItemModel * model = new QStandardItemModel;
+
+  QStandardItem * row = new QStandardItem (tr ("All"));
+  row->setData (FilterMode::SHOW_ALL, ActivityRole);
+  model->appendRow (row);
+
+  model->appendRow (new QStandardItem); // separator
+  delegate->setSeparator (model, model->index (1, 0));
+
+  row = new QStandardItem (QIcon::fromTheme ("system-run", blankIcon), tr ("Active"));
+  row->setData (FilterMode::SHOW_ACTIVE, ActivityRole);
+  model->appendRow (row);
+
+  row = new QStandardItem (QIcon::fromTheme ("go-down", blankIcon), tr ("Downloading"));
+  row->setData (FilterMode::SHOW_DOWNLOADING, ActivityRole);
+  model->appendRow (row);
+
+  row = new QStandardItem (QIcon::fromTheme ("go-up", blankIcon), tr ("Seeding"));
+  row->setData (FilterMode::SHOW_SEEDING, ActivityRole);
+  model->appendRow (row);
+
+  row = new QStandardItem (QIcon::fromTheme ("media-playback-pause", blankIcon), tr ("Paused"));
+  row->setData (FilterMode::SHOW_PAUSED, ActivityRole);
+  model->appendRow (row);
+
+  row = new QStandardItem (blankIcon, tr ("Finished"));
+  row->setData (FilterMode::SHOW_FINISHED, ActivityRole);
+  model->appendRow (row);
+
+  row = new QStandardItem (QIcon::fromTheme ("view-refresh", blankIcon), tr ("Verifying"));
+  row->setData (FilterMode::SHOW_VERIFYING, ActivityRole);
+  model->appendRow (row);
+
+  row = new QStandardItem (QIcon::fromTheme ("dialog-error", blankIcon), tr ("Error"));
+  row->setData (FilterMode::SHOW_ERROR, ActivityRole);
+  model->appendRow (row);
+
+  c->setModel (model);
+  return c;
 }
 
@@ -268 +270 @@
 namespace
 {
-    QString readableHostName( const QString host )
-    {
-        // get the readable name...
-        QString name = host;
-        const int pos = name.lastIndexOf( '.' );
-        if( pos >= 0 )
-            name.truncate( pos );
-        if( !name.isEmpty( ) )
-            name[0] = name[0].toUpper( );
-        return name;
-    }
-}
-
-void
-FilterBar :: refreshTrackers( )
-{
-    Favicons& favicons = dynamic_cast<MyApp*>(QApplication::instance())->favicons;
-    const int firstTrackerRow = 2; // skip over the "All" and separator...
-
-    // pull info from the tracker model...
-    QSet<QString> oldHosts;
-    for( int row=firstTrackerRow; ; ++row ) {
-        QModelIndex index = myTrackerModel->index( row, 0 );
-        if( !index.isValid( ) )
+  QString readableHostName (const QString host)
+  {
+    // get the readable name...
+    QString name = host;
+    const int pos = name.lastIndexOf ('.');
+    if (pos >= 0)
+      name.truncate (pos);
+    if (!name.isEmpty ())
+      name[0] = name[0].toUpper ();
+    return name;
+  }
+}
+
+void
+FilterBar :: refreshTrackers ()
+{
+  Favicons& favicons = dynamic_cast<MyApp*> (QApplication::instance ())->favicons;
+  const int firstTrackerRow = 2; // skip over the "All" and separator...
+
+  // pull info from the tracker model...
+  QSet<QString> oldHosts;
+  for (int row=firstTrackerRow; ; ++row)
+    {
+      QModelIndex index = myTrackerModel->index (row, 0);
+      if (!index.isValid ())
+        break;
+      oldHosts << index.data (TrackerRole).toString ();
+    }
+
+  // pull the new stats from the torrent model...
+  QSet<QString> newHosts;
+  QMap<QString,int> torrentsPerHost;
+  for (int row=0; ; ++row)
+    {
+      QModelIndex index = myTorrents.index (row, 0);
+      if (!index.isValid ())
+        break;
+      const Torrent * tor = index.data (TorrentModel::TorrentRole).value<const Torrent*> ();
+      QSet<QString> torrentNames;
+      foreach (QString host, tor->hosts ())
+        {
+          newHosts.insert (host);
+          torrentNames.insert (readableHostName (host));
+        }
+      foreach (QString name, torrentNames)
+        ++torrentsPerHost[name];
+    }
+
+  // update the "All" row
+  myTrackerModel->setData (myTrackerModel->index (0,0), getCountString (myTorrents.rowCount ()), TorrentCountRole);
+
+  // rows to update
+  foreach (QString host, oldHosts & newHosts)
+    {
+      const QString name = readableHostName (host);
+      QStandardItem * row = myTrackerModel->findItems (name).front ();
+      row->setData (getCountString (torrentsPerHost[name]), TorrentCountRole);
+      row->setData (favicons.findFromHost (host), Qt::DecorationRole);
+    }
+
+  // rows to remove
+  foreach (QString host, oldHosts - newHosts)
+    {
+      const QString name = readableHostName (host);
+      QStandardItem * item = myTrackerModel->findItems (name).front ();
+      if (!item->data (TrackerRole).toString ().isEmpty ()) // don't remove "All"
+        myTrackerModel->removeRows (item->row (), 1);
+    }
+
+  // rows to add
+  bool anyAdded = false;
+  foreach (QString host, newHosts - oldHosts)
+    {
+      const QString name = readableHostName (host);
+
+      if (!myTrackerModel->findItems (name).isEmpty ())
+        continue;
+
+      // find the sorted position to add this row
+      int i = firstTrackerRow;
+      for (int n=myTrackerModel->rowCount (); i<n; ++i)
+        {
+          const QString rowName = myTrackerModel->index (i,0).data (Qt::DisplayRole).toString ();
+          if (rowName >= name)
             break;
-        oldHosts << index.data(TrackerRole).toString();
-    }
-
-    // pull the new stats from the torrent model...
-    QSet<QString> newHosts;
-    QMap<QString,int> torrentsPerHost;
-    for( int row=0; ; ++row )
-    {
-        QModelIndex index = myTorrents.index( row, 0 );
-        if( !index.isValid( ) )
-            break;
-        const Torrent * tor = index.data( TorrentModel::TorrentRole ).value<const Torrent*>();
-        QSet<QString> torrentNames;
-        foreach (QString host, tor->hosts()) {
-          newHosts.insert (host);
-          torrentNames.insert (readableHostName(host));
-        }
-        foreach (QString name, torrentNames)
-          ++torrentsPerHost[name];
-    }
-
-    // update the "All" row
-    myTrackerModel->setData( myTrackerModel->index(0,0), getCountString(myTorrents.rowCount()), TorrentCountRole );
-
-    // rows to update
-    foreach( QString host, oldHosts & newHosts )
-    {
-        const QString name = readableHostName( host );
-        QStandardItem * row = myTrackerModel->findItems(name).front();
-        row->setData( getCountString(torrentsPerHost[name]), TorrentCountRole );
-        row->setData( favicons.findFromHost(host), Qt::DecorationRole );
-    }
-
-    // rows to remove
-    foreach( QString host, oldHosts - newHosts ) {
-        const QString name = readableHostName( host );
-        QStandardItem * item = myTrackerModel->findItems(name).front();
-        if( !item->data(TrackerRole).toString().isEmpty() ) // don't remove "All"
-            myTrackerModel->removeRows( item->row(), 1 );
-    }
-
-    // rows to add
-    bool anyAdded = false;
-    foreach( QString host, newHosts - oldHosts )
-    {
-        const QString name = readableHostName( host );
-
-        if( !myTrackerModel->findItems(name).isEmpty() )
-            continue;
-
-        // find the sorted position to add this row
-        int i = firstTrackerRow;
-        for( int n=myTrackerModel->rowCount(); i<n; ++i ) {
-            const QString rowName = myTrackerModel->index(i,0).data(Qt::DisplayRole).toString();
-            if( rowName >= name )
-                break;
-        }
-
-        // add the row
-        QStandardItem * row = new QStandardItem( favicons.findFromHost( host ), name );
-        row->setData( getCountString(torrentsPerHost[host]), TorrentCountRole );
-        row->setData( favicons.findFromHost(host), Qt::DecorationRole );
-        row->setData( host, TrackerRole );
-        myTrackerModel->insertRow( i, row );
-        anyAdded = true;
-    }
-
-    if( anyAdded ) // the one added might match our filter...
-        refreshPref( Prefs::FILTER_TRACKERS );
+        }
+
+      // add the row
+      QStandardItem * row = new QStandardItem (favicons.findFromHost (host), name);
+      row->setData (getCountString (torrentsPerHost[host]), TorrentCountRole);
+      row->setData (favicons.findFromHost (host), Qt::DecorationRole);
+      row->setData (host, TrackerRole);
+      myTrackerModel->insertRow (i, row);
+      anyAdded = true;
+    }
+
+  if (anyAdded) // the one added might match our filter...
+    refreshPref (Prefs::FILTER_TRACKERS);
 }
 
 
 QComboBox*
-FilterBar :: createTrackerCombo( QStandardItemModel * model )
-{
-    QComboBox * c = new FilterBarComboBox( this );
-    FilterBarComboBoxDelegate * delegate = new FilterBarComboBoxDelegate( 0, c );
-    c->setItemDelegate( delegate );
-
-    QStandardItem * row = new QStandardItem( tr( "All" ) );
-    row->setData( "", TrackerRole );
-    row->setData( getCountString(myTorrents.rowCount()), TorrentCountRole );
-    model->appendRow( row );
-
-    model->appendRow( new QStandardItem ); // separator
-    delegate->setSeparator( model, model->index( 1, 0 ) );
-
-    c->setModel( model );
-    return c;
+FilterBar :: createTrackerCombo (QStandardItemModel * model)
+{
+  QComboBox * c = new FilterBarComboBox (this);
+  FilterBarComboBoxDelegate * delegate = new FilterBarComboBoxDelegate (0, c);
+  c->setItemDelegate (delegate);
+
+  QStandardItem * row = new QStandardItem (tr ("All"));
+  row->setData ("", TrackerRole);
+  row->setData (getCountString (myTorrents.rowCount ()), TorrentCountRole);
+  model->appendRow (row);
+
+  model->appendRow (new QStandardItem); // separator
+  delegate->setSeparator (model, model->index (1, 0));
+
+  c->setModel (model);
+  return c;
 }
 
@@ -390 +396 @@
 ****/
 
-FilterBar :: FilterBar( Prefs& prefs, TorrentModel& torrents, TorrentFilter& filter, QWidget * parent ):
-    QWidget( parent ),
-    myPrefs( prefs ),
-    myTorrents( torrents ),
-    myFilter( filter ),
-    myRecountTimer( new QTimer( this ) ),
-    myIsBootstrapping( true )
-{
-    QHBoxLayout * h = new QHBoxLayout( this );
-    const int hmargin = qMax( int(HIG::PAD), style()->pixelMetric( QStyle::PM_LayoutHorizontalSpacing ) );
-
-    h->setSpacing( 0 );
-    h->setContentsMargins( 2, 2, 2, 2 );
-    h->addWidget( new QLabel( tr( "Show:" ), this ) );
-    h->addSpacing( hmargin );
-
-    myActivityCombo = createActivityCombo( );
-    h->addWidget( myActivityCombo, 1 );
-    h->addSpacing( hmargin );
-
-    myTrackerModel = new QStandardItemModel;
-    myTrackerCombo = createTrackerCombo( myTrackerModel );
-    h->addWidget( myTrackerCombo, 1 );
-    h->addSpacing( hmargin*2 );
-
-    myLineEdit = new QLineEdit( this );
-    h->addWidget( myLineEdit );
-    connect( myLineEdit, SIGNAL(textChanged(QString)), this, SLOT(onTextChanged(QString)));
-
-    QPushButton * p = new QPushButton;
-    QIcon icon = QIcon::fromTheme( "edit-clear", style()->standardIcon( QStyle::SP_DialogCloseButton ) );
-    int iconSize = style()->pixelMetric( QStyle::PM_SmallIconSize );
-    p->setIconSize( QSize( iconSize, iconSize ) );
-    p->setIcon( icon );
-    p->setFlat( true );
-    h->addWidget( p );
-    connect( p, SIGNAL(clicked(bool)), myLineEdit, SLOT(clear()));
-
-    // listen for changes from the other players
-    connect( &myPrefs, SIGNAL(changed(int)), this, SLOT(refreshPref(int)));
-    connect( myActivityCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onActivityIndexChanged(int)));
-    connect( myTrackerCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onTrackerIndexChanged(int)));
-    connect( &myTorrents, SIGNAL(modelReset()), this, SLOT(onTorrentModelReset()));
-    connect( &myTorrents, SIGNAL(rowsInserted(const QModelIndex&,int,int)), this, SLOT(onTorrentModelRowsInserted(const QModelIndex&,int,int)));
-    connect( &myTorrents, SIGNAL(rowsRemoved(const QModelIndex&,int,int)), this, SLOT(onTorrentModelRowsRemoved(const QModelIndex&,int,int)));
-    connect( &myTorrents, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(onTorrentModelDataChanged(const QModelIndex&,const QModelIndex&)));
-    connect( myRecountTimer, SIGNAL(timeout()), this, SLOT(recount()) );
-
-    recountSoon( );
-    refreshTrackers( );
-    myIsBootstrapping = false;
-
-    // initialize our state
-    QList<int> initKeys;
-    initKeys << Prefs :: FILTER_MODE
-             << Prefs :: FILTER_TRACKERS;
-    foreach( int key, initKeys )
-        refreshPref( key );
-}
-
-FilterBar :: ~FilterBar( )
-{
-    delete myRecountTimer;
+FilterBar :: FilterBar (Prefs& prefs, TorrentModel& torrents, TorrentFilter& filter, QWidget * parent):
+  QWidget (parent),
+  myPrefs (prefs),
+  myTorrents (torrents),
+  myFilter (filter),
+  myRecountTimer (new QTimer (this)),
+  myIsBootstrapping (true)
+{
+  QHBoxLayout * h = new QHBoxLayout (this);
+  const int hmargin = qMax (int (HIG::PAD), style ()->pixelMetric (QStyle::PM_LayoutHorizontalSpacing));
+
+  h->setSpacing (0);
+  h->setContentsMargins (2, 2, 2, 2);
+  h->addWidget (new QLabel (tr ("Show:"), this));
+  h->addSpacing (hmargin);
+
+  myActivityCombo = createActivityCombo ();
+  h->addWidget (myActivityCombo, 1);
+  h->addSpacing (hmargin);
+
+  myTrackerModel = new QStandardItemModel;
+  myTrackerCombo = createTrackerCombo (myTrackerModel);
+  h->addWidget (myTrackerCombo, 1);
+  h->addSpacing (hmargin*2);
+
+  myLineEdit = new QLineEdit (this);
+  h->addWidget (myLineEdit);
+  connect (myLineEdit, SIGNAL (textChanged (QString)), this, SLOT (onTextChanged (QString)));
+
+  QPushButton * p = new QPushButton;
+  QIcon icon = QIcon::fromTheme ("edit-clear", style ()->standardIcon (QStyle::SP_DialogCloseButton));
+  int iconSize = style ()->pixelMetric (QStyle::PM_SmallIconSize);
+  p->setIconSize (QSize (iconSize, iconSize));
+  p->setIcon (icon);
+  p->setFlat (true);
+  h->addWidget (p);
+  connect (p, SIGNAL (clicked (bool)), myLineEdit, SLOT (clear ()));
+
+  // listen for changes from the other players
+  connect (&myPrefs, SIGNAL (changed (int)), this, SLOT (refreshPref (int)));
+  connect (myActivityCombo, SIGNAL (currentIndexChanged (int)), this, SLOT (onActivityIndexChanged (int)));
+  connect (myTrackerCombo, SIGNAL (currentIndexChanged (int)), this, SLOT (onTrackerIndexChanged (int)));
+  connect (&myTorrents, SIGNAL (modelReset ()), this, SLOT (onTorrentModelReset ()));
+  connect (&myTorrents, SIGNAL (rowsInserted (const QModelIndex&,int,int)), this, SLOT (onTorrentModelRowsInserted (const QModelIndex&,int,int)));
+  connect (&myTorrents, SIGNAL (rowsRemoved (const QModelIndex&,int,int)), this, SLOT (onTorrentModelRowsRemoved (const QModelIndex&,int,int)));
+  connect (&myTorrents, SIGNAL (dataChanged (const QModelIndex&,const QModelIndex&)), this, SLOT (onTorrentModelDataChanged (const QModelIndex&,const QModelIndex&)));
+  connect (myRecountTimer, SIGNAL (timeout ()), this, SLOT (recount ()));
+
+  recountSoon ();
+  refreshTrackers ();
+  myIsBootstrapping = false;
+
+  // initialize our state
+  QList<int> initKeys;
+  initKeys << Prefs :: FILTER_MODE
+           << Prefs :: FILTER_TRACKERS;
+  foreach (int key, initKeys)
+      refreshPref (key);
+}
+
+FilterBar :: ~FilterBar ()
+{
+  delete myRecountTimer;
 }
 
@@ -460 +466 @@
 
 void
-FilterBar :: refreshPref( int key )
-{
-    switch( key )
-    {
-        case Prefs :: FILTER_MODE: {
-            const FilterMode m = myPrefs.get<FilterMode>( key );
-            QAbstractItemModel * model = myActivityCombo->model( );
-            QModelIndexList indices = model->match( model->index(0,0), ActivityRole, m.mode() );
-            myActivityCombo->setCurrentIndex( indices.isEmpty() ? 0 : indices.first().row( ) );
-            break;
-        }
-
-        case Prefs :: FILTER_TRACKERS: {
-            const QString tracker = myPrefs.getString( key );
-            const QString name = readableHostName( tracker );
-            QList<QStandardItem*> rows = myTrackerModel->findItems(name);
-            if( !rows.isEmpty() )
-                myTrackerCombo->setCurrentIndex( rows.front()->row() );
-            else { // hm, we don't seem to have this tracker anymore...
-                const bool isBootstrapping = myTrackerModel->rowCount( ) <= 2;
-                if( !isBootstrapping )
-                    myPrefs.set( key, "" );
+FilterBar :: refreshPref (int key)
+{
+  switch (key)
+    {
+      case Prefs :: FILTER_MODE:
+        {
+          const FilterMode m = myPrefs.get<FilterMode> (key);
+          QAbstractItemModel * model = myActivityCombo->model ();
+          QModelIndexList indices = model->match (model->index (0,0), ActivityRole, m.mode ());
+          myActivityCombo->setCurrentIndex (indices.isEmpty () ? 0 : indices.first ().row ());
+          break;
+        }
+
+      case Prefs :: FILTER_TRACKERS:
+        {
+          const QString tracker = myPrefs.getString (key);
+          const QString name = readableHostName (tracker);
+          QList<QStandardItem*> rows = myTrackerModel->findItems (name);
+          if (!rows.isEmpty ())
+            {
+              myTrackerCombo->setCurrentIndex (rows.front ()->row ());
             }
-            break;
-        }
-    }
-}
-
-void
-FilterBar :: onTextChanged( const QString& str )
-{
-    if( !myIsBootstrapping )
-        myPrefs.set( Prefs::FILTER_TEXT, str.trimmed( ) );
-}
-
-void
-FilterBar :: onTrackerIndexChanged( int i )
-{
-    if( !myIsBootstrapping )
-    {
-        QString str;
-        const bool isTracker = !myTrackerCombo->itemData(i,TrackerRole).toString().isEmpty();
-        if( !isTracker ) // show all
-            str = "";
-        else {
-            str = myTrackerCombo->itemData(i,TrackerRole).toString();
-            const int pos = str.lastIndexOf( '.' );
-            if( pos >= 0 )
-              str.truncate( pos+1 );
-        }
-        myPrefs.set( Prefs::FILTER_TRACKERS, str );
-    }
-}
-
-void
-FilterBar :: onActivityIndexChanged( int i )
-{
-    if( !myIsBootstrapping )
-    {
-        const FilterMode mode = myActivityCombo->itemData( i, ActivityRole ).toInt( );
-        myPrefs.set( Prefs::FILTER_MODE, mode );
+          else // hm, we don't seem to have this tracker anymore...
+            {
+              const bool isBootstrapping = myTrackerModel->rowCount () <= 2;
+              if (!isBootstrapping)
+                myPrefs.set (key, "");
+            }
+          break;
+        }
+    }
+}
+
+void
+FilterBar :: onTextChanged (const QString& str)
+{
+  if (!myIsBootstrapping)
+    myPrefs.set (Prefs::FILTER_TEXT, str.trimmed ());
+}
+
+void
+FilterBar :: onTrackerIndexChanged (int i)
+{
+  if (!myIsBootstrapping)
+    {
+      QString str;
+      const bool isTracker = !myTrackerCombo->itemData (i,TrackerRole).toString ().isEmpty ();
+      if (!isTracker) // show all
+        {
+          str = "";
+        }
+      else
+        {
+          str = myTrackerCombo->itemData (i,TrackerRole).toString ();
+          const int pos = str.lastIndexOf ('.');
+          if (pos >= 0)
+            str.truncate (pos+1);
+        }
+      myPrefs.set (Prefs::FILTER_TRACKERS, str);
+    }
+}
+
+void
+FilterBar :: onActivityIndexChanged (int i)
+{
+  if (!myIsBootstrapping)
+    {
+      const FilterMode mode = myActivityCombo->itemData (i, ActivityRole).toInt ();
+      myPrefs.set (Prefs::FILTER_MODE, mode);
     }
 }
@@ -528 +542 @@
 ***/
 
-void FilterBar :: onTorrentModelReset( ) { recountSoon( ); }
-void FilterBar :: onTorrentModelRowsInserted( const QModelIndex&, int, int ) { recountSoon( ); }
-void FilterBar :: onTorrentModelRowsRemoved( const QModelIndex&, int, int ) { recountSoon( ); }
-void FilterBar :: onTorrentModelDataChanged( const QModelIndex&, const QModelIndex& ) { recountSoon( ); }
-
-void
-FilterBar :: recountSoon( )
-{
-    if( !myRecountTimer->isActive( ) )
-    {
-        myRecountTimer->setSingleShot( true );
-        myRecountTimer->start( 800 );
+void FilterBar :: onTorrentModelReset () { recountSoon (); }
+void FilterBar :: onTorrentModelRowsInserted (const QModelIndex&, int, int) { recountSoon (); }
+void FilterBar :: onTorrentModelRowsRemoved (const QModelIndex&, int, int) { recountSoon (); }
+void FilterBar :: onTorrentModelDataChanged (const QModelIndex&, const QModelIndex&) { recountSoon (); }
+
+void
+FilterBar :: recountSoon ()
+{
+  if (!myRecountTimer->isActive ())
+    {
+      myRecountTimer->setSingleShot (true);
+      myRecountTimer->start (800);
     }
 }
@@ -545 +559 @@
 FilterBar :: recount ()
 {
-  QAbstractItemModel * model = myActivityCombo->model();
+  QAbstractItemModel * model = myActivityCombo->model ();
 
   int torrentsPerMode[FilterMode::NUM_MODES] = { };
   myFilter.countTorrentsPerMode (torrentsPerMode);
 
-  for (int row=0, n=model->rowCount(); row<n; ++row)
+  for (int row=0, n=model->rowCount (); row<n; ++row)
     {
       QModelIndex index = model->index (row, 0);
-      const int mode = index.data(ActivityRole).toInt();
-      model->setData (index, getCountString(torrentsPerMode[mode]), TorrentCountRole);
+      const int mode = index.data (ActivityRole).toInt ();
+      model->setData (index, getCountString (torrentsPerMode[mode]), TorrentCountRole);
     }
 
@@ -561 +575 @@
 
 QString
-FilterBar :: getCountString( int n ) const
-{
-    return QString("%L1").arg(n);
-}
+FilterBar :: getCountString (int n) const
+{
+  return QString ("%L1").arg (n);
+}

trunk/qt/filterbar.h

@@ -29 +29 @@
 class FilterBarComboBoxDelegate: public QItemDelegate
 {
-        Q_OBJECT
+    Q_OBJECT
 
-    public:
-        FilterBarComboBoxDelegate( QObject * parent, QComboBox * combo );
+  public:
+    FilterBarComboBoxDelegate (QObject * parent, QComboBox * combo);
 
-    public:
-        static bool isSeparator( const QModelIndex &index );
-        static void setSeparator( QAbstractItemModel * model, const QModelIndex& index );
+  public:
+    static bool isSeparator (const QModelIndex &index);
+    static void setSeparator (QAbstractItemModel * model, const QModelIndex& index);
 
-    protected:
-        virtual void paint( QPainter*, const QStyleOptionViewItem&, const QModelIndex& ) const;
-        virtual QSize sizeHint( const QStyleOptionViewItem&, const QModelIndex& ) const;
+  protected:
+    virtual void paint (QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const;
+    virtual QSize sizeHint (const QStyleOptionViewItem&, const QModelIndex&) const;
 
-    private:
-        QComboBox * myCombo;
+  private:
+    QComboBox * myCombo;
 
 };
@@ -49 +49 @@
 class FilterBarComboBox: public QComboBox
 {
-        Q_OBJECT
+    Q_OBJECT
 
-    public:
-        FilterBarComboBox( QWidget * parent = 0 );
+  public:
+    FilterBarComboBox (QWidget * parent = 0);
 
-    protected:
-        virtual void paintEvent( QPaintEvent * e );
+  protected:
+    virtual void paintEvent (QPaintEvent * e);
 };
 
@@ -61 +61 @@
 class FilterBar: public QWidget
 {
-        Q_OBJECT
+    Q_OBJECT
 
-    public:
-        FilterBar( Prefs& prefs, TorrentModel& torrents, TorrentFilter& filter, QWidget * parent = 0 );
-        ~FilterBar( );
+  public:
+    FilterBar (Prefs& prefs, TorrentModel& torrents, TorrentFilter& filter, QWidget * parent = 0);
+    ~FilterBar ();
 
-    private:
-        QComboBox * createTrackerCombo( QStandardItemModel *  );
-        QComboBox * createActivityCombo( );
-        void recountSoon( );
-        void refreshTrackers( );
-        QString getCountString( int n ) const;
+  private:
+    QComboBox * createTrackerCombo (QStandardItemModel * );
+    QComboBox * createActivityCombo ();
+    void recountSoon ();
+    void refreshTrackers ();
+    QString getCountString (int n) const;
 
-    private:
-        Prefs& myPrefs;
-        TorrentModel& myTorrents;
-        TorrentFilter& myFilter;
-        QComboBox * myActivityCombo;
-        QComboBox * myTrackerCombo;
-        QStandardItemModel * myTrackerModel;
-        QTimer * myRecountTimer;
-        bool myIsBootstrapping;
-        QLineEdit * myLineEdit;
+  private:
+    Prefs& myPrefs;
+    TorrentModel& myTorrents;
+    TorrentFilter& myFilter;
+    QComboBox * myActivityCombo;
+    QComboBox * myTrackerCombo;
+    QStandardItemModel * myTrackerModel;
+    QTimer * myRecountTimer;
+    bool myIsBootstrapping;
+    QLineEdit * myLineEdit;
 
-    private slots:
-        void recount( );
-        void refreshPref( int key );
-        void onActivityIndexChanged( int index );
-        void onTrackerIndexChanged( int index );
-        void onTorrentModelReset( );
-        void onTorrentModelRowsInserted( const QModelIndex&, int, int );
-        void onTorrentModelRowsRemoved( const QModelIndex&, int, int );
-        void onTorrentModelDataChanged( const QModelIndex&, const QModelIndex& );
-        void onTextChanged( const QString& );
+  private slots:
+    void recount ();
+    void refreshPref (int key);
+    void onActivityIndexChanged (int index);
+    void onTrackerIndexChanged (int index);
+    void onTorrentModelReset ();
+    void onTorrentModelRowsInserted (const QModelIndex&, int, int);
+    void onTorrentModelRowsRemoved (const QModelIndex&, int, int);
+    void onTorrentModelDataChanged (const QModelIndex&, const QModelIndex&);
+    void onTextChanged (const QString&);
 };
 

trunk/qt/prefs.h

@@ -31 +31 @@
 class Prefs: public QObject
 {
-        Q_OBJECT;
+    Q_OBJECT;
 
-    public:
+  public:
 
-        enum
+    enum
+    {
+      /* client prefs */
+      OPTIONS_PROMPT,
+      OPEN_DIALOG_FOLDER,
+      INHIBIT_HIBERNATION,
+      DIR_WATCH,
+      DIR_WATCH_ENABLED,
+      SHOW_TRAY_ICON,
+      START_MINIMIZED,
+      SHOW_NOTIFICATION_ON_ADD,
+      SHOW_NOTIFICATION_ON_COMPLETE,
+      ASKQUIT,
+      SORT_MODE,
+      SORT_REVERSED,
+      COMPACT_VIEW,
+      FILTERBAR,
+      STATUSBAR,
+      STATUSBAR_STATS,
+      SHOW_TRACKER_SCRAPES,
+      SHOW_BACKUP_TRACKERS,
+      TOOLBAR,
+      BLOCKLIST_DATE,
+      BLOCKLIST_UPDATES_ENABLED,
+      MAIN_WINDOW_LAYOUT_ORDER,
+      MAIN_WINDOW_HEIGHT,
+      MAIN_WINDOW_WIDTH,
+      MAIN_WINDOW_X,
+      MAIN_WINDOW_Y,
+      FILTER_MODE,
+      FILTER_TRACKERS,
+      FILTER_TEXT,
+      SESSION_IS_REMOTE,
+      SESSION_REMOTE_HOST,
+      SESSION_REMOTE_PORT,
+      SESSION_REMOTE_AUTH,
+      SESSION_REMOTE_USERNAME,
+      SESSION_REMOTE_PASSWORD,
+      COMPLETE_SOUND_COMMAND,
+      COMPLETE_SOUND_ENABLED,
+      USER_HAS_GIVEN_INFORMED_CONSENT,
+
+      /* core prefs */
+      FIRST_CORE_PREF,
+      ALT_SPEED_LIMIT_UP = FIRST_CORE_PREF,
+      ALT_SPEED_LIMIT_DOWN,
+      ALT_SPEED_LIMIT_ENABLED,
+      ALT_SPEED_LIMIT_TIME_BEGIN,
+      ALT_SPEED_LIMIT_TIME_END,
+      ALT_SPEED_LIMIT_TIME_ENABLED,
+      ALT_SPEED_LIMIT_TIME_DAY,
+      BLOCKLIST_ENABLED,
+      BLOCKLIST_URL,
+      DSPEED,
+      DSPEED_ENABLED,
+      DOWNLOAD_DIR,
+      DOWNLOAD_QUEUE_ENABLED,
+      DOWNLOAD_QUEUE_SIZE,
+      ENCRYPTION,
+      IDLE_LIMIT,
+      IDLE_LIMIT_ENABLED,
+      INCOMPLETE_DIR,
+      INCOMPLETE_DIR_ENABLED,
+      MSGLEVEL,
+      PEER_LIMIT_GLOBAL,
+      PEER_LIMIT_TORRENT,
+      PEER_PORT,
+      PEER_PORT_RANDOM_ON_START,
+      PEER_PORT_RANDOM_LOW,
+      PEER_PORT_RANDOM_HIGH,
+      QUEUE_STALLED_MINUTES,
+      SCRIPT_TORRENT_DONE_ENABLED,
+      SCRIPT_TORRENT_DONE_FILENAME,
+      SOCKET_TOS,
+      START,
+      TRASH_ORIGINAL,
+      PEX_ENABLED,
+      DHT_ENABLED,
+      UTP_ENABLED,
+      LPD_ENABLED,
+      PORT_FORWARDING,
+      PREALLOCATION,
+      RATIO,
+      RATIO_ENABLED,
+      RENAME_PARTIAL_FILES,
+      RPC_AUTH_REQUIRED,
+      RPC_ENABLED,
+      RPC_PASSWORD,
+      RPC_PORT,
+      RPC_USERNAME,
+      RPC_WHITELIST_ENABLED,
+      RPC_WHITELIST,
+      USPEED_ENABLED,
+      USPEED,
+      UPLOAD_SLOTS_PER_TORRENT,
+      LAST_CORE_PREF = UPLOAD_SLOTS_PER_TORRENT,
+
+      PREFS_COUNT
+    };
+
+  private:
+
+    struct PrefItem
+    {
+      int id;
+      tr_quark key;
+      int type;
+    };
+
+    static PrefItem myItems[];
+
+  private:
+    QSet<int> myTemporaryPrefs;
+    QString myConfigDir;
+    mutable QVariant myValues[PREFS_COUNT];
+    void initDefaults (struct tr_variant*);
+
+  public:
+    bool isCore (int key) const { return FIRST_CORE_PREF<=key && key<=LAST_CORE_PREF; }
+    bool isClient (int key) const { return !isCore (key); }
+    const char * keyStr (int i) const { return tr_quark_get_string (myItems[i].key,NULL); }
+    tr_quark getKey  (int i) const { return myItems[i].key; }
+    int type (int i) const { return myItems[i].type; }
+    const QVariant& variant (int i) const { return myValues[i]; }
+
+    Prefs (const char * configDir);
+    ~Prefs ();
+
+    int getInt (int key) const;
+    bool getBool (int key) const;
+    QString getString (int key) const;
+    double getDouble (int key) const;
+    QDateTime getDateTime (int key) const;
+
+    template<typename T> T get (int key) const { return myValues[key].value<T>(); }
+
+    void set (int key, char * value) { set (key, QString::fromUtf8 (value)); }
+    void set (int key, const char * value) { set (key, QString::fromUtf8 (value)); }
+
+    template<typename T> void set (int key, const T& value)
+    {
+      QVariant& v (myValues[key]);
+      const QVariant tmp = QVariant::fromValue (value);
+      if (v.isNull() || (v!=tmp))
         {
-            /* client prefs */
-            OPTIONS_PROMPT,
-            OPEN_DIALOG_FOLDER,
-            INHIBIT_HIBERNATION,
-            DIR_WATCH,
-            DIR_WATCH_ENABLED,
-            SHOW_TRAY_ICON,
-            START_MINIMIZED,
-            SHOW_NOTIFICATION_ON_ADD,
-            SHOW_NOTIFICATION_ON_COMPLETE,
-            ASKQUIT,
-            SORT_MODE,
-            SORT_REVERSED,
-            COMPACT_VIEW,
-            FILTERBAR,
-            STATUSBAR,
-            STATUSBAR_STATS,
-            SHOW_TRACKER_SCRAPES,
-            SHOW_BACKUP_TRACKERS,
-            TOOLBAR,
-            BLOCKLIST_DATE,
-            BLOCKLIST_UPDATES_ENABLED,
-            MAIN_WINDOW_LAYOUT_ORDER,
-            MAIN_WINDOW_HEIGHT,
-            MAIN_WINDOW_WIDTH,
-            MAIN_WINDOW_X,
-            MAIN_WINDOW_Y,
-            FILTER_MODE,
-            FILTER_TRACKERS,
-            FILTER_TEXT,
-            SESSION_IS_REMOTE,
-            SESSION_REMOTE_HOST,
-            SESSION_REMOTE_PORT,
-            SESSION_REMOTE_AUTH,
-            SESSION_REMOTE_USERNAME,
-            SESSION_REMOTE_PASSWORD,
-            COMPLETE_SOUND_COMMAND,
-            COMPLETE_SOUND_ENABLED,
-            USER_HAS_GIVEN_INFORMED_CONSENT,
+          v = tmp;
+          emit changed (key);
+        }
+    }
 
-            /* core prefs */
-            FIRST_CORE_PREF,
-            ALT_SPEED_LIMIT_UP = FIRST_CORE_PREF,
-            ALT_SPEED_LIMIT_DOWN,
-            ALT_SPEED_LIMIT_ENABLED,
-            ALT_SPEED_LIMIT_TIME_BEGIN,
-            ALT_SPEED_LIMIT_TIME_END,
-            ALT_SPEED_LIMIT_TIME_ENABLED,
-            ALT_SPEED_LIMIT_TIME_DAY,
-            BLOCKLIST_ENABLED,
-            BLOCKLIST_URL,
-            DSPEED,
-            DSPEED_ENABLED,
-            DOWNLOAD_DIR,
-            DOWNLOAD_QUEUE_ENABLED,
-            DOWNLOAD_QUEUE_SIZE,
-            ENCRYPTION,
-            IDLE_LIMIT,
-            IDLE_LIMIT_ENABLED,
-            INCOMPLETE_DIR,
-            INCOMPLETE_DIR_ENABLED,
-            MSGLEVEL,
-            PEER_LIMIT_GLOBAL,
-            PEER_LIMIT_TORRENT,
-            PEER_PORT,
-            PEER_PORT_RANDOM_ON_START,
-            PEER_PORT_RANDOM_LOW,
-            PEER_PORT_RANDOM_HIGH,
-            QUEUE_STALLED_MINUTES,
-            SCRIPT_TORRENT_DONE_ENABLED,
-            SCRIPT_TORRENT_DONE_FILENAME,
-            SOCKET_TOS,
-            START,
-            TRASH_ORIGINAL,
-            PEX_ENABLED,
-            DHT_ENABLED,
-            UTP_ENABLED,
-            LPD_ENABLED,
-            PORT_FORWARDING,
-            PREALLOCATION,
-            RATIO,
-            RATIO_ENABLED,
-            RENAME_PARTIAL_FILES,
-            RPC_AUTH_REQUIRED,
-            RPC_ENABLED,
-            RPC_PASSWORD,
-            RPC_PORT,
-            RPC_USERNAME,
-            RPC_WHITELIST_ENABLED,
-            RPC_WHITELIST,
-            USPEED_ENABLED,
-            USPEED,
-            UPLOAD_SLOTS_PER_TORRENT,
-            LAST_CORE_PREF = UPLOAD_SLOTS_PER_TORRENT,
+    void toggleBool (int key);
 
-            PREFS_COUNT
-        };
-
-    private:
-
-        struct PrefItem {
-            int id;
-            tr_quark key;
-            int type;
-        };
-
-        static PrefItem myItems[];
-
-    private:
-        QSet<int> myTemporaryPrefs;
-        QString myConfigDir;
-        mutable QVariant myValues[PREFS_COUNT];
-        void initDefaults( struct tr_variant* );
-
-    public:
-        bool isCore( int key ) const { return FIRST_CORE_PREF<=key && key<=LAST_CORE_PREF; }
-        bool isClient( int key ) const { return !isCore( key ); }
-        const char * keyStr( int i ) const { return tr_quark_get_string(myItems[i].key,NULL); }
-        tr_quark getKey (int i) const { return myItems[i].key; }
-        int type( int i ) const { return myItems[i].type; }
-        const QVariant& variant( int i ) const { return myValues[i]; }
-
-        Prefs( const char * configDir );
-        ~Prefs( );
-
-        int getInt( int key ) const;
-        bool getBool( int key) const;
-        QString getString( int key ) const;
-        double getDouble( int key) const;
-        QDateTime getDateTime( int key ) const;
-
-        template<typename T> T get( int key ) const {
-            return myValues[key].value<T>();
-        }
-
-        void set( int key, char * value ) { set( key, QString::fromUtf8(value) ); }
-        void set( int key, const char * value ) { set( key, QString::fromUtf8(value) ); }
-
-        template<typename T> void set( int key, const T& value ) {
-            QVariant& v( myValues[key] );
-            const QVariant tmp = QVariant::fromValue(value);
-            if( v.isNull() || (v!=tmp) ) {
-                v = tmp;
-                emit changed( key );
-            }
-        }
-
-        void toggleBool( int key );
-
-     signals:
-        void changed( int key );
+  signals:
+    void changed (int key);
 };