diff options
Diffstat (limited to 'src/plugins/Transports/http')
| -rw-r--r-- | src/plugins/Transports/http/httpinputfactory.h | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/http/httpinputsource.h | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/http/httpstreamreader.cpp | 18 | ||||
| -rw-r--r-- | src/plugins/Transports/http/settingsdialog.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/Transports/http/httpinputfactory.h b/src/plugins/Transports/http/httpinputfactory.h index 215bacb56..5e5e37d52 100644 --- a/src/plugins/Transports/http/httpinputfactory.h +++ b/src/plugins/Transports/http/httpinputfactory.h @@ -35,7 +35,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0") Q_INTERFACES(InputSourceFactory) public: InputSourceProperties properties() const; - InputSource *create(const QString &url, QObject *parent = 0); + InputSource *create(const QString &url, QObject *parent = nullptr); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Transports/http/httpinputsource.h b/src/plugins/Transports/http/httpinputsource.h index d109589f3..809b27ac5 100644 --- a/src/plugins/Transports/http/httpinputsource.h +++ b/src/plugins/Transports/http/httpinputsource.h @@ -32,7 +32,7 @@ class HTTPInputSource : public InputSource { Q_OBJECT public: - HTTPInputSource(const QString &path, QObject *parent = 0); + HTTPInputSource(const QString &path, QObject *parent = nullptr); QIODevice *ioDevice(); bool initialize(); diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp index 258d8c035..eb54bfeb8 100644 --- a/src/plugins/Transports/http/httpstreamreader.cpp +++ b/src/plugins/Transports/http/httpstreamreader.cpp @@ -142,11 +142,11 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent) curl_global_init(CURL_GLOBAL_ALL); m_stream.buf_fill = 0; m_stream.buf_size = 0; - m_stream.buf = 0; + m_stream.buf = nullptr; m_stream.icy_meta_data = false; m_stream.aborted = true; m_stream.icy_metaint = 0; - m_handle = 0; + m_handle = nullptr; m_metacount = 0; m_meta_sent = false; m_ready = false; @@ -162,8 +162,8 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent) if (!m_codec) m_codec = QTextCodec::codecForName ("UTF-8"); #ifdef WITH_ENCA - m_analyser = 0; - m_prevCodec = 0; + m_analyser = nullptr; + m_prevCodec = nullptr; if(settings.value("use_enca", false).toBool()) m_analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData()); if(m_analyser) @@ -182,7 +182,7 @@ HttpStreamReader::~HttpStreamReader() if (m_stream.buf) free(m_stream.buf); - m_stream.buf = 0; + m_stream.buf = nullptr; #ifdef WITH_ENCA if(m_analyser) enca_analyser_free(m_analyser); @@ -307,7 +307,7 @@ void HttpStreamReader::abort() if (m_handle) { curl_easy_cleanup(m_handle); - m_handle = 0; + m_handle = nullptr; } QIODevice::close(); } @@ -368,15 +368,15 @@ void HttpStreamReader::run() // error message curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, errorBuffer); - struct curl_slist *http200_aliases = curl_slist_append(NULL, "ICY"); - struct curl_slist *http_headers = curl_slist_append(NULL, "Icy-MetaData: 1"); + struct curl_slist *http200_aliases = curl_slist_append(nullptr, "ICY"); + struct curl_slist *http_headers = curl_slist_append(nullptr, "Icy-MetaData: 1"); curl_easy_setopt(m_handle, CURLOPT_HTTP200ALIASES, http200_aliases); curl_easy_setopt(m_handle, CURLOPT_HTTPHEADER, http_headers); m_mutex.lock(); if(m_stream.buf) { free(m_stream.buf); - m_stream.buf = 0; + m_stream.buf = nullptr; } m_stream.buf_fill = 0; m_stream.buf_size = m_prebuffer_size * 2; diff --git a/src/plugins/Transports/http/settingsdialog.h b/src/plugins/Transports/http/settingsdialog.h index ae6c66f1b..d85dc2d69 100644 --- a/src/plugins/Transports/http/settingsdialog.h +++ b/src/plugins/Transports/http/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); |
