Browse Source

Fix unused variable warnings

adaptive-webui-19844
Chocobo1 8 years ago
parent
commit
ab187f06da
  1. 1
      src/base/net/geoipmanager.cpp
  2. 6
      src/base/net/smtp.cpp
  3. 6
      src/gui/optionsdlg.cpp

1
src/base/net/geoipmanager.cpp

@ -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;

6
src/base/net/smtp.cpp

@ -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)
{ {
@ -98,12 +100,12 @@ Smtp::Smtp(QObject *parent)
, m_authType(AuthPlain) , m_authType(AuthPlain)
{ {
static bool needToRegisterMetaType = true; static bool needToRegisterMetaType = true;
if (needToRegisterMetaType) { if (needToRegisterMetaType) {
qRegisterMetaType<QAbstractSocket::SocketError>(); qRegisterMetaType<QAbstractSocket::SocketError>();
needToRegisterMetaType = false; needToRegisterMetaType = false;
} }
#ifndef QT_NO_OPENSSL #ifndef QT_NO_OPENSSL
m_socket = new QSslSocket(this); m_socket = new QSslSocket(this);
#else #else

6
src/gui/optionsdlg.cpp

@ -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
} }

Loading…
Cancel
Save