Changeset 11097

Timestamp:

Aug 2, 2010, 6:31:27 PM (12 years ago)

Author:

charles

Message:

(trunk qt) minor cleanup in the delegate code

Location:

trunk/qt

Files:

• torrent-delegate-min.cc (modified) (3 diffs)
• torrent-delegate.cc (modified) (1 diff)
• tracker-delegate.cc (modified) (1 diff)

trunk/qt/torrent-delegate-min.cc

@@ -57 +57 @@
     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 );
@@ -63 +63 @@
     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 ) );
 }
 
@@ -84 +84 @@
     const bool isMagnet( !tor.hasMetadata( ) );
     const QString nameStr = (isMagnet ? progressString( tor ) : tor.name( ) );
-    const QSize nameSize( nameFM.size( 0, nameStr ) );
 
     QFont statusFont( option.font );

trunk/qt/torrent-delegate.cc

@@ -279 +279 @@
     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() );

trunk/qt/tracker-delegate.cc

@@ -13 +13 @@
 #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>