[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kreport] src: Change X-KReport-Priority field in .desktop files to X-KReport-PluginInfo-Priority
From:       Adam Pigg <null () kde ! org>
Date:       2017-08-19 15:26:05
Message-ID: E1dj5dV-0006h0-7a () code ! kde ! org
[Download RAW message or body]

Git commit 19c616db56fe62b6b0607c820d3633e81381f23f by Adam Pigg.
Committed on 19/08/2017 at 15:25.
Pushed by piggz into branch 'master'.

Change X-KReport-Priority field in .desktop files to X-KReport-PluginInfo-Priority

Test Plan: Build and run krepoertexample

Reviewers: staniek

Reviewed By: staniek

Tags: #kreport

Maniphest Tasks: T367

Differential Revision: https://phabricator.kde.org/D6911

M  +1    -1    src/common/KReportPluginMetaData.cpp
M  +1    -1    src/items/check/check.json
M  +1    -1    src/items/field/field.json
M  +1    -1    src/items/image/image.json
M  +1    -1    src/items/label/label.json
M  +1    -1    src/items/text/text.json
M  +1    -1    src/plugins/barcode/kreport_barcodeplugin.json
M  +0    -1    src/plugins/chart/KReportChartPlugin.cpp
M  +1    -1    src/plugins/chart/kreport_chartplugin.json
M  +1    -1    src/plugins/maps/kreport_mapsplugin.json
M  +0    -9    src/plugins/web/KReportWebPlugin.cpp
M  +1    -1    src/plugins/web/kreport_webplugin.json

https://commits.kde.org/kreport/19c616db56fe62b6b0607c820d3633e81381f23f

diff --git a/src/common/KReportPluginMetaData.cpp \
b/src/common/KReportPluginMetaData.cpp index e6b3bcf..d02777a 100644
--- a/src/common/KReportPluginMetaData.cpp
+++ b/src/common/KReportPluginMetaData.cpp
@@ -28,7 +28,7 @@ class KReportPluginMetaData::Private
 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
index d689c1c..ee94ab4 100644
--- 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
index 39d8b3f..3842930 100644
--- 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
index ed0d54a..8fd311a 100644
--- 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
index 61ecf85..c36bbc0 100644
--- 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
index a5fc406..fcac2fe 100644
--- 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 index 7c4f956..98309ae 100644
--- 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 index 075b837..793d3e7 100644
--- a/src/plugins/chart/KReportChartPlugin.cpp
+++ b/src/plugins/chart/KReportChartPlugin.cpp
@@ -37,7 +37,6 @@ KReportChartPlugin::KReportChartPlugin(QObject *parent, const \
QVariantList &args  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 index 03bbcba..3bb3cac 100644
--- 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 index 45eaca6..4db535a 100644
--- 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 index 497c9a8..17ad21d 100644
--- a/src/plugins/web/KReportWebPlugin.cpp
+++ b/src/plugins/web/KReportWebPlugin.cpp
@@ -28,15 +28,6 @@ KReportWebPlugin::KReportWebPlugin(QObject *parent, const \
QVariantList &args)  : 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 index a8a9609..b4ce97e 100644
--- 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"
 }


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic