Commit 86826df4 authored by Laurent Belcour's avatar Laurent Belcour

Removing Qt dependency in the core compilation

parent 6ee3b36d
TEMPLATE = lib
CONFIG *= static \
qt \
console
DESTDIR = ../build
......@@ -22,7 +21,7 @@ HEADERS = args.h \
SOURCES = plugins_manager.cpp \
vertical_segment.cpp \
rational_function.cpp \
params.cpp \
rational_function.cpp \
params.cpp \
function.cpp \
# clustering.cpp
......@@ -6,8 +6,6 @@
#include <limits>
#include <fstream>
#include <QtPlugin>
#include "common.h"
#include "args.h"
#include "params.h"
......@@ -81,8 +79,6 @@ class data : public parametrized
// Dimensions of the data
int _nX, _nY ;
} ;
Q_DECLARE_INTERFACE(data, "Fitter.Data")
/*! \brief Change the parametrization of data to fit the parametrization of the
* function to be fitted.
......
......@@ -4,8 +4,6 @@
#include <string>
#include <fstream>
#include <QtPlugin>
#include "common.h"
#include "args.h"
#include "params.h"
......@@ -210,5 +208,3 @@ class nonlinear_function: public function
virtual vec parametersJacobian(const vec& x) const = 0;
};
Q_DECLARE_INTERFACE(function, "Fitter.Function")
......@@ -2,14 +2,10 @@
#include "rational_function.h"
#include "vertical_segment.h"
#include <QCoreApplication>
/*
#include <QPluginLoader>
#include <QtPlugin>
#include <QLibrary>
*/
#include <QCoreApplication>
#include <QDir>
*/
#ifdef WIN32
#else
......@@ -53,7 +49,7 @@ template<typename T> T open_library(const std::string& filename, const char* fun
// Create the object, parse the argument and load all the plugins
plugins_manager::plugins_manager(const arguments& args)
{
/*
QDir pluginsDir;
if(args.is_defined("plugins"))
{
......@@ -63,6 +59,7 @@ plugins_manager::plugins_manager(const arguments& args)
{
pluginsDir = QDir(QCoreApplication::instance()->applicationDirPath());
}
*/
/*
foreach (QString fileName, pluginsDir.entryList(QDir::Files))
......@@ -191,6 +188,7 @@ function* plugins_manager::get_function(const std::string& n)
}
#ifdef USING_STATIC
/*
std::string file;
if(n[0] == '.')
{
......@@ -204,6 +202,8 @@ function* plugins_manager::get_function(const std::string& n)
QString path = QDir::currentPath() + QString(file.c_str()) ;
FunctionPrototype myFunction = open_library<FunctionPrototype>(path.toStdString(), "provide_function");
*/
FunctionPrototype myFunction = open_library<FunctionPrototype>(n, "provide_function");
if(myFunction != NULL)
{
#ifdef DEBUG
......@@ -239,6 +239,7 @@ data* plugins_manager::get_data(const std::string& n)
}
#ifdef USING_STATIC
/*
std::string file;
if(n[0] == '.')
{
......@@ -252,6 +253,8 @@ data* plugins_manager::get_data(const std::string& n)
QString path = QDir::currentPath() + QString(file.c_str()) ;
DataPrototype myData = open_library<DataPrototype>(path.toStdString(), "provide_data");
*/
DataPrototype myData = open_library<DataPrototype>(n, "provide_data");
if(myData != NULL)
{
#ifdef DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment