From de43125c45b7be6d58a96fbcc6c6b3dccc455b8b Mon Sep 17 00:00:00 2001 From: "bstrong@softtechok.com" <barry@softtechok.com> Date: Tue, 15 Oct 2019 07:37:49 -0500 Subject: [PATCH] Compatibility Changes Changes imports to improve Compatibility, --- plasmoid/contents/config/config.qml | 2 +- plasmoid/contents/ui/BarGraph.qml | 2 +- plasmoid/contents/ui/CircleGraph.qml | 2 +- plasmoid/contents/ui/Cpu.qml | 5 ++--- plasmoid/contents/ui/DiskIO.qml | 5 ++--- plasmoid/contents/ui/DiskSpace.qml | 5 ++--- plasmoid/contents/ui/DualBarGraph.qml | 2 +- plasmoid/contents/ui/DualCircleGraph.qml | 2 +- plasmoid/contents/ui/DualPlotterGraph.qml | 2 +- plasmoid/contents/ui/Memory.qml | 6 ++---- plasmoid/contents/ui/Network.qml | 5 ++--- plasmoid/contents/ui/PlotterGraph.qml | 2 +- plasmoid/contents/ui/Swap.qml | 6 ++---- plasmoid/contents/ui/configColors.qml | 4 ++-- plasmoid/contents/ui/configDiskIO.qml | 6 +++--- plasmoid/contents/ui/configDiskSpace.qml | 6 +++--- plasmoid/contents/ui/configLayout.qml | 2 +- plasmoid/contents/ui/configNetwork.qml | 6 +++--- plasmoid/contents/ui/main.qml | 4 ++-- 19 files changed, 33 insertions(+), 41 deletions(-) diff --git a/plasmoid/contents/config/config.qml b/plasmoid/contents/config/config.qml index c58883d..73bdd91 100755 --- a/plasmoid/contents/config/config.qml +++ b/plasmoid/contents/config/config.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.7 import org.kde.plasma.configuration 2.0 ConfigModel { diff --git a/plasmoid/contents/ui/BarGraph.qml b/plasmoid/contents/ui/BarGraph.qml index 364e0fb..d2ddc16 100755 --- a/plasmoid/contents/ui/BarGraph.qml +++ b/plasmoid/contents/ui/BarGraph.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.1 Canvas { property var config: [] diff --git a/plasmoid/contents/ui/CircleGraph.qml b/plasmoid/contents/ui/CircleGraph.qml index d349cac..529fc4f 100755 --- a/plasmoid/contents/ui/CircleGraph.qml +++ b/plasmoid/contents/ui/CircleGraph.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.1 Canvas { property var config: [] diff --git a/plasmoid/contents/ui/Cpu.qml b/plasmoid/contents/ui/Cpu.qml index 6209c1d..6cfb084 100755 --- a/plasmoid/contents/ui/Cpu.qml +++ b/plasmoid/contents/ui/Cpu.qml @@ -17,9 +17,8 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.1 +import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 2.0 as PlasmaComponents diff --git a/plasmoid/contents/ui/DiskIO.qml b/plasmoid/contents/ui/DiskIO.qml index 4a7b9e3..efcaf5f 100755 --- a/plasmoid/contents/ui/DiskIO.qml +++ b/plasmoid/contents/ui/DiskIO.qml @@ -17,9 +17,8 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.1 +import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 2.0 as PlasmaComponents diff --git a/plasmoid/contents/ui/DiskSpace.qml b/plasmoid/contents/ui/DiskSpace.qml index 3dad369..bb23c8f 100755 --- a/plasmoid/contents/ui/DiskSpace.qml +++ b/plasmoid/contents/ui/DiskSpace.qml @@ -17,9 +17,8 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.1 +import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 2.0 as PlasmaComponents diff --git a/plasmoid/contents/ui/DualBarGraph.qml b/plasmoid/contents/ui/DualBarGraph.qml index 59d2b0e..ae2ff04 100755 --- a/plasmoid/contents/ui/DualBarGraph.qml +++ b/plasmoid/contents/ui/DualBarGraph.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.1 Canvas { property var config: [] diff --git a/plasmoid/contents/ui/DualCircleGraph.qml b/plasmoid/contents/ui/DualCircleGraph.qml index e7c0542..5a47360 100755 --- a/plasmoid/contents/ui/DualCircleGraph.qml +++ b/plasmoid/contents/ui/DualCircleGraph.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.1 Canvas { property var config: [] diff --git a/plasmoid/contents/ui/DualPlotterGraph.qml b/plasmoid/contents/ui/DualPlotterGraph.qml index 98fd4da..18cdb66 100644 --- a/plasmoid/contents/ui/DualPlotterGraph.qml +++ b/plasmoid/contents/ui/DualPlotterGraph.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.1 Canvas { diff --git a/plasmoid/contents/ui/Memory.qml b/plasmoid/contents/ui/Memory.qml index c90f289..45d11e4 100755 --- a/plasmoid/contents/ui/Memory.qml +++ b/plasmoid/contents/ui/Memory.qml @@ -17,13 +17,11 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.1 +import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 2.0 as PlasmaComponents -import QtQuick.Controls 1.3 Rectangle { id: rectangle diff --git a/plasmoid/contents/ui/Network.qml b/plasmoid/contents/ui/Network.qml index a06f53d..6a3138f 100755 --- a/plasmoid/contents/ui/Network.qml +++ b/plasmoid/contents/ui/Network.qml @@ -17,9 +17,8 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.1 +import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 2.0 as PlasmaComponents diff --git a/plasmoid/contents/ui/PlotterGraph.qml b/plasmoid/contents/ui/PlotterGraph.qml index 6bbeb37..f28304b 100644 --- a/plasmoid/contents/ui/PlotterGraph.qml +++ b/plasmoid/contents/ui/PlotterGraph.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.1 Canvas { id: plotCanvas diff --git a/plasmoid/contents/ui/Swap.qml b/plasmoid/contents/ui/Swap.qml index 25dbf2b..039a253 100755 --- a/plasmoid/contents/ui/Swap.qml +++ b/plasmoid/contents/ui/Swap.qml @@ -17,13 +17,11 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import QtQuick 2.1 +import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 2.0 as PlasmaComponents -import QtQuick.Controls 1.3 Rectangle { id: rectangle diff --git a/plasmoid/contents/ui/configColors.qml b/plasmoid/contents/ui/configColors.qml index b7f8c6c..a2d14c8 100755 --- a/plasmoid/contents/ui/configColors.qml +++ b/plasmoid/contents/ui/configColors.qml @@ -17,8 +17,8 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Controls 1.2 +import QtQuick 2.1 +import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 import org.kde.kquickcontrols 2.0 as KQuickControls diff --git a/plasmoid/contents/ui/configDiskIO.qml b/plasmoid/contents/ui/configDiskIO.qml index 7a0a26e..c6cdcf2 100644 --- a/plasmoid/contents/ui/configDiskIO.qml +++ b/plasmoid/contents/ui/configDiskIO.qml @@ -17,10 +17,10 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Controls 2.3 +import QtQuick 2.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.3 -import org.kde.plasma.core 2.1 as PlasmaCore +import org.kde.plasma.core 2.0 as PlasmaCore Item { diff --git a/plasmoid/contents/ui/configDiskSpace.qml b/plasmoid/contents/ui/configDiskSpace.qml index 9db7b65..79d48f0 100644 --- a/plasmoid/contents/ui/configDiskSpace.qml +++ b/plasmoid/contents/ui/configDiskSpace.qml @@ -17,10 +17,10 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Controls 2.3 +import QtQuick 2.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.3 -import org.kde.plasma.core 2.1 as PlasmaCore +import org.kde.plasma.core 2.0 as PlasmaCore Item { diff --git a/plasmoid/contents/ui/configLayout.qml b/plasmoid/contents/ui/configLayout.qml index faff712..a72406f 100755 --- a/plasmoid/contents/ui/configLayout.qml +++ b/plasmoid/contents/ui/configLayout.qml @@ -17,7 +17,7 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.2 import QtQuick.Layouts 1.3 diff --git a/plasmoid/contents/ui/configNetwork.qml b/plasmoid/contents/ui/configNetwork.qml index 0cd84d3..7b842f8 100644 --- a/plasmoid/contents/ui/configNetwork.qml +++ b/plasmoid/contents/ui/configNetwork.qml @@ -17,10 +17,10 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Controls 2.3 +import QtQuick 2.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.3 -import org.kde.plasma.core 2.1 as PlasmaCore +import org.kde.plasma.core 2.0 as PlasmaCore Item { diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml index 0694568..be01724 100755 --- a/plasmoid/contents/ui/main.qml +++ b/plasmoid/contents/ui/main.qml @@ -17,8 +17,8 @@ * along with System Monitor Plasmoid. If not, see <https://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.1 +import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents -- GitLab