(trunk qt) minor cleanup in the delegate code

diff --git a/qt/torrent-delegate-min.cc b/qt/torrent-delegate-min.cc
index 94365b54fc956d790184b8c854eed04fb77a250f..9e5b8ee88263dfb3f1502c4d909c11b18d514c65 100644 (file)
--- a/qt/torrent-delegate-min.cc
+++ b/qt/torrent-delegate-min.cc
@@ -56,20 +56,20 @@ TorrentDelegateMin :: sizeHint( const QStyleOptionViewItem& option, const Torren
     const QFontMetrics nameFM( nameFont );
     const bool isMagnet( !tor.hasMetadata( ) );
     const QString nameStr = (isMagnet ? progressString( tor ) : tor.name( ) );
-    const QSize nameSize( nameFM.size( 0, nameStr ) );
+    const int nameWidth = nameFM.width( nameStr );
 
     QFont statusFont( option.font );
     statusFont.setPointSize( int( option.font.pointSize( ) * 0.85 ) );
     const QFontMetrics statusFM( statusFont );
     const QString statusStr( shortStatusString( tor ) );
-    const QSize statusSize( statusFM.size( 0, statusStr ) );
+    const int statusWidth = statusFM.width( statusStr );
 
     const QSize m( margin( *style ) );
 
-    return QSize( m.width()*2 + iconSize + GUI_PAD + nameSize.width()
-                                         + GUI_PAD + statusSize.width()
+    return QSize( m.width()*2 + iconSize + GUI_PAD + nameWidth
+                                         + GUI_PAD + statusWidth
                                          + GUI_PAD + BAR_WIDTH,
-                  m.height()*2 + std::max( nameSize.height(), (int)BAR_HEIGHT ) );
+                  m.height()*2 + std::max( nameFM.height(), (int)BAR_HEIGHT ) );
 }
 
 void
@@ -83,7 +83,6 @@ TorrentDelegateMin :: drawTorrent( QPainter * painter, const QStyleOptionViewIte
     const QFontMetrics nameFM( nameFont );
     const bool isMagnet( !tor.hasMetadata( ) );
     const QString nameStr = (isMagnet ? progressString( tor ) : tor.name( ) );
-    const QSize nameSize( nameFM.size( 0, nameStr ) );
 
     QFont statusFont( option.font );
     statusFont.setPointSize( int( option.font.pointSize( ) * 0.85 ) );

diff --git a/qt/torrent-delegate.cc b/qt/torrent-delegate.cc
index 4cbd106f1f1457d96973583544749500a9c38bfd..680f5fcaa576c23905805f7a5ad2dd911f7e4e5d 100644 (file)
--- a/qt/torrent-delegate.cc
+++ b/qt/torrent-delegate.cc
@@ -278,18 +278,18 @@ TorrentDelegate :: sizeHint( const QStyleOptionViewItem& option, const Torrent&
     nameFont.setWeight( QFont::Bold );
     const QFontMetrics nameFM( nameFont );
     const QString nameStr( tor.name( ) );
-    const QSize nameSize( nameFM.size( 0, nameStr ) );
+    const int nameWidth = nameFM.width( nameStr );
     QFont statusFont( option.font );
     statusFont.setPointSize( int( option.font.pointSize( ) * 0.9 ) );
     const QFontMetrics statusFM( statusFont );
     const QString statusStr( statusString( tor ) );
-    const QSize statusSize( statusFM.size( 0, statusStr ) );
+    const int statusWidth = statusFM.width( statusStr );
     QFont progressFont( statusFont );
     const QFontMetrics progressFM( progressFont );
     const QString progressStr( progressString( tor ) );
-    const QSize progressSize( progressFM.size( 0, progressStr ) );
+    const int progressWidth = progressFM.width( progressStr );
     const QSize m( margin( *style ) );
-    return QSize( m.width()*2 + iconSize + GUI_PAD + MAX3( nameSize.width(), statusSize.width(), progressSize.width() ),
+    return QSize( m.width()*2 + iconSize + GUI_PAD + MAX3( nameWidth, statusWidth, progressWidth ),
                   //m.height()*3 + nameFM.lineSpacing() + statusFM.lineSpacing()*2 + progressFM.lineSpacing() );
                   m.height()*3 + nameFM.lineSpacing() + statusFM.lineSpacing() + BAR_HEIGHT + progressFM.lineSpacing() );
 }

diff --git a/qt/tracker-delegate.cc b/qt/tracker-delegate.cc
index b83ebec7febb2092bb2af4e5bd959e45b4e97ad3..adbbed15e0e3b7bc111f2bbd4d769f3350730375 100644 (file)
--- a/qt/tracker-delegate.cc
+++ b/qt/tracker-delegate.cc
@@ -12,18 +12,9 @@
 
 #include <iostream>
 
-#include <QApplication>
-#include <QBrush>
-#include <QFont>
-#include <QFontMetrics>
-#include <QIcon>
-#include <QModelIndex>
 #include <QPainter>
 #include <QPixmap>
-#include <QPixmapCache>
-#include <QStyleOptionProgressBarV2>
 #include <QTextDocument>
-#include <QUrl>
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/utils.h>