diff --git a/designer_plugin/lrdesignerplugin.h b/designer_plugin/lrdesignerplugin.h index 7f17491..d23f147 100644 --- a/designer_plugin/lrdesignerplugin.h +++ b/designer_plugin/lrdesignerplugin.h @@ -4,12 +4,12 @@ #include #include -class ReportDesignerFactoryPlugin : public QObject, public LimeReportPluginInterface { +class ReportDesignerFactoryPlugin : public QObject, public LimeReportDesignerPluginInterface { Q_OBJECT #if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "ru.limereport.DersignerFactoryInterface") #endif - Q_INTERFACES( LimeReportPluginInterface ) + Q_INTERFACES( LimeReportDesignerPluginInterface ) public: ~ReportDesignerFactoryPlugin(); diff --git a/limereport/lrdesignerplugininterface.h b/limereport/lrdesignerplugininterface.h index 1587c39..f9cab7e 100644 --- a/limereport/lrdesignerplugininterface.h +++ b/limereport/lrdesignerplugininterface.h @@ -17,12 +17,12 @@ namespace LimeReport { class ReportEnginePrivateInterface; } -class LimeReportPluginInterface { +class LimeReportDesignerPluginInterface { public: - virtual ~LimeReportPluginInterface() { } + virtual ~LimeReportDesignerPluginInterface() { } 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 diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index b1955e6..45ff9f8 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -113,8 +113,8 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) : foreach( const QString& pluginName, pluginsDir.entryList( QDir::Files ) ) { QPluginLoader loader( pluginsDir.absoluteFilePath( pluginName ) ); if( loader.load() ) { - if( LimeReportPluginInterface* myPlugin = qobject_cast< LimeReportPluginInterface* >( loader.instance() ) ) { - m_designerFactory = myPlugin; + if( LimeReportDesignerPluginInterface* designerPlugin = qobject_cast< LimeReportDesignerPluginInterface* >( loader.instance() ) ) { + m_designerFactory = designerPlugin; break; } } diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index ea8c854..ea2ff2a 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -264,7 +264,7 @@ private: QLocale::Language m_reportLanguage; void activateLanguage(QLocale::Language language); Qt::LayoutDirection m_previewLayoutDirection; - LimeReportPluginInterface* m_designerFactory; + LimeReportDesignerPluginInterface* m_designerFactory; QString m_styleSheet; QLocale::Language m_currentDesignerLanguage; };