From 4dea03fc748ca07b0cf38109e41da21919d321a5 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 17 Apr 2018 12:35:29 +0800 Subject: [PATCH 1/2] Remove unused constants --- src/base/http/types.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/base/http/types.h b/src/base/http/types.h index c817dfa9b..2e16d9630 100644 --- a/src/base/http/types.h +++ b/src/base/http/types.h @@ -63,14 +63,10 @@ namespace Http const char HEADER_REQUEST_METHOD_POST[] = "POST"; const char CONTENT_TYPE_HTML[] = "text/html"; - const char CONTENT_TYPE_JS[] = "application/javascript"; const char CONTENT_TYPE_JSON[] = "application/json"; - const char CONTENT_TYPE_BMP[] = "image/bmp"; const char CONTENT_TYPE_GIF[] = "image/gif"; - const char CONTENT_TYPE_JPEG[] = "image/jpeg"; const char CONTENT_TYPE_PNG[] = "image/png"; const char CONTENT_TYPE_TXT[] = "text/plain"; - const char CONTENT_TYPE_SVG[] = "image/svg+xml"; const char CONTENT_TYPE_FORM_ENCODED[] = "application/x-www-form-urlencoded"; const char CONTENT_TYPE_FORM_DATA[] = "multipart/form-data"; From 68c2d81072b1e299c37cbea0c68e3be11a0173d8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 17 Apr 2018 20:32:28 +0800 Subject: [PATCH 2/2] Fix memory leak --- src/base/search/searchpluginmanager.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/base/search/searchpluginmanager.cpp b/src/base/search/searchpluginmanager.cpp index 1643cfc37..89d08c98e 100644 --- a/src/base/search/searchpluginmanager.cpp +++ b/src/base/search/searchpluginmanager.cpp @@ -29,6 +29,8 @@ #include "searchpluginmanager.h" +#include + #include #include #include @@ -458,7 +460,7 @@ void SearchPluginManager::update() if (!engineElem.isNull()) { QString pluginName = engineElem.tagName(); - PluginInfo *plugin = new PluginInfo; + std::unique_ptr plugin {new PluginInfo {}}; plugin->name = pluginName; plugin->version = getPluginVersion(pluginPath(pluginName)); plugin->fullName = engineElem.elementsByTagName("name").at(0).toElement().text(); @@ -473,15 +475,15 @@ void SearchPluginManager::update() QStringList disabledEngines = Preferences::instance()->getSearchEngDisabled(); plugin->enabled = !disabledEngines.contains(pluginName); - updateIconPath(plugin); + updateIconPath(plugin.get()); if (!m_plugins.contains(pluginName)) { - m_plugins[pluginName] = plugin; + m_plugins[pluginName] = plugin.release(); emit pluginInstalled(pluginName); } else if (m_plugins[pluginName]->version != plugin->version) { delete m_plugins.take(pluginName); - m_plugins[pluginName] = plugin; + m_plugins[pluginName] = plugin.release(); emit pluginUpdated(pluginName); } }