From 12195b186bfe2c25b15a1524e4ddde9ac888961e Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Mon, 1 Nov 2010 18:05:54 +0000 Subject: [PATCH] Fix compilation on Windows --- src/properties/propertieswidget.cpp | 2 +- src/torrentimportdlg.cpp | 7 ++++--- src/tracker/qtracker.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp index c77f78846..6e1ddbeb9 100644 --- a/src/properties/propertieswidget.cpp +++ b/src/properties/propertieswidget.cpp @@ -730,7 +730,7 @@ void PropertiesWidget::renameSelectedFile() { // Rename the file Q_ASSERT(!new_file_name.isEmpty()); #if defined(Q_WS_WIN) || defined(Q_OS_OS2) - if(h.file_at(0).compare(new_file_name, Qt::CaseInsensitive) != 0) { + if(h.filename_at(0).compare(new_file_name, Qt::CaseInsensitive) != 0) { #else if(h.filename_at(0).compare(new_file_name, Qt::CaseSensitive) != 0) { #endif diff --git a/src/torrentimportdlg.cpp b/src/torrentimportdlg.cpp index b93195872..a44a56703 100644 --- a/src/torrentimportdlg.cpp +++ b/src/torrentimportdlg.cpp @@ -93,7 +93,7 @@ void TorrentImportDlg::on_browseContentBtn_clicked() } // Update display #if defined(Q_WS_WIN) || defined(Q_OS_OS2) - ui->lineContent->setText(m_contentPath.replace("/", "\\"); + ui->lineContent->setText(m_contentPath.replace("/", "\\")); #else ui->lineContent->setText(m_contentPath); #endif @@ -131,7 +131,7 @@ void TorrentImportDlg::on_browseContentBtn_clicked() } // Update the display #if defined(Q_WS_WIN) || defined(Q_OS_OS2) - ui->lineContent->setText(m_contentPath.replace("/", "\\"); + ui->lineContent->setText(m_contentPath.replace("/", "\\")); #else ui->lineContent->setText(m_contentPath); #endif @@ -222,7 +222,8 @@ void TorrentImportDlg::loadTorrent(const QString &torrent_path) misc::truncateRootFolder(t); // Update display #if defined(Q_WS_WIN) || defined(Q_OS_OS2) - ui->lineTorrent->setText(torrent_path.replace("/", "\\")); + QString tmp = torrent_path; + ui->lineTorrent->setText(tmp.replace("/", "\\")); #else ui->lineTorrent->setText(torrent_path); #endif diff --git a/src/tracker/qtracker.cpp b/src/tracker/qtracker.cpp index dc23d7270..83539fb6a 100644 --- a/src/tracker/qtracker.cpp +++ b/src/tracker/qtracker.cpp @@ -224,7 +224,7 @@ void QTracker::ReplyWithPeerList(QTcpSocket *socket, const TrackerAnnounceReques // bencode std::vector buf; bencode(std::back_inserter(buf), reply_entry); - QByteArray reply(buf.data(), buf.size()); + QByteArray reply(&buf[0], buf.size()); qDebug("QTracker: reply with the following bencoded data:\n %s", reply.constData()); // HTTP reply QHttpResponseHeader response;