Browse Source

Fix C++11 compliance

Fix compiler error when compiling with -std=c++11
 "invalid suffix on literal; C++11 requires a space between literal and
 identifier [-Wreserved-user-defined-literal]"
adaptive-webui-19844
David Christenson 10 years ago
parent
commit
bdb722893f
  1. 2
      src/about_imp.h
  2. 4
      src/dnsupdater.cpp
  3. 2
      src/qtlibtorrent/qbtsession.cpp
  4. 2
      src/torrentcreator/torrentcreatorthread.cpp

2
src/about_imp.h

@ -69,7 +69,7 @@ class about : public QDialog, private Ui::AboutDlg{
// Set icons // Set icons
logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png"))); logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
//Title //Title
lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>")); lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" " VERSION"</h1></b>"));
// Thanks // Thanks
QString thanks_txt; QString thanks_txt;
thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>"); thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>");

4
src/dnsupdater.cpp

@ -76,7 +76,7 @@ void DNSUpdater::checkPublicIP()
m_lastIPCheckTime = QDateTime::currentDateTime(); m_lastIPCheckTime = QDateTime::currentDateTime();
QNetworkRequest request; QNetworkRequest request;
request.setUrl(QUrl("http://checkip.dyndns.org")); request.setUrl(QUrl("http://checkip.dyndns.org"));
request.setRawHeader("User-Agent", "qBittorrent/"VERSION" chris@qbittorrent.org"); request.setRawHeader("User-Agent", "qBittorrent/" VERSION" chris@qbittorrent.org");
manager->get(request); manager->get(request);
} }
@ -123,7 +123,7 @@ void DNSUpdater::updateDNSService()
m_lastIPCheckTime = QDateTime::currentDateTime(); m_lastIPCheckTime = QDateTime::currentDateTime();
QNetworkRequest request; QNetworkRequest request;
request.setUrl(getUpdateUrl()); request.setUrl(getUpdateUrl());
request.setRawHeader("User-Agent", "qBittorrent/"VERSION" chris@qbittorrent.org"); request.setRawHeader("User-Agent", "qBittorrent/" VERSION" chris@qbittorrent.org");
manager->get(request); manager->get(request);
} }

2
src/qtlibtorrent/qbtsession.cpp

@ -421,7 +421,7 @@ void QBtSession::configureSession() {
} }
// * Session settings // * Session settings
session_settings sessionSettings = s->settings(); session_settings sessionSettings = s->settings();
sessionSettings.user_agent = "qBittorrent "VERSION; sessionSettings.user_agent = "qBittorrent " VERSION;
//std::cout << "HTTP user agent is " << sessionSettings.user_agent << std::endl; //std::cout << "HTTP user agent is " << sessionSettings.user_agent << std::endl;
logger->addMessage(tr("HTTP user agent is %1").arg(misc::toQString(sessionSettings.user_agent))); logger->addMessage(tr("HTTP user agent is %1").arg(misc::toQString(sessionSettings.user_agent)));

2
src/torrentcreator/torrentcreatorthread.cpp

@ -83,7 +83,7 @@ void TorrentCreatorThread::sendProgressSignal(int progress) {
void TorrentCreatorThread::run() { void TorrentCreatorThread::run() {
emit updateProgress(0); emit updateProgress(0);
QString creator_str("qBittorrent "VERSION); QString creator_str("qBittorrent " VERSION);
try { try {
file_storage fs; file_storage fs;
// Adding files to the torrent // Adding files to the torrent

Loading…
Cancel
Save