Merge pull request #58 from faenil/nemomerge_fixes

[compilation] Fix compilation on glibc 2.19/gcc 4.8
nemomobile · Oct 4, 2014 · 3b37699 · 3b37699
2 parents 41465c4 + d9635fa
commit 3b37699
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/basicvoicecallconfigurator.cpp b/src/basicvoicecallconfigurator.cpp
@@ -79,7 +79,7 @@ bool BasicVoiceCallConfigurator::configure(VoiceCallManagerInterface *manager)
 
         QPluginLoader loader(pluginPath.absoluteFilePath(plugin));
         QObject *instance = loader.instance();
-        AbstractVoiceCallManagerPlugin *plugin = NULL;
+        AbstractVoiceCallManagerPlugin *managerPlugin = NULL;
 
         if(!instance)
         {
@@ -88,19 +88,18 @@ bool BasicVoiceCallConfigurator::configure(VoiceCallManagerInterface *manager)
             continue;
         }
 
-        plugin = qobject_cast<AbstractVoiceCallManagerPlugin*>(instance);
+        managerPlugin = qobject_cast<AbstractVoiceCallManagerPlugin*>(instance);
 
-        if(!plugin)
+        if(!managerPlugin)
         {
             WARNING_T("Failed to load plugin: No manager plugin interface.");
-            delete plugin;
             loader.unload();
             continue;
         }
 
-        if (!this->installPlugin(plugin)) {
+        if (!this->installPlugin(managerPlugin)) {
             WARNING_T("Plugin configuration failed");
-            delete plugin;
+            delete managerPlugin;
             loader.unload();
             continue;
         }