--- a/qt/about.cc 2013-08-09 04:45:47.414416328 +0200 +++ b/qt/about.cc 2013-08-11 08:42:14.230392409 +0200 @@ -37,21 +37,21 @@ QVBoxLayout * v = new QVBoxLayout (this); l = new QLabel; - l->setPixmap (QPixmap (QString::fromUtf8 (":/icons/transmission-48.png"))); + 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 ("Transmission %1").arg (QString::fromUtf8 (LONG_VERSION_STRING))); + l = new QLabel (tr ("Transmission %1").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::fromUtf8 ("text-align: center")); + l->setStyleSheet (QString::fromAscii ("text-align: center")); l->setAlignment (Qt::AlignCenter); v->addWidget (l); @@ -59,7 +59,7 @@ l->setAlignment (Qt::AlignCenter); v->addWidget (l); - l = new QLabel (QString::fromUtf8 ("http://www.transmissionbt.com/")); + l = new QLabel (QString::fromAscii ("http://www.transmissionbt.com/")); l->setOpenExternalLinks (true); l->setAlignment (Qt::AlignCenter); v->addWidget (l); @@ -89,7 +89,7 @@ QMessageBox::about ( this, tr ("Credits"), - QString::fromUtf8 ("Jordan Lee (Backend; Daemon; GTK+; Qt)\n" + QString::fromAscii ("Jordan Lee (Backend; Daemon; GTK+; Qt)\n" "Michell Livingston (OS X)\n")); } --- a/qt/add-data.cc 2013-08-09 04:45:56.618416546 +0200 +++ b/qt/add-data.cc 2013-08-11 08:42:14.230392409 +0200 @@ -43,7 +43,7 @@ } else if( Utils::isHexHashcode( key ) ) { - magnet = QString::fromUtf8("magnet:?xt=urn:btih:") + key; + magnet = QString::fromAscii("magnet:?xt=urn:btih:") + key; type = MAGNET; } else --- a/qt/app.cc 2013-08-09 04:45:47.414416328 +0200 +++ b/qt/app.cc 2013-08-11 08:42:14.230392409 +0200 @@ -45,9 +45,9 @@ namespace { - const QString DBUS_SERVICE = QString::fromUtf8 ("com.transmissionbt.Transmission" ); - const QString DBUS_OBJECT_PATH = QString::fromUtf8 ("/com/transmissionbt/Transmission"); - const QString DBUS_INTERFACE = QString::fromUtf8 ("com.transmissionbt.Transmission" ); + 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"); @@ -89,7 +89,7 @@ QApplication (argc, argv), myLastFullUpdateTime (0) { - const QString MY_CONFIG_NAME = QString::fromUtf8 ("transmission"); + const QString MY_CONFIG_NAME = QString::fromAscii ("transmission"); setApplicationName (MY_CONFIG_NAME); @@ -108,7 +108,7 @@ QList sizes; sizes << 16 << 22 << 24 << 32 << 48 << 64 << 72 << 96 << 128 << 192 << 256; foreach (int size, sizes) - icon.addPixmap (QPixmap (QString::fromUtf8 (":/icons/transmission-%1.png").arg (size))); + icon.addPixmap (QPixmap (QString::fromAscii (":/icons/transmission-%1.png").arg (size))); setWindowIcon (icon); // parse the command-line arguments @@ -464,15 +464,15 @@ bool MyApp :: notify (const QString& title, const QString& body) const { - const QString dbusServiceName = QString::fromUtf8 ("org.freedesktop.Notifications"); - const QString dbusInterfaceName = QString::fromUtf8 ("org.freedesktop.Notifications"); - const QString dbusPath = QString::fromUtf8 ("/org/freedesktop/Notifications"); + 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::fromUtf8 ("Notify")); + QDBusMessage m = QDBusMessage::createMethodCall (dbusServiceName, dbusPath, dbusInterfaceName, QString::fromAscii ("Notify")); QList args; - args.append (QString::fromUtf8 ("Transmission")); // app_name + args.append (QString::fromAscii ("Transmission")); // app_name args.append (0U); // replaces_id - args.append (QString::fromUtf8 ("transmission")); // icon + args.append (QString::fromAscii ("transmission")); // icon args.append (title); // summary args.append (body); // body args.append (QStringList ()); // actions - unused for plain passive popups @@ -510,7 +510,7 @@ QDBusMessage request = QDBusMessage::createMethodCall (DBUS_SERVICE, DBUS_OBJECT_PATH, DBUS_INTERFACE, - QString::fromUtf8 ("AddMetainfo")); + QString::fromAscii ("AddMetainfo")); QList arguments; AddData a (addme[i]); switch (a.type) --- a/qt/details.cc 2013-08-09 04:45:47.454416329 +0200 +++ b/qt/details.cc 2013-08-11 08:42:14.230392409 +0200 @@ -867,7 +867,7 @@ foreach (QChar ch, code) { QString txt; - switch (ch.unicode ()) + switch (ch.toAscii ()) { case 'O': txt = tr ("Optimistic unchoke"); break; case 'D': txt = tr ("Downloading from this peer"); break; --- a/qt/favicon.cc 2013-08-09 04:45:47.410416327 +0200 +++ b/qt/favicon.cc 2013-08-11 08:42:14.230392409 +0200 @@ -10,11 +10,11 @@ * $Id: favicon.cc 14150 2013-07-27 21:58:14Z jordan $ */ +#include #include #include #include #include -#include #include "favicon.h" @@ -40,7 +40,7 @@ QString Favicons :: getCacheDir( ) { - const QString base = QStandardPaths::writableLocation (QStandardPaths::CacheLocation); + const QString base = QDesktopServices::storageLocation( QDesktopServices::CacheLocation ); return QDir( base ).absoluteFilePath( "favicons" ); } --- a/qt/file-tree.cc 2013-08-09 04:45:54.254416490 +0200 +++ b/qt/file-tree.cc 2013-08-11 08:42:14.234392409 +0200 @@ -436,6 +436,7 @@ if (role == Qt::EditRole) { QString oldpath; + QModelIndex walk = index; FileTreeItem * item = itemFromIndex (index); while (item && !item->name().isEmpty()) @@ -574,9 +575,9 @@ void FileTreeModel :: clear () { - beginResetModel (); clearSubtree (QModelIndex()); - endResetModel (); + + reset (); } FileTreeItem * @@ -612,7 +613,7 @@ { bool added = false; FileTreeItem * item; - QStringList tokens = filename.split (QChar::fromLatin1('/')); + QStringList tokens = filename.split (QChar::fromAscii('/')); item = findItemForFileIndex (fileIndex); @@ -885,7 +886,7 @@ for (int i=0; isetSectionResizeMode(i, QHeaderView::Interactive); + header()->setResizeMode(i, QHeaderView::Interactive); } connect (this, SIGNAL(clicked(const QModelIndex&)), --- a/qt/filterbar.cc 2013-08-09 04:45:56.718416549 +0200 +++ b/qt/filterbar.cc 2013-08-11 08:42:14.234392409 +0200 @@ -10,12 +10,6 @@ * $Id: filterbar.cc 14150 2013-07-27 21:58:14Z jordan $ */ -#include -#include -#include -#include -#include -#include #include #include --- a/qt/freespace-label.cc 2013-08-09 04:45:47.414416328 +0200 +++ b/qt/freespace-label.cc 2013-08-11 08:42:14.234392409 +0200 @@ -73,8 +73,6 @@ void FreespaceLabel :: onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments) { - Q_UNUSED (result); - if (tag != myTag) return; --- a/qt/freespace-label.h 2013-08-09 04:45:54.254416490 +0200 +++ b/qt/freespace-label.h 2013-08-11 08:42:14.234392409 +0200 @@ -16,7 +16,7 @@ #include #include -#include +#include class Session; --- a/qt/mainwin.cc 2013-08-09 04:45:56.686416548 +0200 +++ b/qt/mainwin.cc 2013-08-11 08:42:14.234392409 +0200 @@ -14,10 +14,6 @@ #include #include -#include -#include -#include -#include #include #include --- a/qt/make-dialog.cc 2013-08-09 04:45:56.718416549 +0200 +++ b/qt/make-dialog.cc 2013-08-11 08:42:14.234392409 +0200 @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -343,7 +342,7 @@ const QPixmap folderPixmap = folderIcon.pixmap( iconSize ); QPushButton * b = new QPushButton; b->setIcon( folderPixmap ); - b->setStyleSheet( QString::fromUtf8( "text-align: left; padding-left: 5; padding-right: 5" ) ); + b->setStyleSheet( QString::fromAscii( "text-align: left; padding-left: 5; padding-right: 5" ) ); myDestination = QDir::homePath(); b->setText( myDestination ); connect( b, SIGNAL(clicked(bool)), @@ -357,7 +356,7 @@ myFolderButton = new QPushButton; myFolderButton->setIcon( folderPixmap ); myFolderButton->setText( tr( "(None)" ) ); - myFolderButton->setStyleSheet( QString::fromUtf8( "text-align: left; padding-left: 5; padding-right: 5" ) ); + myFolderButton->setStyleSheet( QString::fromAscii( "text-align: left; padding-left: 5; padding-right: 5" ) ); connect( myFolderButton, SIGNAL(clicked(bool)), this, SLOT(onFolderClicked(void)) ); hig->addRow( myFolderRadio, myFolderButton ); @@ -372,7 +371,7 @@ myFileButton = new QPushButton; myFileButton->setText( tr( "(None)" ) ); myFileButton->setIcon( filePixmap ); - myFileButton->setStyleSheet( QString::fromUtf8( "text-align: left; padding-left: 5; padding-right: 5" ) ); + myFileButton->setStyleSheet( QString::fromAscii( "text-align: left; padding-left: 5; padding-right: 5" ) ); connect( myFileButton, SIGNAL(clicked(bool)), this, SLOT(onFileClicked(void)) ); hig->addRow( myFileRadio, myFileButton ); @@ -385,7 +384,7 @@ hig->addSectionTitle( tr( "Properties" ) ); hig->addWideControl( myTrackerEdit = new ShortPlainTextEdit ); - const int height = fontMetrics().size( 0, QString::fromUtf8("\n\n\n\n") ).height( ); + const int height = fontMetrics().size( 0, QString::fromAscii("\n\n\n\n") ).height( ); myTrackerEdit->setMinimumHeight( height ); hig->addTallRow( tr( "&Trackers:" ), myTrackerEdit ); QLabel * l = new QLabel( tr( "To add a backup URL, add it on the line after the primary URL.\nTo add another primary URL, add it after a blank line." ) ); --- a/qt/options.cc 2013-08-09 04:45:47.382416327 +0200 +++ b/qt/options.cc 2013-08-11 08:42:14.234392409 +0200 @@ -124,7 +124,7 @@ { p = mySourceButton = new QPushButton; p->setIcon (filePixmap); - p->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5")); + p->setStyleSheet (QString::fromAscii ("text-align: left; padding-left: 5; padding-right: 5")); p->installEventFilter (this); w = p; connect (p, SIGNAL (clicked (bool)), this, SLOT (onFilenameClicked ())); @@ -139,7 +139,7 @@ connect (e, SIGNAL(editingFinished()), this, SLOT(onSourceEditingFinished())); } - const int width = fontMetrics.size (0, QString::fromUtf8 ("This is a pretty long torrent filename indeed.torrent")).width (); + const int width = fontMetrics.size (0, QString::fromAscii ("This is a pretty long torrent filename indeed.torrent")).width (); w->setMinimumWidth (width); layout->addWidget (w, row, 1); l->setBuddy (w); --- a/qt/prefs-dialog.cc 2013-08-09 04:45:47.414416328 +0200 +++ b/qt/prefs-dialog.cc 2013-08-11 08:42:14.234392409 +0200 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -134,7 +135,7 @@ { const int minutes( myPrefs.getInt( key ) ); QTimeEdit * e = new QTimeEdit( ); - e->setDisplayFormat( QString::fromUtf8( "hh:mm" ) ); + e->setDisplayFormat( QString::fromAscii( "hh:mm" ) ); e->setProperty( PREF_KEY, key ); e->setTime( QTime().addSecs( minutes * 60 ) ); myWidgets.insert( key, e ); @@ -232,11 +233,11 @@ QHBoxLayout * h = new QHBoxLayout; h->setSpacing( HIG :: PAD ); QLabel * label = new QLabel; - label->setPixmap( QPixmap( QString::fromUtf8( ":/icons/alt-limit-off.png" ) ) ); + label->setPixmap( QPixmap( QString::fromAscii( ":/icons/alt-limit-off.png" ) ) ); label->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); h->addWidget( label ); label = new QLabel( tr( "Alternative Speed Limits" ) ); - label->setStyleSheet( QString::fromUtf8( "font: bold" ) ); + label->setStyleSheet( QString::fromAscii( "font: bold" ) ); label->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); h->addWidget( label ); hig->addSectionTitle( h ); @@ -571,7 +572,7 @@ l = checkBoxNew( tr( "Automatically add .torrent files &from:" ), Prefs::DIR_WATCH_ENABLED ); b = myWatchButton = new QPushButton; b->setIcon( folderPixmap ); - b->setStyleSheet( QString::fromUtf8( "text-align: left; padding-left: 5; padding-right: 5" ) ); + b->setStyleSheet( QString::fromAscii( "text-align: left; padding-left: 5; padding-right: 5" ) ); connect( b, SIGNAL(clicked(bool)), this, SLOT(onWatchClicked(void)) ); hig->addRow( l, b ); enableBuddyWhenChecked( qobject_cast(l), b ); @@ -584,7 +585,7 @@ b = myDestinationButton = new QPushButton; b->setIcon( folderPixmap ); - b->setStyleSheet( QString::fromUtf8( "text-align: left; padding-left: 5; padding-right: 5" ) ); + b->setStyleSheet( QString::fromAscii( "text-align: left; padding-left: 5; padding-right: 5" ) ); connect( b, SIGNAL(clicked(bool)), this, SLOT(onDestinationClicked(void)) ); hig->addRow( tr( "Save to &Location:" ), b ); @@ -609,7 +610,7 @@ l = myIncompleteCheckbox = checkBoxNew( tr( "Keep &incomplete files in:" ), Prefs::INCOMPLETE_DIR_ENABLED ); b = myIncompleteButton = new QPushButton; b->setIcon( folderPixmap ); - b->setStyleSheet( QString::fromUtf8( "text-align: left; padding-left: 5; padding-right: 5" ) ); + b->setStyleSheet( QString::fromAscii( "text-align: left; padding-left: 5; padding-right: 5" ) ); connect( b, SIGNAL(clicked(bool)), this, SLOT(onIncompleteClicked(void)) ); hig->addRow( myIncompleteCheckbox, b ); enableBuddyWhenChecked( qobject_cast(l), b ); @@ -617,7 +618,7 @@ l = myTorrentDoneScriptCheckbox = checkBoxNew( tr( "Call scrip&t when torrent is completed:" ), Prefs::SCRIPT_TORRENT_DONE_ENABLED ); b = myTorrentDoneScriptButton = new QPushButton; b->setIcon( filePixmap ); - b->setStyleSheet( QString::fromUtf8( "text-align: left; padding-left: 5; padding-right: 5" ) ); + b->setStyleSheet( QString::fromAscii( "text-align: left; padding-left: 5; padding-right: 5" ) ); connect( b, SIGNAL(clicked(bool)), this, SLOT(onScriptClicked(void)) ); hig->addRow( myTorrentDoneScriptCheckbox, b ); enableBuddyWhenChecked( qobject_cast(l), b ); --- a/qt/qtr.pro 2013-08-09 04:45:47.410416327 +0200 +++ b/qt/qtr.pro 2013-08-11 08:42:14.238392409 +0200 @@ -1,7 +1,7 @@ TARGET = transmission-qt NAME = "Transmission" DESCRIPTION = "Transmission: a fast, easy, and free BitTorrent client" -VERSION = 2.81 +VERSION = 2.00 LICENSE = "GPL" target.path = /bin @@ -11,8 +11,8 @@ man.path = /share/man/man1/ man.files = transmission-qt.1 -CONFIG += qt thread debug link_pkgconfig -QT += network dbus widgets +CONFIG += qt qdbus thread debug link_pkgconfig +QT += network PKGCONFIG = fontconfig libcurl openssl libevent TRANSMISSION_TOP = .. --- a/qt/session.cc 2013-08-09 04:45:56.726416549 +0200 +++ b/qt/session.cc 2013-08-11 08:42:14.238392409 +0200 @@ -690,11 +690,11 @@ { QNetworkRequest request; request.setUrl (myUrl); - request.setRawHeader ("User-Agent", QString (QCoreApplication::instance ()->applicationName () + "/" + LONG_VERSION_STRING).toUtf8 ()); + request.setRawHeader ("User-Agent", QString (QCoreApplication::instance ()->applicationName () + "/" + LONG_VERSION_STRING).toAscii ()); request.setRawHeader ("Content-Type", "application/json; charset=UTF-8"); if (!mySessionId.isEmpty ()) - request.setRawHeader (TR_RPC_SESSION_ID_HEADER, mySessionId.toUtf8 ()); + request.setRawHeader (TR_RPC_SESSION_ID_HEADER, mySessionId.toAscii ()); const QByteArray requestData (json); QNetworkReply * reply = networkAccessManager ()->post (request, requestData); --- a/qt/squeezelabel.h 2013-08-09 04:45:54.254416490 +0200 +++ b/qt/squeezelabel.h 2013-08-11 08:42:14.238392409 +0200 @@ -42,7 +42,7 @@ #ifndef SQUEEZELABEL_H #define SQUEEZELABEL_H -#include +#include class SqueezeLabel : public QLabel { --- a/qt/torrent-model.cc 2013-08-09 04:45:47.410416327 +0200 +++ b/qt/torrent-model.cc 2013-08-11 08:42:14.238392409 +0200 @@ -22,14 +22,11 @@ void TorrentModel :: clear( ) { - beginResetModel (); - myIdToRow.clear( ); myIdToTorrent.clear( ); foreach( Torrent * tor, myTorrents ) delete tor; myTorrents.clear( ); - - endResetModel (); + reset( ); } int --- a/qt/utils.h 2013-08-09 04:45:47.382416327 +0200 +++ b/qt/utils.h 2013-08-11 08:42:14.238392409 +0200 @@ -42,20 +42,20 @@ /// URLs /// - static bool isMagnetLink( const QString& s ) { return s.startsWith( QString::fromUtf8( "magnet:?" ) ); } + static bool isMagnetLink( const QString& s ) { return s.startsWith( QString::fromAscii( "magnet:?" ) ); } static bool isHexHashcode( const QString& s ) { if( s.length() != 40 ) return false; - foreach( QChar ch, s ) if( !isxdigit( ch.unicode() ) ) return false; + foreach( QChar ch, s ) if( !isxdigit( ch.toAscii() ) ) return false; return true; } static bool isUriWithSupportedScheme( const QString& s ) { - static const QString ftp = QString::fromUtf8( "ftp://" ); - static const QString http = QString::fromUtf8( "http://" ); - static const QString https = QString::fromUtf8( "https://" ); + static const QString ftp = QString::fromAscii( "ftp://" ); + static const QString http = QString::fromAscii( "http://" ); + static const QString https = QString::fromAscii( "https://" ); return s.startsWith(http) || s.startsWith(https) || s.startsWith(ftp); } --- a/qt/watchdir.cc 2013-08-09 04:45:56.718416549 +0200 +++ b/qt/watchdir.cc 2013-08-11 08:42:14.238392409 +0200 @@ -52,7 +52,7 @@ const int err = tr_torrentParse( ctor, &inf ); if( err ) ret = ERROR; - else if( myModel.hasTorrent( QString::fromUtf8( inf.hashString ) ) ) + else if( myModel.hasTorrent( QString::fromAscii( inf.hashString ) ) ) ret = DUPLICATE; else ret = OK; @@ -106,7 +106,7 @@ // try to add any new files which end in .torrent const QSet newFiles( files - myWatchDirFiles ); - const QString torrentSuffix = QString::fromUtf8( ".torrent" ); + const QString torrentSuffix = QString::fromAscii( ".torrent" ); foreach( QString name, newFiles ) { if( name.endsWith( torrentSuffix, Qt::CaseInsensitive ) ) { const QString filename = dir.absoluteFilePath( name );