diff --git a/src/common/KReportPluginMetaData.cpp b/src/common/KReportPluginMetaData.cpp --- a/src/common/KReportPluginMetaData.cpp +++ b/src/common/KReportPluginMetaData.cpp @@ -28,7 +28,7 @@ public: Private(KReportPluginMetaData *metaData) : isBuiltIn(false), isStatic(false) { - const QString s = metaData->value(QLatin1String("X-KReport-Priority")); + const QString s = metaData->value(QLatin1String("X-KReport-PluginInfo-Priority")); bool ok; int i = s.toInt(&ok); priority = ok ? i : 100; // default priority is low diff --git a/src/items/check/check.json b/src/items/check/check.json --- a/src/items/check/check.json +++ b/src/items/check/check.json @@ -77,5 +77,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "check", - "X-KReport-Priority": "5" + "X-KReport-PluginInfo-Priority": "5" } diff --git a/src/items/field/field.json b/src/items/field/field.json --- a/src/items/field/field.json +++ b/src/items/field/field.json @@ -76,5 +76,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "field", - "X-KReport-Priority": "1" + "X-KReport-PluginInfo-Priority": "1" } diff --git a/src/items/image/image.json b/src/items/image/image.json --- a/src/items/image/image.json +++ b/src/items/image/image.json @@ -76,5 +76,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "image", - "X-KReport-Priority": "1" + "X-KReport-PluginInfo-Priority": "1" } diff --git a/src/items/label/label.json b/src/items/label/label.json --- a/src/items/label/label.json +++ b/src/items/label/label.json @@ -77,5 +77,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "label", - "X-KReport-Priority": "1" + "X-KReport-PluginInfo-Priority": "1" } diff --git a/src/items/text/text.json b/src/items/text/text.json --- a/src/items/text/text.json +++ b/src/items/text/text.json @@ -74,5 +74,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "text", - "X-KReport-Priority": "1" + "X-KReport-PluginInfo-Priority": "1" } diff --git a/src/plugins/barcode/kreport_barcodeplugin.json b/src/plugins/barcode/kreport_barcodeplugin.json --- a/src/plugins/barcode/kreport_barcodeplugin.json +++ b/src/plugins/barcode/kreport_barcodeplugin.json @@ -75,5 +75,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "barcode", - "X-KReport-Priority": "50" + "X-KReport-PluginInfo-Priority": "50" } diff --git a/src/plugins/chart/KReportChartPlugin.cpp b/src/plugins/chart/KReportChartPlugin.cpp --- a/src/plugins/chart/KReportChartPlugin.cpp +++ b/src/plugins/chart/KReportChartPlugin.cpp @@ -37,7 +37,6 @@ info->setClassName("chart"); info->setIcon(koIcon("office-chart-area")); info->setName(tr("Chart")); - info->setPriority(10); setInfo(info); } diff --git a/src/plugins/chart/kreport_chartplugin.json b/src/plugins/chart/kreport_chartplugin.json --- a/src/plugins/chart/kreport_chartplugin.json +++ b/src/plugins/chart/kreport_chartplugin.json @@ -76,5 +76,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "chart", - "X-KReport-Priority": "50" + "X-KReport-PluginInfo-Priority": "50" } diff --git a/src/plugins/maps/kreport_mapsplugin.json b/src/plugins/maps/kreport_mapsplugin.json --- a/src/plugins/maps/kreport_mapsplugin.json +++ b/src/plugins/maps/kreport_mapsplugin.json @@ -76,5 +76,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "maps", - "X-KReport-Priority": "50" + "X-KReport-PluginInfo-Priority": "50" } diff --git a/src/plugins/web/KReportWebPlugin.cpp b/src/plugins/web/KReportWebPlugin.cpp --- a/src/plugins/web/KReportWebPlugin.cpp +++ b/src/plugins/web/KReportWebPlugin.cpp @@ -28,15 +28,6 @@ : KReportPluginInterface(parent) { Q_UNUSED(args) -#if 0 - KReportPluginMetaData *info = new KReportPluginInfo(); - info->setClassName("web"); - info->setName(tr("Web browser")); - info->setIcon(koIcon("report_web_element")); - info->setPriority(40); - - setInfo(info); -#endif } KReportWebPlugin::~KReportWebPlugin() diff --git a/src/plugins/web/kreport_webplugin.json b/src/plugins/web/kreport_webplugin.json --- a/src/plugins/web/kreport_webplugin.json +++ b/src/plugins/web/kreport_webplugin.json @@ -76,5 +76,5 @@ "Website": "http://kexi-project.org" }, "X-KDE-PluginInfo-LegacyName": "web", - "X-KReport-Priority": "50" + "X-KReport-PluginInfo-Priority": "50" }