diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index a1ea260ac..7254ec488 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -24,7 +24,7 @@ set(HEADERS plugins/containers/iomesh_plugin_container.h plugins/containers/ioraster_plugin_container.h plugins/containers/render_plugin_container.h - plugins/interfaces/meshlab_plugin_file.h + plugins/interfaces/meshlab_plugin.h plugins/interfaces/meshlab_plugin_logger.h plugins/interfaces/decorate_plugin.h plugins/interfaces/edit_plugin.h diff --git a/src/common/common.pro b/src/common/common.pro index b69b46ee6..cc262866d 100644 --- a/src/common/common.pro +++ b/src/common/common.pro @@ -43,7 +43,7 @@ HEADERS += \ plugins/containers/iomesh_plugin_container.h \ plugins/containers/ioraster_plugin_container.h \ plugins/containers/render_plugin_container.h \ - plugins/interfaces/meshlab_plugin_file.h \ + plugins/interfaces/meshlab_plugin.h \ plugins/interfaces/meshlab_plugin_logger.h \ plugins/interfaces/decorate_plugin.h \ plugins/interfaces/edit_plugin.h \ diff --git a/src/common/plugins/containers/edit_plugin_container.cpp b/src/common/plugins/containers/edit_plugin_container.cpp index ed022214f..44be6e233 100644 --- a/src/common/plugins/containers/edit_plugin_container.cpp +++ b/src/common/plugins/containers/edit_plugin_container.cpp @@ -32,12 +32,12 @@ void EditPluginContainer::clear() editPlugins.clear(); } -void EditPluginContainer::pushEditPlugin(EditPluginFactory* iEditFactory) +void EditPluginContainer::pushEditPlugin(EditPlugin* iEditFactory) { editPlugins.push_back(iEditFactory); } -void EditPluginContainer::eraseEditPlugin(EditPluginFactory* iEditFactory) +void EditPluginContainer::eraseEditPlugin(EditPlugin* iEditFactory) { editPlugins.erase(std::find(editPlugins.begin(), editPlugins.end(), iEditFactory)); } @@ -47,14 +47,14 @@ EditPluginContainer::EditPluginFactoryRangeIterator EditPluginContainer::editPlu return EditPluginFactoryRangeIterator(this, iterateAlsoDisabledPlugins); } -ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::begin() +ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::begin() { - return ConstPluginIterator(pm->editPlugins, pm->editPlugins.begin(), b); + return ConstPluginIterator(pm->editPlugins, pm->editPlugins.begin(), b); } -ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::end() +ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::end() { - return ConstPluginIterator(pm->editPlugins, pm->editPlugins.end(), b); + return ConstPluginIterator(pm->editPlugins, pm->editPlugins.end(), b); } EditPluginContainer::EditPluginFactoryRangeIterator::EditPluginFactoryRangeIterator( diff --git a/src/common/plugins/containers/edit_plugin_container.h b/src/common/plugins/containers/edit_plugin_container.h index 38abcdb8b..9122b0abd 100644 --- a/src/common/plugins/containers/edit_plugin_container.h +++ b/src/common/plugins/containers/edit_plugin_container.h @@ -41,20 +41,20 @@ public: EditPluginContainer(); void clear(); - void pushEditPlugin(EditPluginFactory* iEditFactory); - void eraseEditPlugin(EditPluginFactory* iEditFactory); + void pushEditPlugin(EditPlugin* iEditFactory); + void eraseEditPlugin(EditPlugin* iEditFactory); EditPluginFactoryRangeIterator editPluginIterator(bool iterateAlsoDisabledPlugins = false) const; private: - std::vector editPlugins; + std::vector editPlugins; }; class EditPluginContainer::EditPluginFactoryRangeIterator { friend class EditPluginContainer; public: - ConstPluginIterator begin(); - ConstPluginIterator end(); + ConstPluginIterator begin(); + ConstPluginIterator end(); private: EditPluginFactoryRangeIterator(const EditPluginContainer* pm, bool iterateAlsoDisabledPlugins = false); const EditPluginContainer* pm; diff --git a/src/common/plugins/interfaces/decorate_plugin.cpp b/src/common/plugins/interfaces/decorate_plugin.cpp index e2021bd64..b4288f19f 100644 --- a/src/common/plugins/interfaces/decorate_plugin.cpp +++ b/src/common/plugins/interfaces/decorate_plugin.cpp @@ -43,7 +43,7 @@ QAction* DecoratePlugin::action(QString name) const return 0; } -MeshLabPluginFile::ActionIDType DecoratePlugin::ID(const QAction* a) const +MeshLabPlugin::ActionIDType DecoratePlugin::ID(const QAction* a) const { QString aa=a->text(); foreach(ActionIDType tt, types()) @@ -57,7 +57,7 @@ MeshLabPluginFile::ActionIDType DecoratePlugin::ID(const QAction* a) const return -1; } -MeshLabPluginFile::ActionIDType DecoratePlugin::ID(QString name) const +MeshLabPlugin::ActionIDType DecoratePlugin::ID(QString name) const { QString n = name; foreach(ActionIDType tt, types()) diff --git a/src/common/plugins/interfaces/decorate_plugin.h b/src/common/plugins/interfaces/decorate_plugin.h index fc1085da0..6c456af02 100644 --- a/src/common/plugins/interfaces/decorate_plugin.h +++ b/src/common/plugins/interfaces/decorate_plugin.h @@ -25,7 +25,7 @@ #define MESHLAB_DECORATE_PLUGIN_H #include "meshlab_plugin_logger.h" -#include "meshlab_plugin_file.h" +#include "meshlab_plugin.h" class GLArea; @@ -53,7 +53,7 @@ class GLArea; * - display of specific tagging **/ -class DecoratePlugin : virtual public MeshLabPluginFile, public MeshLabPluginLogger +class DecoratePlugin : virtual public MeshLabPlugin, public MeshLabPluginLogger { public: diff --git a/src/common/plugins/interfaces/edit_plugin.h b/src/common/plugins/interfaces/edit_plugin.h index 51b2bd37f..af8d29f18 100644 --- a/src/common/plugins/interfaces/edit_plugin.h +++ b/src/common/plugins/interfaces/edit_plugin.h @@ -27,7 +27,7 @@ #include #include "meshlab_plugin_logger.h" -#include "meshlab_plugin_file.h" +#include "meshlab_plugin.h" #include "../../ml_document/mesh_document.h" @@ -94,19 +94,19 @@ public: /** - * @brief The EditPluginFactory class is used to generate an action for each - * starting of an editing filter. + * @brief The EditPlugin class is used to generate an action for each + * starting of an editing tool. * - * This is needed because editing filters have a internal state, so if you want + * This is needed because editing tools have a internal state, so if you want * to have an editing tool for two different documents you have to instance * two objects. This class is used by the framework to generate an independent - * EditPlugin for each document. + * EditTool for each document. */ -class EditPluginFactory : public MeshLabPluginFile +class EditPlugin : public MeshLabPlugin { public: - EditPluginFactory() {} - virtual ~EditPluginFactory() {} + EditPlugin() {} + virtual ~EditPlugin() {} //gets a list of actions available from this plugin virtual std::list actions() const {return actionList;}; @@ -121,8 +121,8 @@ protected: std::list actionList; }; -#define EDIT_PLUGIN_FACTORY_IID "vcg.meshlab.EditPluginFactory/1.0" -Q_DECLARE_INTERFACE(EditPluginFactory, EDIT_PLUGIN_FACTORY_IID) +#define EDIT_PLUGIN_IID "vcg.meshlab.EditPlugin/1.0" +Q_DECLARE_INTERFACE(EditPlugin, EDIT_PLUGIN_IID) #endif // MESHLAB_EDIT_PLUGIN_H diff --git a/src/common/plugins/interfaces/filter_plugin.cpp b/src/common/plugins/interfaces/filter_plugin.cpp index 8e0a2055a..03296382d 100644 --- a/src/common/plugins/interfaces/filter_plugin.cpp +++ b/src/common/plugins/interfaces/filter_plugin.cpp @@ -47,7 +47,7 @@ bool FilterPlugin::isFilterApplicable(const QAction* act, const MeshModel& m, QS return MissingItems.isEmpty(); } -MeshLabPluginFile::ActionIDType FilterPlugin::ID(const QAction* a) const +MeshLabPlugin::ActionIDType FilterPlugin::ID(const QAction* a) const { QString aa=a->text(); for(ActionIDType tt : qAsConst(typeList)) diff --git a/src/common/plugins/interfaces/filter_plugin.h b/src/common/plugins/interfaces/filter_plugin.h index 2f387d8fb..6e99b4d71 100644 --- a/src/common/plugins/interfaces/filter_plugin.h +++ b/src/common/plugins/interfaces/filter_plugin.h @@ -25,7 +25,7 @@ #define MESHLAB_FILTER_PLUGIN_H #include "meshlab_plugin_logger.h" -#include "meshlab_plugin_file.h" +#include "meshlab_plugin.h" #include "../../ml_document/mesh_document.h" //declaring types to be used as QVariants @@ -40,7 +40,7 @@ Q_DECLARE_METATYPE(Eigen::VectorXd) /** * @brief The FilterPlugin class provide the interface of the filter plugins. */ -class FilterPlugin : virtual public MeshLabPluginFile, virtual public MeshLabPluginLogger +class FilterPlugin : virtual public MeshLabPlugin, virtual public MeshLabPluginLogger { public: /** diff --git a/src/common/plugins/interfaces/iomesh_plugin.h b/src/common/plugins/interfaces/iomesh_plugin.h index 5b59ce102..42dc5cc54 100644 --- a/src/common/plugins/interfaces/iomesh_plugin.h +++ b/src/common/plugins/interfaces/iomesh_plugin.h @@ -27,13 +27,13 @@ #include #include "meshlab_plugin_logger.h" -#include "meshlab_plugin_file.h" +#include "meshlab_plugin.h" #include "../../utilities/file_format.h" /** * @brief The IOMeshPlugin is the base class for all the single mesh loading plugins. */ -class IOMeshPlugin : virtual public MeshLabPluginFile, virtual public MeshLabPluginLogger +class IOMeshPlugin : virtual public MeshLabPlugin, virtual public MeshLabPluginLogger { public: IOMeshPlugin() : MeshLabPluginLogger() { } diff --git a/src/common/plugins/interfaces/ioraster_plugin.h b/src/common/plugins/interfaces/ioraster_plugin.h index 0e2a8cb57..b0a04e0b4 100644 --- a/src/common/plugins/interfaces/ioraster_plugin.h +++ b/src/common/plugins/interfaces/ioraster_plugin.h @@ -25,11 +25,11 @@ #define MESHLAB_IORASTER_PLUGIN_H #include "meshlab_plugin_logger.h" -#include "meshlab_plugin_file.h" +#include "meshlab_plugin.h" #include "../../utilities/file_format.h" #include "../../ml_document/raster_model.h" -class IORasterPlugin : virtual public MeshLabPluginFile, virtual public MeshLabPluginLogger +class IORasterPlugin : virtual public MeshLabPlugin, virtual public MeshLabPluginLogger { public: IORasterPlugin() : MeshLabPluginLogger() {} diff --git a/src/common/plugins/interfaces/meshlab_plugin_file.h b/src/common/plugins/interfaces/meshlab_plugin.h similarity index 95% rename from src/common/plugins/interfaces/meshlab_plugin_file.h rename to src/common/plugins/interfaces/meshlab_plugin.h index f68ed2840..6f2197e5a 100644 --- a/src/common/plugins/interfaces/meshlab_plugin_file.h +++ b/src/common/plugins/interfaces/meshlab_plugin.h @@ -21,8 +21,8 @@ * * ****************************************************************************/ -#ifndef MESHLAB_PLUGIN_FILE_H -#define MESHLAB_PLUGIN_FILE_H +#ifndef MESHLAB_PLUGIN_H +#define MESHLAB_PLUGIN_H #include #include @@ -44,13 +44,13 @@ * Moreover ID are UNSAFE (different plugin can have same id) so they should be * used only INTERNALLY. */ -class MeshLabPluginFile +class MeshLabPlugin { public: friend class PluginManager; - MeshLabPluginFile() : enabled(true) {}; - virtual ~MeshLabPluginFile() {} + MeshLabPlugin() : enabled(true) {}; + virtual ~MeshLabPlugin() {} /** * @brief the type used to identify plugin actions; @@ -101,4 +101,4 @@ private: private: #define MESHLAB_PLUGIN_NAME_EXPORTER(x) -#endif // MESHLAB_PLUGIN_FILE_H +#endif // MESHLAB_PLUGIN_H diff --git a/src/common/plugins/interfaces/meshlab_plugin_logger.h b/src/common/plugins/interfaces/meshlab_plugin_logger.h index 31ba9165f..0a2a155ea 100644 --- a/src/common/plugins/interfaces/meshlab_plugin_logger.h +++ b/src/common/plugins/interfaces/meshlab_plugin_logger.h @@ -26,19 +26,19 @@ #include -#include "meshlab_plugin_file.h" +#include "meshlab_plugin.h" #include "../../GLLogStream.h" #include "../../parameters/rich_parameter_list.h" #include "../../globals.h" /** - * @brief The PluginLogger provides some common log functionalities that are - * used by meshlab. + * @brief The MeshLabPluginLogger provides some common log functionalities that are + * used by MeshLab. * - * Each MeshLab abstract plugin class inherit from this class in order to make + * Each MeshLab abstract plugin class inherits from this class in order to make * available log member functions to plugins. * The only exception is the EditPlugin class, since it is not the Edit plugin - * that should be able to log, but the EditTool class (The EditPlugin class is a + * that should be able to log, but the EditTool class (the EditPlugin class is a * "container" of EditTools). */ class MeshLabPluginLogger diff --git a/src/common/plugins/interfaces/render_plugin.h b/src/common/plugins/interfaces/render_plugin.h index cf6796de9..8d7ddf2f6 100644 --- a/src/common/plugins/interfaces/render_plugin.h +++ b/src/common/plugins/interfaces/render_plugin.h @@ -25,7 +25,7 @@ #define MESHLAB_RENDER_PLUGIN_H #include "meshlab_plugin_logger.h" -#include "meshlab_plugin_file.h" +#include "meshlab_plugin.h" #include "../../ml_shared_data_context/ml_scene_gl_shared_data_context.h" /** @@ -50,7 +50,7 @@ class GLArea; -class RenderPlugin : virtual public MeshLabPluginFile, virtual public MeshLabPluginLogger +class RenderPlugin : virtual public MeshLabPlugin, virtual public MeshLabPluginLogger { public: RenderPlugin() :MeshLabPluginLogger() {} diff --git a/src/common/plugins/meshlab_plugin_type.cpp b/src/common/plugins/meshlab_plugin_type.cpp index 4b072206b..461f81128 100644 --- a/src/common/plugins/meshlab_plugin_type.cpp +++ b/src/common/plugins/meshlab_plugin_type.cpp @@ -30,7 +30,7 @@ #include "interfaces/ioraster_plugin.h" #include "interfaces/render_plugin.h" -MeshLabPluginType::MeshLabPluginType(const MeshLabPluginFile* fpi) : type(0) +MeshLabPluginType::MeshLabPluginType(const MeshLabPlugin* fpi) : type(0) { //Decorate const DecoratePlugin *iDecorator = dynamic_cast(fpi); @@ -38,7 +38,7 @@ MeshLabPluginType::MeshLabPluginType(const MeshLabPluginFile* fpi) : type(0) type |= DECORATE; } //EditFactory - const EditPluginFactory* efp = dynamic_cast(fpi); + const EditPlugin* efp = dynamic_cast(fpi); if (efp) { //EditFactory Plugin type |= EDIT; } diff --git a/src/common/plugins/meshlab_plugin_type.h b/src/common/plugins/meshlab_plugin_type.h index 5d8d6559e..f202e9aa5 100644 --- a/src/common/plugins/meshlab_plugin_type.h +++ b/src/common/plugins/meshlab_plugin_type.h @@ -26,12 +26,12 @@ class QString; -class MeshLabPluginFile; +class MeshLabPlugin; class MeshLabPluginType { public: - MeshLabPluginType(const MeshLabPluginFile* fpi); + MeshLabPluginType(const MeshLabPlugin* fpi); bool isValid() const; bool isDecoratePlugin() const; diff --git a/src/common/plugins/plugin_manager.cpp b/src/common/plugins/plugin_manager.cpp index 697c9890a..c8c018824 100644 --- a/src/common/plugins/plugin_manager.cpp +++ b/src/common/plugins/plugin_manager.cpp @@ -80,7 +80,7 @@ void PluginManager::checkPlugin(const QString& filename) throw MLException(fin.fileName() + " does not seem to be a Qt Plugin.\n\n" + loader.errorString()); } - MeshLabPluginFile* ifp = dynamic_cast(plugin); + MeshLabPlugin* ifp = dynamic_cast(plugin); if (!ifp){ throw MLException(fin.fileName() + " is not a MeshLab plugin."); } @@ -195,14 +195,14 @@ void PluginManager::loadPlugin(const QString& fileName) //load the plugin depending on the type (can be more than one type!) QPluginLoader* loader = new QPluginLoader(fin.absoluteFilePath()); QObject *plugin = loader->instance(); - MeshLabPluginFile* ifp = dynamic_cast(plugin); + MeshLabPlugin* ifp = dynamic_cast(plugin); MeshLabPluginType type(ifp); if (type.isDecoratePlugin()){ decoratePlugins.pushDecoratePlugin(qobject_cast(plugin)); } if (type.isEditPlugin()){ - editPlugins.pushEditPlugin(qobject_cast(plugin)); + editPlugins.pushEditPlugin(qobject_cast(plugin)); } if (type.isFilterPlugin()){ filterPlugins.pushFilterPlugin(qobject_cast(plugin)); @@ -225,7 +225,7 @@ void PluginManager::loadPlugin(const QString& fileName) pluginFiles.insert(fin.absoluteFilePath()); } -void PluginManager::unloadPlugin(MeshLabPluginFile* ifp) +void PluginManager::unloadPlugin(MeshLabPlugin* ifp) { auto it = std::find(allPlugins.begin(), allPlugins.end(), ifp); if (it != allPlugins.end()){ @@ -235,7 +235,7 @@ void PluginManager::unloadPlugin(MeshLabPluginFile* ifp) decoratePlugins.eraseDecoratePlugin(dynamic_cast(ifp)); } if (type.isEditPlugin()){ - editPlugins.eraseEditPlugin(dynamic_cast(ifp)); + editPlugins.eraseEditPlugin(dynamic_cast(ifp)); } if (type.isFilterPlugin()){ filterPlugins.eraseFilterPlugin(dynamic_cast(ifp)); @@ -257,7 +257,7 @@ void PluginManager::unloadPlugin(MeshLabPluginFile* ifp) } } -void PluginManager::enablePlugin(MeshLabPluginFile* ifp) +void PluginManager::enablePlugin(MeshLabPlugin* ifp) { auto it = std::find(allPlugins.begin(), allPlugins.end(), ifp); if (it != allPlugins.end() && !ifp->isEnabled()){ @@ -266,7 +266,7 @@ void PluginManager::enablePlugin(MeshLabPluginFile* ifp) } } -void PluginManager::disablePlugin(MeshLabPluginFile* ifp) +void PluginManager::disablePlugin(MeshLabPlugin* ifp) { auto it = std::find(allPlugins.begin(), allPlugins.end(), ifp); if (it != allPlugins.end() && ifp->isEnabled()){ @@ -356,7 +356,7 @@ QStringList PluginManager::inputRasterFormatListDialog() const return inputFormatListDialog(ioRasterPluginIterator()); } -MeshLabPluginFile* PluginManager::operator[](unsigned int i) const +MeshLabPlugin* PluginManager::operator[](unsigned int i) const { return allPlugins[i]; } @@ -462,14 +462,14 @@ QStringList PluginManager::outputFormatListDialog(RangeIterator iterator) return inputRasterFormatsDialogStringList; } -ConstPluginIterator PluginManager::PluginRangeIterator::begin() +ConstPluginIterator PluginManager::PluginRangeIterator::begin() { - return ConstPluginIterator(pm->allPlugins, pm->allPlugins.begin(), b); + return ConstPluginIterator(pm->allPlugins, pm->allPlugins.begin(), b); } -ConstPluginIterator PluginManager::PluginRangeIterator::end() +ConstPluginIterator PluginManager::PluginRangeIterator::end() { - return ConstPluginIterator(pm->allPlugins, pm->allPlugins.end(), b); + return ConstPluginIterator(pm->allPlugins, pm->allPlugins.end(), b); } PluginManager::PluginRangeIterator::PluginRangeIterator(const PluginManager* pm, bool iterateAlsoDisabledPlugins) : diff --git a/src/common/plugins/plugin_manager.h b/src/common/plugins/plugin_manager.h index b7a160bdd..cc85b3e46 100644 --- a/src/common/plugins/plugin_manager.h +++ b/src/common/plugins/plugin_manager.h @@ -51,10 +51,10 @@ public: void loadPlugins(); void loadPlugins(QDir pluginsDirectory); void loadPlugin(const QString& filename); - void unloadPlugin(MeshLabPluginFile* ifp); + void unloadPlugin(MeshLabPlugin* ifp); - void enablePlugin(MeshLabPluginFile* ifp); - void disablePlugin(MeshLabPluginFile* ifp); + void enablePlugin(MeshLabPlugin* ifp); + void disablePlugin(MeshLabPlugin* ifp); unsigned int size() const; int numberIOPlugins() const; @@ -76,7 +76,7 @@ public: QStringList outputMeshFormatListDialog() const; QStringList inputRasterFormatListDialog() const; - MeshLabPluginFile* operator [](unsigned int i) const; + MeshLabPlugin* operator [](unsigned int i) const; /** Member functions for range iterators **/ PluginRangeIterator pluginIterator(bool iterateAlsoDisabledPlugins = false) const; @@ -89,7 +89,7 @@ public: private: //all plugins - std::vector allPlugins; + std::vector allPlugins; std::vector allPluginLoaders; std::set pluginFiles; //used to check if a plugin file has been already loaded @@ -115,8 +115,8 @@ class PluginManager::PluginRangeIterator { friend class PluginManager; public: - ConstPluginIterator begin(); - ConstPluginIterator end(); + ConstPluginIterator begin(); + ConstPluginIterator end(); private: PluginRangeIterator(const PluginManager* pm, bool iterateAlsoDisabledPlugins = false); const PluginManager* pm; diff --git a/src/meshlab/dialogs/plugin_info_dialog.cpp b/src/meshlab/dialogs/plugin_info_dialog.cpp index b0fb15351..43ef1ab8b 100644 --- a/src/meshlab/dialogs/plugin_info_dialog.cpp +++ b/src/meshlab/dialogs/plugin_info_dialog.cpp @@ -69,7 +69,7 @@ void PluginInfoDialog::chechBoxStateChanged(int state) QCheckBox* cb = (QCheckBox*)QObject::sender(); int nPlug = cb->property("np").toInt(); PluginManager& pm = meshlab::pluginManagerInstance(); - MeshLabPluginFile* fpi = pm[nPlug]; + MeshLabPlugin* fpi = pm[nPlug]; if (state == Qt::Checked){ pm.enablePlugin(fpi); } @@ -87,7 +87,7 @@ void PluginInfoDialog::uninstallPluginPushButtonClicked() QPushButton* pb = (QPushButton*)QObject::sender(); int nPlug = pb->property("np").toInt(); PluginManager& pm = meshlab::pluginManagerInstance(); - MeshLabPluginFile* fpi = pm[nPlug]; + MeshLabPlugin* fpi = pm[nPlug]; QFileInfo fdel = fpi->pluginFileInfo(); pm.unloadPlugin(fpi); bool res = QFile::remove(fdel.absoluteFilePath()); @@ -159,7 +159,7 @@ void PluginInfoDialog::populateTreeWidget() } else { int nPlug = 0; - for (MeshLabPluginFile* fp : pm.pluginIterator(true)){ + for (MeshLabPlugin* fp : pm.pluginIterator(true)){ MeshLabPluginType type(fp); QString pluginType = type.pluginTypeString(); QStringList tmplist; @@ -169,7 +169,7 @@ void PluginInfoDialog::populateTreeWidget() tmplist.push_back(a->text()); } if (type.isEditPlugin()){ - EditPluginFactory* epi = dynamic_cast(fp); + EditPlugin* epi = dynamic_cast(fp); for(QAction *a: epi->actions()) tmplist.push_back(a->text()); } @@ -215,7 +215,7 @@ void PluginInfoDialog::populateTreeWidget() } } -void PluginInfoDialog::addItems(const MeshLabPluginFile* fpi, int nPlug, const QString& pluginType, const QStringList& features) +void PluginInfoDialog::addItems(const MeshLabPlugin* fpi, int nPlug, const QString& pluginType, const QStringList& features) { QTreeWidgetItem *pluginItem = new QTreeWidgetItem(ui->treeWidget); pluginItem->setText(PLUGINS, fpi->pluginName()); diff --git a/src/meshlab/dialogs/plugin_info_dialog.h b/src/meshlab/dialogs/plugin_info_dialog.h index 46309c4f5..1e63eb831 100644 --- a/src/meshlab/dialogs/plugin_info_dialog.h +++ b/src/meshlab/dialogs/plugin_info_dialog.h @@ -32,7 +32,7 @@ class PluginInfoDialog; } class QTreeWidgetItem; -class MeshLabPluginFile; +class MeshLabPlugin; class PluginInfoDialog : public QDialog { @@ -52,7 +52,7 @@ private: enum PluginDialogColumn{PLUGINS = 0, ENABLED, TYPE, VENDOR, FILE, UNINSTALL}; void populateTreeWidget(); - void addItems(const MeshLabPluginFile* fpi, int nPlug, const QString& pluginType, const QStringList &features); + void addItems(const MeshLabPlugin* fpi, int nPlug, const QString& pluginType, const QStringList &features); Ui::PluginInfoDialog *ui; QIcon interfaceIcon; diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 4d9c2be6d..23e1a72a0 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -88,7 +88,7 @@ MainWindow::MainWindow(): //disable previously disabled plugins QStringList disabledPlugins = settings.value("DisabledPlugins").value(); - for (MeshLabPluginFile* fp : PM.pluginIterator(true)){ + for (MeshLabPlugin* fp : PM.pluginIterator(true)){ if (disabledPlugins.contains(fp->pluginName())) PM.disablePlugin(fp); } @@ -508,7 +508,7 @@ void MainWindow::createToolBars() editToolBar = addToolBar(tr("Edit")); editToolBar->addAction(suspendEditModeAct); - for(EditPluginFactory *iEditFactory: PM.editPluginFactoryIterator()) { + for(EditPlugin *iEditFactory: PM.editPluginFactoryIterator()) { for(QAction* editAction: iEditFactory->actions()){ if (!editAction->icon().isNull()) { editToolBar->addAction(editAction); @@ -881,7 +881,7 @@ void MainWindow::fillEditMenu() { clearMenu(editMenu); editMenu->addAction(suspendEditModeAct); - for(EditPluginFactory *iEditFactory: PM.editPluginFactoryIterator()) + for(EditPlugin *iEditFactory: PM.editPluginFactoryIterator()) { for(QAction* editAction: iEditFactory->actions()) { @@ -921,7 +921,7 @@ void MainWindow::updateAllPluginsActions() editToolBar->clear(); editToolBar->addAction(suspendEditModeAct); - for(EditPluginFactory *iEditFactory: PM.editPluginFactoryIterator()) { + for(EditPlugin *iEditFactory: PM.editPluginFactoryIterator()) { for(QAction* editAction: iEditFactory->actions()){ if (!editAction->icon().isNull()) { editToolBar->addAction(editAction); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index eb5e80bc8..36ff3bc9e 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -395,7 +395,7 @@ void MainWindow::updateMenus() // you exit from editing mode by pressing again the editing button // When you are in a editing mode all the other editing are disabled. - for (EditPluginFactory* ep : PM.editPluginFactoryIterator()) + for (EditPlugin* ep : PM.editPluginFactoryIterator()) for (QAction* a : ep->actions()) { a->setChecked(false); a->setEnabled(GLA()->getCurrentEditAction() == nullptr); @@ -432,7 +432,7 @@ void MainWindow::updateMenus() } // if active else { - for (EditPluginFactory* ep : PM.editPluginFactoryIterator()) { + for (EditPlugin* ep : PM.editPluginFactoryIterator()) { for (QAction* a : ep->actions()) { a->setEnabled(false); } @@ -1406,7 +1406,7 @@ void MainWindow::applyEditMode() //if this GLArea does not have an instance of this action's MeshEdit tool then give it one if(!GLA()->editorExistsForAction(action)) { - EditPluginFactory *iEditFactory = qobject_cast(action->parent()); + EditPlugin *iEditFactory = qobject_cast(action->parent()); EditTool *iEdit = iEditFactory->getEditTool(action); GLA()->addMeshEditor(action, iEdit); } @@ -2750,7 +2750,7 @@ void MainWindow::aboutPlugins() updateAllPluginsActions(); QSettings settings; QStringList disabledPlugins; - for (MeshLabPluginFile* pf : PM.pluginIterator(true)){ + for (MeshLabPlugin* pf : PM.pluginIterator(true)){ if (!pf->isEnabled()){ disabledPlugins.append(pf->pluginName()); } diff --git a/src/meshlabplugins/edit_align/edit_align_factory.h b/src/meshlabplugins/edit_align/edit_align_factory.h index 403451739..33ca58fe1 100644 --- a/src/meshlabplugins/edit_align/edit_align_factory.h +++ b/src/meshlabplugins/edit_align/edit_align_factory.h @@ -28,11 +28,11 @@ #include #include -class EditAlignFactory : public QObject, public EditPluginFactory +class EditAlignFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditAlignFactory(); diff --git a/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h b/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h index 09a732ed0..b19ef5ed9 100644 --- a/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h +++ b/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h @@ -28,11 +28,11 @@ #include #include -class EditManipulatorsFactory : public QObject, public EditPluginFactory +class EditManipulatorsFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditManipulatorsFactory(); diff --git a/src/meshlabplugins/edit_measure/edit_measure_factory.h b/src/meshlabplugins/edit_measure/edit_measure_factory.h index 6a0e9f67b..f4d63b4d7 100644 --- a/src/meshlabplugins/edit_measure/edit_measure_factory.h +++ b/src/meshlabplugins/edit_measure/edit_measure_factory.h @@ -28,11 +28,11 @@ #include #include -class EditMeasureFactory : public QObject, public EditPluginFactory +class EditMeasureFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditMeasureFactory(); diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h index 261819e1a..010d34f17 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h @@ -27,11 +27,11 @@ #include #include -class EditMutualCorrsFactory : public QObject, public EditPluginFactory +class EditMutualCorrsFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditMutualCorrsFactory(); diff --git a/src/meshlabplugins/edit_paint/edit_paint_factory.h b/src/meshlabplugins/edit_paint/edit_paint_factory.h index c8a696125..fe02975b4 100644 --- a/src/meshlabplugins/edit_paint/edit_paint_factory.h +++ b/src/meshlabplugins/edit_paint/edit_paint_factory.h @@ -28,11 +28,11 @@ #include -class EditPaintFactory : public QObject, public EditPluginFactory +class EditPaintFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditPaintFactory(); diff --git a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h index fbedeee7f..44b62838f 100644 --- a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h +++ b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h @@ -28,11 +28,11 @@ #include #include -class EditPickPointsFactory : public QObject, public EditPluginFactory +class EditPickPointsFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditPickPointsFactory(); diff --git a/src/meshlabplugins/edit_point/edit_point_factory.h b/src/meshlabplugins/edit_point/edit_point_factory.h index b8bc5783a..632901be0 100644 --- a/src/meshlabplugins/edit_point/edit_point_factory.h +++ b/src/meshlabplugins/edit_point/edit_point_factory.h @@ -28,11 +28,11 @@ #include #include -class PointEditFactory : public QObject, public EditPluginFactory +class PointEditFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: PointEditFactory(); diff --git a/src/meshlabplugins/edit_quality/edit_quality_factory.h b/src/meshlabplugins/edit_quality/edit_quality_factory.h index 3d0fa167b..2d8ae56a7 100644 --- a/src/meshlabplugins/edit_quality/edit_quality_factory.h +++ b/src/meshlabplugins/edit_quality/edit_quality_factory.h @@ -28,11 +28,11 @@ #include #include -class QualityMapperFactory : public QObject, public EditPluginFactory +class QualityMapperFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: QualityMapperFactory(); diff --git a/src/meshlabplugins/edit_referencing/edit_referencing_factory.h b/src/meshlabplugins/edit_referencing/edit_referencing_factory.h index e6dd5b316..f2187724e 100644 --- a/src/meshlabplugins/edit_referencing/edit_referencing_factory.h +++ b/src/meshlabplugins/edit_referencing/edit_referencing_factory.h @@ -27,11 +27,11 @@ #include #include -class EditReferencingFactory : public QObject, public EditPluginFactory +class EditReferencingFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditReferencingFactory(); diff --git a/src/meshlabplugins/edit_sample/edit_sample_factory.h b/src/meshlabplugins/edit_sample/edit_sample_factory.h index 3bd242a3f..ed14fc598 100644 --- a/src/meshlabplugins/edit_sample/edit_sample_factory.h +++ b/src/meshlabplugins/edit_sample/edit_sample_factory.h @@ -28,11 +28,11 @@ #include #include -class SampleEditFactory : public QObject, public EditPluginFactory +class SampleEditFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: SampleEditFactory(); diff --git a/src/meshlabplugins/edit_select/edit_select_factory.h b/src/meshlabplugins/edit_select/edit_select_factory.h index 86dfde76c..46497cab3 100644 --- a/src/meshlabplugins/edit_select/edit_select_factory.h +++ b/src/meshlabplugins/edit_select/edit_select_factory.h @@ -27,11 +27,11 @@ #include -class EditSelectFactory : public QObject, public EditPluginFactory +class EditSelectFactory : public QObject, public EditPlugin { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) - Q_INTERFACES(EditPluginFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_IID) + Q_INTERFACES(EditPlugin) public: EditSelectFactory(); diff --git a/src/meshlabserver/mainserver.cpp b/src/meshlabserver/mainserver.cpp index c5f229944..0315d3ab3 100644 --- a/src/meshlabserver/mainserver.cpp +++ b/src/meshlabserver/mainserver.cpp @@ -37,6 +37,7 @@ #include +#include #include #include #include