diff options
author | Christian Daniel <cd@maintech.de> | 2013-03-25 16:26:37 +0100 |
---|---|---|
committer | Christian Daniel <cd@maintech.de> | 2013-03-25 16:26:37 +0100 |
commit | 6aafc581cbd1f11a2170a6edfc30bb5d9245672a (patch) | |
tree | bd6a616ff717817d9f55caa2774c8354ffa31f0c /sdrbase | |
parent | 63c7d66556a92fd39fa3df7606bb7e76b2c48d15 (diff) |
fix building on Windows with VS2010
Diffstat (limited to 'sdrbase')
-rw-r--r-- | sdrbase/gui/glscope.cpp | 2 | ||||
-rw-r--r-- | sdrbase/plugin/pluginmanager.cpp | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sdrbase/gui/glscope.cpp b/sdrbase/gui/glscope.cpp index 9f8c9a9..5f4ebb7 100644 --- a/sdrbase/gui/glscope.cpp +++ b/sdrbase/gui/glscope.cpp @@ -4,7 +4,7 @@ #include "dsp/dspengine.h" #ifdef _WIN32 -double log2f(double n) +static double log2f(double n) { return log(n) / log(2.0); } diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index f0fc62c..3e1b8c2 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -26,7 +26,6 @@ PluginManager::~PluginManager() void PluginManager::loadPlugins() { QDir pluginsDir = QDir(QApplication::instance()->applicationDirPath()); - pluginsDir.cd("plugins"); loadPlugins(pluginsDir); @@ -222,13 +221,16 @@ void PluginManager::loadPlugins(const QDir& dir) { QDir pluginsDir(dir); foreach(QString fileName, pluginsDir.entryList(QDir::Files)) { - QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); - PluginInterface* plugin = qobject_cast<PluginInterface*>(loader.instance()); - if(loader.isLoaded()) + QPluginLoader* loader = new QPluginLoader(pluginsDir.absoluteFilePath(fileName)); + PluginInterface* plugin = qobject_cast<PluginInterface*>(loader->instance()); + if(loader->isLoaded()) qDebug("loaded plugin %s", qPrintable(fileName)); - if(plugin != NULL) - m_plugins.append(Plugin(fileName, plugin)); - else loader.unload(); + if(plugin != NULL) { + m_plugins.append(Plugin(fileName, loader, plugin)); + } else { + loader->unload(); + delete loader; + } } foreach(QString dirName, pluginsDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) loadPlugins(pluginsDir.absoluteFilePath(dirName)); |