(trunk qt) minor cleanup

This commit is contained in:
Charles Kerr 2009-10-06 00:27:26 +00:00
parent c5835f711e
commit 4e18bc9734
12 changed files with 48 additions and 50 deletions

View File

@ -16,8 +16,8 @@
#include <QDialogButtonBox>
#include <QIcon>
#include <QLibraryInfo>
#include <QLabel>
#include <QLibraryInfo>
#include <QRect>
#include <QTranslator>

View File

@ -16,29 +16,28 @@
#include <QCheckBox>
#include <QComboBox>
#include <QEvent>
#include <QHeaderView>
#include <QResizeEvent>
#include <QDateTime>
#include <QDialogButtonBox>
#include <QDoubleSpinBox>
#include <QEvent>
#include <QFont>
#include <QFontMetrics>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QLocale>
#include <QPushButton>
#include <QSpinBox>
#include <QRadioButton>
#include <QResizeEvent>
#include <QSpinBox>
#include <QStyle>
#include <QTabWidget>
#include <QTreeView>
#include <QTextBrowser>
#include <QDateTime>
#include <QTreeView>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <libtransmission/transmission.h>

View File

@ -14,9 +14,9 @@
#include <iostream>
#include <QApplication>
#include <QHeaderView>
#include <QPainter>
#include <QResizeEvent>
#include <QHeaderView>
#include <QStringList>
#include <libtransmission/transmission.h> // priorities

View File

@ -17,13 +17,13 @@
#include <QCloseEvent>
#include <QDesktopServices>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QLabel>
#include <QSignalMapper>
#include <QSize>
#include <QStyle>
#include <QHBoxLayout>
#include <QSystemTrayIcon>
#include <QUrl>
#include <QSignalMapper>
#include <libtransmission/version.h>

View File

@ -130,10 +130,9 @@ MakeDialog :: makeTorrent( )
QVBoxLayout * top = new QVBoxLayout( dialog );
top->addWidget(( myNewLabel = new QLabel));
top->addWidget(( myNewProgress = new QProgressBar ));
QDialogButtonBox * buttons = new QDialogButtonBox( dialog );
buttons->setStandardButtons( QDialogButtonBox::Ok
| QDialogButtonBox::Open
| QDialogButtonBox::Abort );
QDialogButtonBox * buttons = new QDialogButtonBox( QDialogButtonBox::Ok
| QDialogButtonBox::Open
| QDialogButtonBox::Abort );
myNewButtonBox = buttons;
connect( buttons, SIGNAL(clicked(QAbstractButton*)),
this, SLOT(onNewButtonBoxClicked(QAbstractButton*)) );
@ -383,9 +382,8 @@ MakeDialog :: MakeDialog( Session & session, QWidget * parent ):
hig->finish( );
top->addWidget( hig, 1 );
myButtonBox = new QDialogButtonBox( this );
myButtonBox->setStandardButtons( QDialogButtonBox::Ok
| QDialogButtonBox::Close );
myButtonBox = new QDialogButtonBox( QDialogButtonBox::Ok
| QDialogButtonBox::Close );
connect( myButtonBox, SIGNAL(clicked(QAbstractButton*)),
this, SLOT(onButtonBoxClicked(QAbstractButton*)) );

View File

@ -13,19 +13,19 @@
#include <cstdio>
#include <iostream>
#include <QCheckBox>
#include <QDialogButtonBox>
#include <QEvent>
#include <QResizeEvent>
#include <QFileDialog>
#include <QFileIconProvider>
#include <QFileInfo>
#include <QGridLayout>
#include <QLabel>
#include <QCheckBox>
#include <QFileInfo>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QLabel>
#include <QResizeEvent>
#include <QSet>
#include <QWidget>
#include <QVBoxLayout>
#include <QWidget>
#include <libtransmission/transmission.h>
#include <libtransmission/bencode.h>
@ -35,7 +35,6 @@
#include "hig.h"
#include "options.h"
#include "prefs.h"
#include "qticonloader.h"
#include "session.h"
#include "torrent.h"
@ -79,7 +78,8 @@ Options :: Options( Session& session, const Prefs& prefs, const QString& filenam
if( session.isLocal( ) )
{
const QIcon folderIcon = QtIconLoader :: icon( "folder", style()->standardIcon( QStyle::SP_DirIcon ) );
const QFileIconProvider iconProvider;
const QIcon folderIcon = iconProvider.icon( QFileIconProvider::Folder );
const QPixmap folderPixmap = folderIcon.pixmap( iconSize );
l = new QLabel( tr( "&Destination folder:" ) );

View File

@ -13,19 +13,22 @@
#include <cassert>
#include <iostream>
#include <QCoreApplication>
#include <QCheckBox>
#include <QFileDialog>
#include <QComboBox>
#include <QCoreApplication>
#include <QDialogButtonBox>
#include <QDoubleSpinBox>
#include <QFileDialog>
#include <QFileIconProvider>
#include <QFileInfo>
#include <QHBoxLayout>
#include <QHttp>
#include <QIcon>
#include <QLabel>
#include <QLineEdit>
#include <QFileInfo>
#include <QList>
#include <QMessageBox>
#include <QPushButton>
#include <QIcon>
#include <QSpinBox>
#include <QStyle>
#include <QTabWidget>
@ -33,8 +36,6 @@
#include <QTimeEdit>
#include <QTimer>
#include <QVBoxLayout>
#include <QHttp>
#include <QMessageBox>
#include "hig.h"
#include "prefs.h"
@ -524,7 +525,8 @@ QWidget *
PrefsDialog :: createTorrentsTab( )
{
const int iconSize( style( )->pixelMetric( QStyle :: PM_SmallIconSize ) );
const QIcon folderIcon = QtIconLoader :: icon( "folder", style()->standardIcon( QStyle::SP_DirIcon ) );
const QFileIconProvider iconProvider;
const QIcon folderIcon = iconProvider.icon( QFileIconProvider::Folder );
const QPixmap folderPixmap = folderIcon.pixmap( iconSize );
QWidget *l, *r;

View File

@ -10,22 +10,22 @@
* $Id$
*/
#include <QLabel>
#include <QPushButton>
#include <QVBoxLayout>
#include <QRadioButton>
#include <QApplication>
#include <QDialogButtonBox>
#include <QDir>
#include <QFileDialog>
#include <QFileIconProvider>
#include <QLabel>
#include <QPushButton>
#include <QRadioButton>
#include <QSet>
#include <QDialogButtonBox>
#include <QWidget>
#include <QApplication>
#include <QStyle>
#include <QVBoxLayout>
#include <QWidget>
#include "hig.h"
#include "relocate.h"
#include "session.h"
#include "qticonloader.h"
QString RelocateDialog :: myPath;
@ -67,7 +67,8 @@ RelocateDialog :: RelocateDialog( Session& session, const QSet<int>& ids, QWidge
myIds( ids )
{
const int iconSize( style( )->pixelMetric( QStyle :: PM_SmallIconSize ) );
const QIcon folderIcon = QtIconLoader :: icon( "folder", style()->standardIcon( QStyle::SP_DirIcon ) );
const QFileIconProvider iconProvider;
const QIcon folderIcon = iconProvider.icon( QFileIconProvider::Folder );
const QPixmap folderPixmap = folderIcon.pixmap( iconSize );
QRadioButton * find_rb;

View File

@ -27,7 +27,6 @@
#include "torrent-delegate-min.h"
#include "torrent-model.h"
#include "utils.h"
#include "qticonloader.h"
enum
{

View File

@ -27,7 +27,6 @@
#include "torrent-delegate.h"
#include "torrent-model.h"
#include "utils.h"
#include "qticonloader.h"
enum
{

View File

@ -14,10 +14,11 @@
#include <iostream>
#include <QApplication>
#include <QStyle>
#include <QFileIconProvider>
#include <QFileInfo>
#include <QSet>
#include <QString>
#include <QFileInfo>
#include <QStyle>
#include <QVariant>
#include <libtransmission/transmission.h>
@ -26,7 +27,6 @@
#include "app.h"
#include "prefs.h"
#include "qticonloader.h"
#include "torrent.h"
#include "utils.h"
@ -413,7 +413,7 @@ Torrent :: updateMimeIcon( )
QIcon icon;
if( files.size( ) > 1 )
icon = QtIconLoader :: icon( "folder", QApplication::style()->standardIcon( QStyle::SP_DirIcon ) );
icon = QFileIconProvider().icon( QFileIconProvider::Folder );
else
icon = Utils :: guessMimeIcon( files.at(0).filename );

View File

@ -13,8 +13,8 @@
#include <iostream>
#include <QDir>
#include <QTimer>
#include <QFileSystemWatcher>
#include <QTimer>
#include <libtransmission/transmission.h>