mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 18:56:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6013 from Chocobo1/mac_warnings

Browse source 
Fix warnings on macOS
This commit is contained in:
sledgehammer999 2016-12-07 16:48:35 +02:00 committed by GitHub
commit ba1e5b8d58
8 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/base/net/geoipmanager.cpp
View file

@ -45,7 +45,6 @@
static const char DATABASE_URL[] = "https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz"; static const char DATABASE_URL[] = "https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz";
static const char GEOIP_FOLDER[] = "GeoIP"; static const char GEOIP_FOLDER[] = "GeoIP";
static const char GEOIP_FILENAME[] = "GeoLite2-Country.mmdb"; static const char GEOIP_FILENAME[] = "GeoLite2-Country.mmdb";
static const int CACHE_SIZE = 1000;
static const int UPDATE_INTERVAL = 30; // Days between database updates static const int UPDATE_INTERVAL = 30; // Days between database updates
using namespace Net; using namespace Net;

2
src/base/net/smtp.cpp
View file

@ -53,7 +53,9 @@
namespace namespace
{ {
const short DEFAULT_PORT = 25; const short DEFAULT_PORT = 25;
#ifndef QT_NO_OPENSSL
const short DEFAULT_PORT_SSL = 465; const short DEFAULT_PORT_SSL = 465;
#endif
QByteArray hmacMD5(QByteArray key, const QByteArray &msg) QByteArray hmacMD5(QByteArray key, const QByteArray &msg)
{ {

6
src/gui/optionsdlg.cpp
View file

@ -1638,6 +1638,9 @@ void OptionsDialog::setSslKey(const QByteArray &key, bool interactive)
if (interactive) if (interactive)
QMessageBox::warning(this, tr("Invalid key"), tr("This is not a valid SSL key.")); QMessageBox::warning(this, tr("Invalid key"), tr("This is not a valid SSL key."));
} }
#else
Q_UNUSED(key);
Q_UNUSED(interactive);
#endif #endif
} }
@ -1654,6 +1657,9 @@ void OptionsDialog::setSslCertificate(const QByteArray &cert, bool interactive)
if (interactive) if (interactive)
QMessageBox::warning(this, tr("Invalid certificate"), tr("This is not a valid SSL certificate.")); QMessageBox::warning(this, tr("Invalid certificate"), tr("This is not a valid SSL certificate."));
} }
#else
Q_UNUSED(cert);
Q_UNUSED(interactive);
#endif #endif
} }

8
src/gui/previewlistdelegate.h
View file

@ -32,8 +32,8 @@
#define PREVIEWLISTDELEGATE_H #define PREVIEWLISTDELEGATE_H
#include <QItemDelegate> #include <QItemDelegate>
#include <QStyleOptionProgressBarV2> #include <QStyleOptionProgressBar>
#include <QStyleOptionViewItemV2> #include <QStyleOptionViewItem>
#include <QModelIndex> #include <QModelIndex>
#include <QPainter> #include <QPainter>
#include <QApplication> #include <QApplication>
@ -59,7 +59,7 @@ class PreviewListDelegate: public QItemDelegate {
void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const { void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const {
painter->save(); painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) { switch(index.column()) {
case PreviewSelect::SIZE: case PreviewSelect::SIZE:
@ -67,7 +67,7 @@ class PreviewListDelegate: public QItemDelegate {
QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong())); QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
break; break;
case PreviewSelect::PROGRESS:{ case PreviewSelect::PROGRESS:{
QStyleOptionProgressBarV2 newopt; QStyleOptionProgressBar newopt;
qreal progress = index.data().toDouble()*100.; qreal progress = index.data().toDouble()*100.;
newopt.rect = opt.rect; newopt.rect = opt.rect;
newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%"); newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");

2
src/gui/properties/peerlistdelegate.h
View file

@ -50,7 +50,7 @@ public:
void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const { void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const {
painter->save(); painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) { switch(index.column()) {
case TOT_DOWN: case TOT_DOWN:
case TOT_UP: case TOT_UP:

8
src/gui/properties/proplistdelegate.cpp
View file

@ -28,8 +28,8 @@
* Contact : chris@qbittorrent.org * Contact : chris@qbittorrent.org
*/ */
#include <QStyleOptionProgressBarV2> #include <QStyleOptionProgressBar>
#include <QStyleOptionViewItemV2> #include <QStyleOptionViewItem>
#include <QStyleOptionComboBox> #include <QStyleOptionComboBox>
#include <QComboBox> #include <QComboBox>
#include <QModelIndex> #include <QModelIndex>
@ -60,7 +60,7 @@ PropListDelegate::PropListDelegate(PropertiesWidget *properties, QObject *parent
void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
painter->save(); painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) { switch(index.column()) {
case PCSIZE: case PCSIZE:
@ -78,7 +78,7 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
break; break;
case PROGRESS: case PROGRESS:
if (index.data().toDouble() >= 0) { if (index.data().toDouble() >= 0) {
QStyleOptionProgressBarV2 newopt; QStyleOptionProgressBar newopt;
qreal progress = index.data().toDouble() * 100.; qreal progress = index.data().toDouble() * 100.;
newopt.rect = opt.rect; newopt.rect = opt.rect;
newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%"); newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");

4
src/gui/search/searchlistdelegate.cpp
View file

@ -28,7 +28,7 @@
* Contact : chris@qbittorrent.org * Contact : chris@qbittorrent.org
*/ */
#include <QStyleOptionViewItemV2> #include <QStyleOptionViewItem>
#include <QModelIndex> #include <QModelIndex>
#include <QPainter> #include <QPainter>
#include <QProgressBar> #include <QProgressBar>
@ -46,7 +46,7 @@ void SearchListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
{ {
painter->save(); painter->save();
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
switch(index.column()) { switch(index.column()) {
case SearchSortModel::SIZE: case SearchSortModel::SIZE:
QItemDelegate::drawBackground(painter, opt, index); QItemDelegate::drawBackground(painter, opt, index);

6
src/gui/transferlistdelegate.cpp
View file

@ -31,7 +31,7 @@
#include "transferlistdelegate.h" #include "transferlistdelegate.h"
#include <QModelIndex> #include <QModelIndex>
#include <QStyleOptionViewItemV2> #include <QStyleOptionViewItem>
#include <QApplication> #include <QApplication>
#include <QPainter> #include <QPainter>
#include "base/utils/misc.h" #include "base/utils/misc.h"
@ -67,7 +67,7 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem
} }
const bool hideValues = Preferences::instance()->getHideZeroValues() & isHideState; const bool hideValues = Preferences::instance()->getHideZeroValues() & isHideState;
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
QItemDelegate::drawBackground(painter, opt, index); QItemDelegate::drawBackground(painter, opt, index);
switch (index.column()) { switch (index.column()) {
case TorrentModel::TR_AMOUNT_DOWNLOADED: case TorrentModel::TR_AMOUNT_DOWNLOADED:
@ -162,7 +162,7 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem
break; break;
} }
case TorrentModel::TR_PROGRESS: { case TorrentModel::TR_PROGRESS: {
QStyleOptionProgressBarV2 newopt; QStyleOptionProgressBar newopt;
qreal progress = index.data().toDouble() * 100.; qreal progress = index.data().toDouble() * 100.;
newopt.rect = opt.rect; newopt.rect = opt.rect;
newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%"); newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");