Designer plugin interface renamed

This commit is contained in:
Arin Alexander 2018-06-21 13:38:47 +03:00
parent 39253b1f55
commit 1a189054f7
4 changed files with 8 additions and 8 deletions

View File

@ -4,12 +4,12 @@
#include <QMainWindow> #include <QMainWindow>
#include <lrdesignerplugininterface.h> #include <lrdesignerplugininterface.h>
class ReportDesignerFactoryPlugin : public QObject, public LimeReportPluginInterface { class ReportDesignerFactoryPlugin : public QObject, public LimeReportDesignerPluginInterface {
Q_OBJECT Q_OBJECT
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "ru.limereport.DersignerFactoryInterface") Q_PLUGIN_METADATA(IID "ru.limereport.DersignerFactoryInterface")
#endif #endif
Q_INTERFACES( LimeReportPluginInterface ) Q_INTERFACES( LimeReportDesignerPluginInterface )
public: public:
~ReportDesignerFactoryPlugin(); ~ReportDesignerFactoryPlugin();

View File

@ -17,12 +17,12 @@ namespace LimeReport {
class ReportEnginePrivateInterface; class ReportEnginePrivateInterface;
} }
class LimeReportPluginInterface { class LimeReportDesignerPluginInterface {
public: public:
virtual ~LimeReportPluginInterface() { } virtual ~LimeReportDesignerPluginInterface() { }
virtual LimeReport::ReportDesignWindowInterface* getDesignerWindow(LimeReport::ReportEnginePrivateInterface* report, QWidget *parent = 0, QSettings* settings=0) = 0; virtual LimeReport::ReportDesignWindowInterface* getDesignerWindow(LimeReport::ReportEnginePrivateInterface* report, QWidget *parent = 0, QSettings* settings=0) = 0;
}; };
Q_DECLARE_INTERFACE( LimeReportPluginInterface, "ru.limereport.LimeReport.DesignerPluginInterface/1.0" ) Q_DECLARE_INTERFACE( LimeReportDesignerPluginInterface, "ru.limereport.LimeReport.DesignerPluginInterface/1.0" )
#endif // LRDESIGNERPLUGININTERFACE_H #endif // LRDESIGNERPLUGININTERFACE_H

View File

@ -113,8 +113,8 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) :
foreach( const QString& pluginName, pluginsDir.entryList( QDir::Files ) ) { foreach( const QString& pluginName, pluginsDir.entryList( QDir::Files ) ) {
QPluginLoader loader( pluginsDir.absoluteFilePath( pluginName ) ); QPluginLoader loader( pluginsDir.absoluteFilePath( pluginName ) );
if( loader.load() ) { if( loader.load() ) {
if( LimeReportPluginInterface* myPlugin = qobject_cast< LimeReportPluginInterface* >( loader.instance() ) ) { if( LimeReportDesignerPluginInterface* designerPlugin = qobject_cast< LimeReportDesignerPluginInterface* >( loader.instance() ) ) {
m_designerFactory = myPlugin; m_designerFactory = designerPlugin;
break; break;
} }
} }

View File

@ -264,7 +264,7 @@ private:
QLocale::Language m_reportLanguage; QLocale::Language m_reportLanguage;
void activateLanguage(QLocale::Language language); void activateLanguage(QLocale::Language language);
Qt::LayoutDirection m_previewLayoutDirection; Qt::LayoutDirection m_previewLayoutDirection;
LimeReportPluginInterface* m_designerFactory; LimeReportDesignerPluginInterface* m_designerFactory;
QString m_styleSheet; QString m_styleSheet;
QLocale::Language m_currentDesignerLanguage; QLocale::Language m_currentDesignerLanguage;
}; };