From 08c0df49e1dbd01c332112bd631703ea8c583a3a Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Thu, 15 Dec 2022 15:11:09 +0800 Subject: [PATCH] fix: change macro QT_NO_OPENSSL to QT_NO_SSL --- article_netmgr.cc | 2 +- mainwindow.cc | 4 ++-- mediawiki.cc | 4 ++-- webmultimediadownload.cc | 4 ++-- website.cc | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/article_netmgr.cc b/article_netmgr.cc index 6d565284..e96d55f3 100644 --- a/article_netmgr.cc +++ b/article_netmgr.cc @@ -242,7 +242,7 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co if( url.scheme() == "https") { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ), reply, SLOT( ignoreSslErrors() ) ); #endif diff --git a/mainwindow.cc b/mainwindow.cc index c6e8a780..80bc3215 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -82,7 +82,7 @@ using std::wstring; using std::map; using std::pair; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL class InitSSLRunnable : public QRunnable { @@ -157,7 +157,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ): if( QThreadPool::globalInstance()->maxThreadCount() < MIN_THREAD_COUNT ) QThreadPool::globalInstance()->setMaxThreadCount( MIN_THREAD_COUNT ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL QThreadPool::globalInstance()->start( new InitSSLRunnable ); #endif diff --git a/mediawiki.cc b/mediawiki.cc index 678db47a..bea445d7 100644 --- a/mediawiki.cc +++ b/mediawiki.cc @@ -135,7 +135,7 @@ MediaWikiWordSearchRequest::MediaWikiWordSearchRequest( wstring const & str, connect( netReply.get(), SIGNAL( finished() ), this, SLOT( downloadFinished() ) ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( netReply.get(), SIGNAL( sslErrors( QList< QSslError > ) ), netReply.get(), SLOT( ignoreSslErrors() ) ); @@ -279,7 +279,7 @@ void MediaWikiArticleRequest::addQuery( QNetworkAccessManager & mgr, connect( netReply, &QNetworkReply::errorOccurred, this, [=](QNetworkReply::NetworkError e){ qDebug()<< "error:"< ) ), netReply, SLOT( ignoreSslErrors() ) ); diff --git a/webmultimediadownload.cc b/webmultimediadownload.cc index 715cc5c5..c15784b7 100644 --- a/webmultimediadownload.cc +++ b/webmultimediadownload.cc @@ -15,7 +15,7 @@ redirectCount( 0 ) reply = mgr.get( QNetworkRequest( url ) ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ), reply, SLOT( ignoreSslErrors() ) ); #endif @@ -52,7 +52,7 @@ void WebMultimediaDownload::replyFinished( QNetworkReply * r ) } reply = mgr.get( QNetworkRequest( redirectUrl ) ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ), reply, SLOT( ignoreSslErrors() ) ); #endif diff --git a/website.cc b/website.cc index e5012498..2c933cae 100644 --- a/website.cc +++ b/website.cc @@ -140,7 +140,7 @@ WebSiteArticleRequest::WebSiteArticleRequest( QString const & url_, request.setAttribute( QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy ); netReply = mgr.get( request ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) ); #endif @@ -173,7 +173,7 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r ) disconnect( netReply, 0, 0, 0 ); netReply->deleteLater(); netReply = mgr.get( QNetworkRequest( redirectUrl ) ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) ); #endif @@ -449,7 +449,7 @@ WebSiteResourceRequest::WebSiteResourceRequest( QString const & url_, netReply = mgr.get( QNetworkRequest( reqUrl ) ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) ); #endif @@ -482,7 +482,7 @@ void WebSiteResourceRequest::requestFinished( QNetworkReply * r ) disconnect( netReply, 0, 0, 0 ); netReply->deleteLater(); netReply = mgr.get( QNetworkRequest( redirectUrl ) ); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) ); #endif