Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1193 Code cleanup.

Browse source
This commit is contained in:
dnk-88 2010-11-29 17:36:12 +02:00
parent 68891726db
commit 376bc221df
6 changed files with 356 additions and 356 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.cpp
View file

@ -45,18 +45,18 @@ void CPluginManager::addObject(QObject *obj)
if (obj == 0) if (obj == 0)
{ {
nlwarning("trying to add null object"); nlwarning("trying to add null object");
return; return;
} }
if (_allObjects.contains(obj)) if (_allObjects.contains(obj))
{ {
nlwarning("trying to add duplicate object"); nlwarning("trying to add duplicate object");
return; return;
} }
nlinfo(QString("addObject:" + obj->objectName()).toStdString().c_str()); nlinfo(QString("addObject:" + obj->objectName()).toStdString().c_str());
_allObjects.append(obj); _allObjects.append(obj);
Q_EMIT objectAdded(obj); Q_EMIT objectAdded(obj);
} }
void CPluginManager::removeObject(QObject *obj) void CPluginManager::removeObject(QObject *obj)
@ -64,19 +64,19 @@ void CPluginManager::removeObject(QObject *obj)
if (obj == 0) if (obj == 0)
{ {
nlwarning("trying to remove null object"); nlwarning("trying to remove null object");
return; return;
} }
if (!_allObjects.contains(obj)) if (!_allObjects.contains(obj))
{ {
nlinfo(QString("object not in list:" + obj->objectName()).toStdString().c_str()); nlinfo(QString("object not in list:" + obj->objectName()).toStdString().c_str());
return; return;
} }
nlinfo(QString("removeObject:" + obj->objectName()).toStdString().c_str()); nlinfo(QString("removeObject:" + obj->objectName()).toStdString().c_str());
Q_EMIT aboutToRemoveObject(obj); Q_EMIT aboutToRemoveObject(obj);
QWriteLocker lock(&_lock); QWriteLocker lock(&_lock);
_allObjects.removeAll(obj); _allObjects.removeAll(obj);
} }
QList<QObject *> CPluginManager::allObjects() const QList<QObject *> CPluginManager::allObjects() const
@ -87,15 +87,15 @@ QList<QObject *> CPluginManager::allObjects() const
void CPluginManager::loadPlugins() void CPluginManager::loadPlugins()
{ {
Q_FOREACH (CPluginSpec *spec, _pluginSpecs) Q_FOREACH (CPluginSpec *spec, _pluginSpecs)
setPluginState(spec, State::Loaded); setPluginState(spec, State::Loaded);
Q_FOREACH (CPluginSpec *spec, _pluginSpecs) Q_FOREACH (CPluginSpec *spec, _pluginSpecs)
setPluginState(spec, State::Initialized); setPluginState(spec, State::Initialized);
Q_FOREACH (CPluginSpec *spec, _pluginSpecs) Q_FOREACH (CPluginSpec *spec, _pluginSpecs)
setPluginState(spec, State::Running); setPluginState(spec, State::Running);
Q_EMIT pluginsChanged(); Q_EMIT pluginsChanged();
} }
QStringList CPluginManager::getPluginPaths() const QStringList CPluginManager::getPluginPaths() const
@ -117,13 +117,13 @@ QList<CPluginSpec *> CPluginManager::plugins() const
void CPluginManager::readPluginPaths() void CPluginManager::readPluginPaths()
{ {
qDeleteAll(_pluginSpecs); qDeleteAll(_pluginSpecs);
_pluginSpecs.clear(); _pluginSpecs.clear();
QStringList pluginsList; QStringList pluginsList;
QStringList searchPaths = _pluginPaths; QStringList searchPaths = _pluginPaths;
while (!searchPaths.isEmpty()) while (!searchPaths.isEmpty())
{ {
const QDir dir(searchPaths.takeFirst()); const QDir dir(searchPaths.takeFirst());
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
const QFileInfoList files = dir.entryInfoList(QStringList() << QString("*.dll"), QDir::Files); const QFileInfoList files = dir.entryInfoList(QStringList() << QString("*.dll"), QDir::Files);
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
@ -132,62 +132,62 @@ void CPluginManager::readPluginPaths()
const QFileInfoList files = dir.entryInfoList(QStringList() << QString("*.so"), QDir::Files); const QFileInfoList files = dir.entryInfoList(QStringList() << QString("*.so"), QDir::Files);
#endif #endif
Q_FOREACH (const QFileInfo &file, files) Q_FOREACH (const QFileInfo &file, files)
pluginsList << file.absoluteFilePath(); pluginsList << file.absoluteFilePath();
const QFileInfoList dirs = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot); const QFileInfoList dirs = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot);
Q_FOREACH (const QFileInfo &subdir, dirs) Q_FOREACH (const QFileInfo &subdir, dirs)
searchPaths << subdir.absoluteFilePath(); searchPaths << subdir.absoluteFilePath();
} }
Q_FOREACH (const QString &pluginFile, pluginsList) Q_FOREACH (const QString &pluginFile, pluginsList)
{ {
CPluginSpec *spec = new CPluginSpec; CPluginSpec *spec = new CPluginSpec;
if (spec->setFileName(pluginFile)) if (spec->setFileName(pluginFile))
_pluginSpecs.append(spec); _pluginSpecs.append(spec);
else else
delete spec; delete spec;
} }
Q_EMIT pluginsChanged(); Q_EMIT pluginsChanged();
} }
CPluginSpec *CPluginManager::pluginByName(const QString &name) const CPluginSpec *CPluginManager::pluginByName(const QString &name) const
{ {
Q_FOREACH (CPluginSpec *spec, _pluginSpecs) Q_FOREACH (CPluginSpec *spec, _pluginSpecs)
if (spec->name() == name) if (spec->name() == name)
return spec; return spec;
return 0; return 0;
} }
void CPluginManager::setPluginState(CPluginSpec *spec, int destState) void CPluginManager::setPluginState(CPluginSpec *spec, int destState)
{ {
if (spec->hasError()) if (spec->hasError())
return; return;
if (destState == State::Running) if (destState == State::Running)
{ {
spec->initializeExtensions(); spec->initializeExtensions();
return; return;
} }
else if (destState == State::Deleted) else if (destState == State::Deleted)
{ {
spec->kill(); spec->kill();
return; return;
} }
if (destState == State::Loaded) if (destState == State::Loaded)
spec->loadLibrary(); spec->loadLibrary();
else if (destState == State::Initialized) else if (destState == State::Initialized)
spec->initializePlugin(); spec->initializePlugin();
else if (destState == State::Stopped) else if (destState == State::Stopped)
spec->stop(); spec->stop();
} }
void CPluginManager::stopAll() void CPluginManager::stopAll()
{ {
Q_FOREACH (CPluginSpec *spec, _pluginSpecs) Q_FOREACH (CPluginSpec *spec, _pluginSpecs)
setPluginState(spec, State::Stopped); setPluginState(spec, State::Stopped);
Q_FOREACH (CPluginSpec *spec, _pluginSpecs) Q_FOREACH (CPluginSpec *spec, _pluginSpecs)
setPluginState(spec, State::Deleted); setPluginState(spec, State::Deleted);
} }
}; // namespace NLQT }; // namespace NLQT

30
code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.h
View file

@ -33,22 +33,22 @@ class IPlugin;
class CPluginManager : public IPluginManager class CPluginManager : public IPluginManager
{ {
Q_OBJECT Q_OBJECT
public: public:
CPluginManager(QObject *parent = 0); CPluginManager(QObject *parent = 0);
~CPluginManager(); ~CPluginManager();
// Object pool operations // Object pool operations
virtual void addObject(QObject *obj); virtual void addObject(QObject *obj);
virtual void removeObject(QObject *obj); virtual void removeObject(QObject *obj);
virtual QList<QObject *> allObjects() const; virtual QList<QObject *> allObjects() const;
// Plugin operations // Plugin operations
virtual void loadPlugins(); virtual void loadPlugins();
virtual QStringList getPluginPaths() const; virtual QStringList getPluginPaths() const;
virtual void setPluginPaths(const QStringList &paths); virtual void setPluginPaths(const QStringList &paths);
virtual QList<CPluginSpec *> plugins() const; virtual QList<CPluginSpec *> plugins() const;
CPluginSpec *pluginByName(const QString &name) const; CPluginSpec *pluginByName(const QString &name) const;
@ -59,9 +59,9 @@ private:
mutable QReadWriteLock _lock; mutable QReadWriteLock _lock;
QList<CPluginSpec *> _pluginSpecs; QList<CPluginSpec *> _pluginSpecs;
QStringList _pluginPaths; QStringList _pluginPaths;
QList<QObject *> _allObjects; QList<QObject *> _allObjects;
}; // class CPluginManager }; // class CPluginManager

116
code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp
View file

@ -31,8 +31,8 @@ namespace NLQT
{ {
CPluginSpec::CPluginSpec(): CPluginSpec::CPluginSpec():
_state(State::Invalid), _state(State::Invalid),
_hasError(false), _hasError(false),
_plugin(NULL) _plugin(NULL)
{ {
} }
@ -99,125 +99,125 @@ QString CPluginSpec::errorString() const
bool CPluginSpec::setFileName(const QString &fileName) bool CPluginSpec::setFileName(const QString &fileName)
{ {
_name _name
= _version = _version
= _vendor = _vendor
= _description = _description
= _location = _location
= _filePath = _filePath
= _fileName = _fileName
= ""; = "";
_state = State::Invalid; _state = State::Invalid;
_hasError = false; _hasError = false;
_errorString = ""; _errorString = "";
QFile file(fileName); QFile file(fileName);
if (!file.exists()) if (!file.exists())
return reportError(QCoreApplication::translate("CPluginSpec", "File does not exist: %1").arg(file.fileName())); return reportError(QCoreApplication::translate("CPluginSpec", "File does not exist: %1").arg(file.fileName()));
if (!file.open(QIODevice::ReadOnly)) if (!file.open(QIODevice::ReadOnly))
return reportError(QCoreApplication::translate("CPluginSpec", "Could not open file for read: %1").arg(file.fileName())); return reportError(QCoreApplication::translate("CPluginSpec", "Could not open file for read: %1").arg(file.fileName()));
QFileInfo fileInfo(file); QFileInfo fileInfo(file);
_location = fileInfo.absolutePath(); _location = fileInfo.absolutePath();
_filePath = fileInfo.absoluteFilePath(); _filePath = fileInfo.absoluteFilePath();
_fileName = fileInfo.fileName(); _fileName = fileInfo.fileName();
_state = State::Read; _state = State::Read;
return true; return true;
} }
bool CPluginSpec::loadLibrary() bool CPluginSpec::loadLibrary()
{ {
if (_hasError) if (_hasError)
return false; return false;
if (_state != State::Read) if (_state != State::Read)
{ {
if (_state == State::Loaded) if (_state == State::Loaded)
return true; return true;
return reportError(QCoreApplication::translate("CPluginSpec", "Loading the library failed because state != Resolved")); return reportError(QCoreApplication::translate("CPluginSpec", "Loading the library failed because state != Resolved"));
} }
QString libName = QString("%1/%2").arg(_location).arg(_fileName); QString libName = QString("%1/%2").arg(_location).arg(_fileName);
QPluginLoader loader(libName); QPluginLoader loader(libName);
if (!loader.load()) if (!loader.load())
return reportError(libName + QString::fromLatin1(": ") + loader.errorString()); return reportError(libName + QString::fromLatin1(": ") + loader.errorString());
IPlugin *pluginObject = qobject_cast<IPlugin*>(loader.instance()); IPlugin *pluginObject = qobject_cast<IPlugin*>(loader.instance());
if (!pluginObject) if (!pluginObject)
{ {
loader.unload(); loader.unload();
return reportError(QCoreApplication::translate("CPluginSpec", "Plugin is not valid (does not derive from IPlugin)")); return reportError(QCoreApplication::translate("CPluginSpec", "Plugin is not valid (does not derive from IPlugin)"));
} }
_name = pluginObject->name(); _name = pluginObject->name();
_version = pluginObject->version(); _version = pluginObject->version();
_vendor = pluginObject->vendor(); _vendor = pluginObject->vendor();
_description = pluginObject->description(); _description = pluginObject->description();
_state = State::Loaded; _state = State::Loaded;
_plugin = pluginObject; _plugin = pluginObject;
return true; return true;
} }
bool CPluginSpec::initializePlugin() bool CPluginSpec::initializePlugin()
{ {
if (_hasError) if (_hasError)
return false; return false;
if (_state != State::Loaded) if (_state != State::Loaded)
{ {
if (_state == State::Initialized) if (_state == State::Initialized)
return true; return true;
return reportError(QCoreApplication::translate("CPluginSpec", "Initializing the plugin failed because state != Loaded)")); return reportError(QCoreApplication::translate("CPluginSpec", "Initializing the plugin failed because state != Loaded)"));
} }
if (!_plugin) if (!_plugin)
return reportError(QCoreApplication::translate("CPluginSpec", "Internal error: have no plugin instance to initialize")); return reportError(QCoreApplication::translate("CPluginSpec", "Internal error: have no plugin instance to initialize"));
QString err; QString err;
if (!_plugin->initialize(_pluginManager, &err)) if (!_plugin->initialize(_pluginManager, &err))
return reportError(QCoreApplication::translate("CPluginSpec", "Plugin initialization failed: %1").arg(err)); return reportError(QCoreApplication::translate("CPluginSpec", "Plugin initialization failed: %1").arg(err));
_state = State::Initialized; _state = State::Initialized;
return true; return true;
} }
bool CPluginSpec::initializeExtensions() bool CPluginSpec::initializeExtensions()
{ {
if (_hasError) if (_hasError)
return false; return false;
if (_state != State::Initialized) if (_state != State::Initialized)
{ {
if (_state == State::Running) if (_state == State::Running)
return true; return true;
return reportError(QCoreApplication::translate("CPluginSpec", "Cannot perform extensionsInitialized because state != Initialized")); return reportError(QCoreApplication::translate("CPluginSpec", "Cannot perform extensionsInitialized because state != Initialized"));
} }
if (!_plugin) if (!_plugin)
return reportError(QCoreApplication::translate("CPluginSpec", "Internal error: have no plugin instance to perform extensionsInitialized")); return reportError(QCoreApplication::translate("CPluginSpec", "Internal error: have no plugin instance to perform extensionsInitialized"));
_plugin->extensionsInitialized(); _plugin->extensionsInitialized();
_state = State::Running; _state = State::Running;
return true; return true;
} }
void CPluginSpec::stop() void CPluginSpec::stop()
{ {
if (!_plugin) if (!_plugin)
return; return;
_plugin->shutdown(); _plugin->shutdown();
_state = State::Stopped; _state = State::Stopped;
} }
void CPluginSpec::kill() void CPluginSpec::kill()
{ {
if (!_plugin) if (!_plugin)
return; return;
delete _plugin; delete _plugin;
_plugin = NULL; _plugin = NULL;
_state = State::Deleted; _state = State::Deleted;
} }
bool CPluginSpec::reportError(const QString &err) bool CPluginSpec::reportError(const QString &err)
{ {
_errorString = err; _errorString = err;
_hasError = true; _hasError = true;
return false; return false;
} }
} // namespace NLQT } // namespace NLQT

16
code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.h
View file

@ -56,7 +56,7 @@ public:
QString filePath() const; QString filePath() const;
QString fileName() const; QString fileName() const;
IPlugin *plugin() const; IPlugin *plugin() const;
// state // state
int getState() const; int getState() const;
@ -68,15 +68,15 @@ private:
bool setFileName(const QString &fileName); bool setFileName(const QString &fileName);
bool loadLibrary(); bool loadLibrary();
bool initializePlugin(); bool initializePlugin();
bool initializeExtensions(); bool initializeExtensions();
void stop(); void stop();
void kill(); void kill();
bool reportError(const QString &err); bool reportError(const QString &err);
QString _location; QString _location;
QString _filePath; QString _filePath;
QString _fileName; QString _fileName;
QString _name; QString _name;
@ -85,8 +85,8 @@ private:
QString _description; QString _description;
int _state; int _state;
bool _hasError; bool _hasError;
QString _errorString; QString _errorString;
IPlugin *_plugin; IPlugin *_plugin;
IPluginManager *_pluginManager; IPluginManager *_pluginManager;