diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/gui/whoisonline.cpp | |
parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
download | plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/gui/whoisonline.cpp')
-rw-r--r-- | src/gui/whoisonline.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index b6d67fa83..ead38f42b 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -82,7 +82,7 @@ class NameFunctuator } nameCompare; WhoIsOnline::WhoIsOnline(): - Window(_("Who Is Online - Updating"), false, 0, "whoisonline.xml"), + Window(_("Who Is Online - Updating"), false, nullptr, "whoisonline.xml"), mThread(nullptr), mDownloadStatus(UPDATE_LIST), mDownloadComplete(true), @@ -140,7 +140,7 @@ WhoIsOnline::~WhoIsOnline() SDL_WaitThread(mThread, nullptr); free(mMemoryBuffer); - mMemoryBuffer = 0; + mMemoryBuffer = nullptr; // Remove possibly leftover temporary download delete[] mCurlError; @@ -333,7 +333,7 @@ void WhoIsOnline::loadList() // Free the memory buffer now that we don't need it anymore free(mMemoryBuffer); - mMemoryBuffer = 0; + mMemoryBuffer = nullptr; if (mScrollArea->getVerticalMaxScroll() < mScrollArea->getVerticalScrollAmount()) @@ -377,7 +377,7 @@ int WhoIsOnline::downloadThread(void *ptr) if (!wio->mAllowUpdate) { curl_easy_cleanup(curl); - curl = 0; + curl = nullptr; break; } wio->mDownloadedBytes = 0; @@ -398,7 +398,7 @@ int WhoIsOnline::downloadThread(void *ptr) curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 7); curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30); - struct curl_slist *pHeaders = 0; + struct curl_slist *pHeaders = nullptr; // Make sure the resources2.txt and news.txt aren't cached, // in order to always get the latest version. pHeaders = curl_slist_append(pHeaders, "pragma: no-cache"); @@ -422,7 +422,7 @@ int WhoIsOnline::downloadThread(void *ptr) attempts++; curl_easy_cleanup(curl); curl_slist_free_all(pHeaders); - curl = 0; + curl = nullptr; continue; } |