Browse Source

Fix compilation on Windows

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
12195b186b
  1. 2
      src/properties/propertieswidget.cpp
  2. 7
      src/torrentimportdlg.cpp
  3. 2
      src/tracker/qtracker.cpp

2
src/properties/propertieswidget.cpp

@ -730,7 +730,7 @@ void PropertiesWidget::renameSelectedFile() { @@ -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

7
src/torrentimportdlg.cpp

@ -93,7 +93,7 @@ void TorrentImportDlg::on_browseContentBtn_clicked() @@ -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() @@ -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) @@ -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

2
src/tracker/qtracker.cpp

@ -224,7 +224,7 @@ void QTracker::ReplyWithPeerList(QTcpSocket *socket, const TrackerAnnounceReques @@ -224,7 +224,7 @@ void QTracker::ReplyWithPeerList(QTcpSocket *socket, const TrackerAnnounceReques
// bencode
std::vector<char> 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;

Loading…
Cancel
Save