From 052a81f755021640dd8512a0ab4562fbaaff42d4 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 10 Nov 2019 12:06:10 +0200 Subject: [PATCH] Fix minor issues found by EBN and typos --- autotests/dialognativetest.h | 4 ++-- autotests/dialogqmltest.h | 4 ++-- autotests/dialogstatetest.h | 4 ++-- autotests/pluginloadertest.h | 4 ++-- autotests/utils.h | 4 ++++ examples/applets/conditionalloader/contents/ui/main.qml | 2 +- examples/applets/config/contents/ui/main.qml | 2 +- .../applets/testcomponents/contents/ui/testcomponents.qml | 2 +- examples/applets/testshaders/contents/ui/ColorShower.qml | 2 +- .../applets/testshaders/contents/ui/ShaderExample.qml | 2 +- examples/applets/testshaders/contents/ui/Shadows.qml | 2 +- .../applets/testshaders/contents/ui/testshaderapplet.qml | 2 +- examples/applets/testtheme/contents/ui/testtheme.qml | 2 +- .../containments/testcontainment/contents/ui/main.qml | 2 +- src/declarativeimports/core/datamodel.h | 2 +- .../plasmacomponents/fullscreenwindow.h | 2 +- src/declarativeimports/plasmastyle/TextFieldStyle.qml | 2 +- src/plasma/applet.h | 4 ++-- src/plasma/corona.h | 2 +- src/plasma/plasma.h | 8 ++++---- src/plasma/private/dataenginemanager_p.h | 4 ++-- src/plasma/private/effectwatcher_p.h | 4 ++-- src/plasma/private/storage_p.h | 6 +++--- src/plasma/svg.h | 2 +- src/plasmaquick/configmodel.h | 2 +- src/scriptengines/qml/plasmoid/appletinterface.cpp | 2 +- tests/colorcontext.qml | 2 +- tests/components/combobox.qml | 2 +- tests/components/textarea.qml | 2 +- tests/dialog_positioning2.qml | 2 +- tests/dialog_positioning_parentrotated.qml | 2 +- tests/dpi/dpitest.h | 4 ++-- tests/testengine/testengine.h | 6 +++--- 33 files changed, 51 insertions(+), 47 deletions(-) diff --git a/autotests/dialognativetest.h b/autotests/dialognativetest.h index 09da22e17..64ac61a2c 100644 --- a/autotests/dialognativetest.h +++ b/autotests/dialognativetest.h @@ -16,8 +16,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#ifndef DIALOGTEST_H -#define DIALOGTEST_H +#ifndef DIALOGNATIVETEST_H +#define DIALOGNATIVETEST_H #include #include diff --git a/autotests/dialogqmltest.h b/autotests/dialogqmltest.h index 7f1b1832e..5f00e8edd 100644 --- a/autotests/dialogqmltest.h +++ b/autotests/dialogqmltest.h @@ -16,8 +16,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#ifndef DIALOLOADGTEST_H -#define DIALOLOADGTEST_H +#ifndef DIALOGQMLTEST_H +#define DIALOGQMLTEST_H #include diff --git a/autotests/dialogstatetest.h b/autotests/dialogstatetest.h index 37d31b632..0d96eabec 100644 --- a/autotests/dialogstatetest.h +++ b/autotests/dialogstatetest.h @@ -16,8 +16,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#ifndef DIALOGTEST_H -#define DIALOGTEST_H +#ifndef DIALOGSTATETEST_H +#define DIALOGSTATETEST_H #include diff --git a/autotests/pluginloadertest.h b/autotests/pluginloadertest.h index 709823540..e4733c33f 100644 --- a/autotests/pluginloadertest.h +++ b/autotests/pluginloadertest.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#ifndef PLUGINTEST_H -#define PLUGINTEST_H +#ifndef PLUGINLOADERTEST_H +#define PLUGINLOADERTEST_H #include #include diff --git a/autotests/utils.h b/autotests/utils.h index 47aaf6e1b..edf26baf6 100644 --- a/autotests/utils.h +++ b/autotests/utils.h @@ -16,6 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef UTILS_H +#define UTILS_H #include #include @@ -65,3 +67,5 @@ static void installPlasmaTheme(const QString &theme = QStringLiteral("breeze")) } //TestUtils } //Plasma + +#endif diff --git a/examples/applets/conditionalloader/contents/ui/main.qml b/examples/applets/conditionalloader/contents/ui/main.qml index 985868ff4..f26f4433f 100644 --- a/examples/applets/conditionalloader/contents/ui/main.qml +++ b/examples/applets/conditionalloader/contents/ui/main.qml @@ -92,4 +92,4 @@ Rectangle { Component.onCompleted: { print("Test Applet loaded") } -} \ No newline at end of file +} diff --git a/examples/applets/config/contents/ui/main.qml b/examples/applets/config/contents/ui/main.qml index 2c0cb62ce..c031d1eb9 100644 --- a/examples/applets/config/contents/ui/main.qml +++ b/examples/applets/config/contents/ui/main.qml @@ -73,4 +73,4 @@ Item { } } -} \ No newline at end of file +} diff --git a/examples/applets/testcomponents/contents/ui/testcomponents.qml b/examples/applets/testcomponents/contents/ui/testcomponents.qml index 025b372fd..7c20a75d4 100644 --- a/examples/applets/testcomponents/contents/ui/testcomponents.qml +++ b/examples/applets/testcomponents/contents/ui/testcomponents.qml @@ -100,4 +100,4 @@ Item { //dataSource.engine = "org.kde.foobar" // tabGroup.currentTab = mousePage; } -} \ No newline at end of file +} diff --git a/examples/applets/testshaders/contents/ui/ColorShower.qml b/examples/applets/testshaders/contents/ui/ColorShower.qml index 285344c95..fa3c292de 100644 --- a/examples/applets/testshaders/contents/ui/ColorShower.qml +++ b/examples/applets/testshaders/contents/ui/ColorShower.qml @@ -118,4 +118,4 @@ ShaderExample { } } } -} \ No newline at end of file +} diff --git a/examples/applets/testshaders/contents/ui/ShaderExample.qml b/examples/applets/testshaders/contents/ui/ShaderExample.qml index 4309b14c6..5ecbe52a8 100644 --- a/examples/applets/testshaders/contents/ui/ShaderExample.qml +++ b/examples/applets/testshaders/contents/ui/ShaderExample.qml @@ -56,4 +56,4 @@ PlasmaComponents.Page { } text: pageDescription } -} \ No newline at end of file +} diff --git a/examples/applets/testshaders/contents/ui/Shadows.qml b/examples/applets/testshaders/contents/ui/Shadows.qml index 05929ad60..209c1001d 100644 --- a/examples/applets/testshaders/contents/ui/Shadows.qml +++ b/examples/applets/testshaders/contents/ui/Shadows.qml @@ -238,4 +238,4 @@ ShaderExample { } } -} \ No newline at end of file +} diff --git a/examples/applets/testshaders/contents/ui/testshaderapplet.qml b/examples/applets/testshaders/contents/ui/testshaderapplet.qml index b8ca64da3..5fdea4960 100644 --- a/examples/applets/testshaders/contents/ui/testshaderapplet.qml +++ b/examples/applets/testshaders/contents/ui/testshaderapplet.qml @@ -89,4 +89,4 @@ Item { Component.onCompleted: { print("Shader Test Applet loaded"); } -} \ No newline at end of file +} diff --git a/examples/applets/testtheme/contents/ui/testtheme.qml b/examples/applets/testtheme/contents/ui/testtheme.qml index a8bb77cb2..865c2eba8 100644 --- a/examples/applets/testtheme/contents/ui/testtheme.qml +++ b/examples/applets/testtheme/contents/ui/testtheme.qml @@ -113,4 +113,4 @@ Item { Component.onCompleted: { print("Components Test Applet loaded"); } -} \ No newline at end of file +} diff --git a/examples/containments/testcontainment/contents/ui/main.qml b/examples/containments/testcontainment/contents/ui/main.qml index 6e45c6fd5..e46ace10d 100644 --- a/examples/containments/testcontainment/contents/ui/main.qml +++ b/examples/containments/testcontainment/contents/ui/main.qml @@ -50,4 +50,4 @@ Item { print("Test Containment loaded") print(plasmoid) } -} \ No newline at end of file +} diff --git a/src/declarativeimports/core/datamodel.h b/src/declarativeimports/core/datamodel.h index 598321215..877f8d3a7 100644 --- a/src/declarativeimports/core/datamodel.h +++ b/src/declarativeimports/core/datamodel.h @@ -83,7 +83,7 @@ class SortFilterModel : public QSortFilterProxyModel Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder) /** - * Specify which column shoud be used for sorting + * Specify which column should be used for sorting */ Q_PROPERTY(int sortColumn READ sortColumn WRITE setSortColumn NOTIFY sortColumnChanged) diff --git a/src/declarativeimports/plasmacomponents/fullscreenwindow.h b/src/declarativeimports/plasmacomponents/fullscreenwindow.h index a9a7dbd4b..7bc158b6c 100644 --- a/src/declarativeimports/plasmacomponents/fullscreenwindow.h +++ b/src/declarativeimports/plasmacomponents/fullscreenwindow.h @@ -44,7 +44,7 @@ class FullScreenWindow : public QDeclarativeItem Q_PROPERTY(DialogStatus::Status status READ status NOTIFY statusChanged) public: - explcit FullScreenWindow(QDeclarativeItem *parent = nullptr); + explicit FullScreenWindow(QDeclarativeItem *parent = nullptr); ~FullScreenWindow() override; QGraphicsObject *mainItem() const; diff --git a/src/declarativeimports/plasmastyle/TextFieldStyle.qml b/src/declarativeimports/plasmastyle/TextFieldStyle.qml index d2d602d91..d3e409fd8 100644 --- a/src/declarativeimports/plasmastyle/TextFieldStyle.qml +++ b/src/declarativeimports/plasmastyle/TextFieldStyle.qml @@ -52,7 +52,7 @@ QtQuickControlStyle.TextFieldStyle { background: Item { //QQC button heights are max(backgroundHeight, label + margins). - //QQC lineedits are only from the background (and if background is not set, just an arbirtrary value of 25) + //QQC lineedits are only from the background (and if background is not set, just an arbitrary value of 25) //Why? I don't know //In order to get the same height in both buttons and lineedits we need to apply the same rule here diff --git a/src/plasma/applet.h b/src/plasma/applet.h index b34ba0812..0d4ab0f86 100644 --- a/src/plasma/applet.h +++ b/src/plasma/applet.h @@ -393,7 +393,7 @@ public: void setGlobalShortcut(const QKeySequence &shortcut); /** - * @return the global shortcut associated with this wiget, or + * @return the global shortcut associated with this widget, or * an empty shortcut if no global shortcut is associated. */ QKeySequence globalShortcut() const; @@ -510,7 +510,7 @@ Q_SIGNALS: /** * Emitted when activation is requested due to, for example, a global - * keyboard shortcut. By default the wiget is given focus. + * keyboard shortcut. By default the widget is given focus. */ void activated(); diff --git a/src/plasma/corona.h b/src/plasma/corona.h index a6e0df541..a762dd48b 100644 --- a/src/plasma/corona.h +++ b/src/plasma/corona.h @@ -55,7 +55,7 @@ public: * Accessor for the associated Package object if any. * A Corona package defines how Containments are laid out in a View, * ToolBoxes, default layout, error messages - * and in genelal all the furniture specific of a particular + * and in general all the furniture specific of a particular * device form factor. * * @return the Package object, or an invalid one if none diff --git a/src/plasma/plasma.h b/src/plasma/plasma.h index 0c4b4a77d..454f95f02 100644 --- a/src/plasma/plasma.h +++ b/src/plasma/plasma.h @@ -169,19 +169,19 @@ public: enum PopupPlacement { FloatingPopup = 0, /**< Free floating, non attached popup */ TopPosedLeftAlignedPopup, /**< Popup positioned on the top, aligned - to the left of the wigdet */ + to the left of the widget */ TopPosedRightAlignedPopup, /**< Popup positioned on the top, aligned to the right of the widget */ LeftPosedTopAlignedPopup, /**< Popup positioned on the left, aligned - to the top of the wigdet */ + to the top of the widget */ LeftPosedBottomAlignedPopup, /**< Popup positioned on the left, aligned to the bottom of the widget */ BottomPosedLeftAlignedPopup, /**< Popup positioned on the bottom, aligned - to the left of the wigdet */ + to the left of the widget */ BottomPosedRightAlignedPopup, /**< Popup positioned on the bottom, aligned to the right of the widget */ RightPosedTopAlignedPopup, /**< Popup positioned on the right, aligned - to the top of the wigdet */ + to the top of the widget */ RightPosedBottomAlignedPopup /**< Popup positioned on the right, aligned to the bottom of the widget */ }; diff --git a/src/plasma/private/dataenginemanager_p.h b/src/plasma/private/dataenginemanager_p.h index ffe6dee10..cb272bdef 100644 --- a/src/plasma/private/dataenginemanager_p.h +++ b/src/plasma/private/dataenginemanager_p.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_DATAENGINEMANAGER_H -#define PLASMA_DATAENGINEMANAGER_H +#ifndef PLASMA_DATAENGINEMANAGER_P_H +#define PLASMA_DATAENGINEMANAGER_P_H #include diff --git a/src/plasma/private/effectwatcher_p.h b/src/plasma/private/effectwatcher_p.h index 47b464a45..e5b851bf5 100644 --- a/src/plasma/private/effectwatcher_p.h +++ b/src/plasma/private/effectwatcher_p.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef BLURWATCHER_H -#define BLURWATCHER_H +#ifndef EFFECTWATCHER_P_H +#define EFFECTWATCHER_P_H #include diff --git a/src/plasma/private/storage_p.h b/src/plasma/private/storage_p.h index d89298881..da1efa177 100644 --- a/src/plasma/private/storage_p.h +++ b/src/plasma/private/storage_p.h @@ -20,8 +20,8 @@ // 02110-1301 USA // ///////////////////////////////////////////////////////////////////////// -#ifndef PLASMA_STORAGE_H -#define PLASMA_STORAGE_H +#ifndef PLASMA_STORAGE_P_H +#define PLASMA_STORAGE_P_H #include @@ -72,4 +72,4 @@ private: QString m_clientName; }; -#endif //PLASMA_STORAGE_H +#endif //PLASMA_STORAGE_P_H diff --git a/src/plasma/svg.h b/src/plasma/svg.h index 6504e598e..fa1441e1e 100644 --- a/src/plasma/svg.h +++ b/src/plasma/svg.h @@ -443,7 +443,7 @@ public: * the TextColor will become HighlightedText color and BackgroundColor * will become HighlightColor, making the svg graphics (for instance an icon) * will look correct together selected text - * Supported statuss as of 5.23 are Normal and Selected + * Supported statuses as of 5.23 are Normal and Selected * @since 5.23 */ void setStatus(Svg::Status status); diff --git a/src/plasmaquick/configmodel.h b/src/plasmaquick/configmodel.h index 72bca4303..bf6c0fbc2 100644 --- a/src/plasmaquick/configmodel.h +++ b/src/plasmaquick/configmodel.h @@ -85,7 +85,7 @@ public: Q_INVOKABLE void appendCategory(const QString &iconName, const QString &name, const QString &path, const QString &pluginName, bool visible); - // QML Engine isn't particularily smart resolving namespaces, hence fully qualified signature + // QML Engine isn't particularly smart resolving namespaces, hence fully qualified signature Q_INVOKABLE void appendCategory(PlasmaQuick::ConfigCategory *category); Q_INVOKABLE void removeCategory(PlasmaQuick::ConfigCategory *category); diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp index afb6f69bf..be9fb53c6 100644 --- a/src/scriptengines/qml/plasmoid/appletinterface.cpp +++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp @@ -175,7 +175,7 @@ void AppletInterface::init() connect(applet(), &Plasma::Applet::activated, this, [ = ]() { - // in case the applet doesn't want to get shrinked on reactivation, + // in case the applet doesn't want to get shrunk on reactivation, // we always expand it again (only in order to conform with legacy behaviour) bool activate = !( isExpanded() && isActivationTogglesExpanded() ); diff --git a/tests/colorcontext.qml b/tests/colorcontext.qml index 1a8ead73c..146b597a9 100644 --- a/tests/colorcontext.qml +++ b/tests/colorcontext.qml @@ -84,4 +84,4 @@ ColumnLayout { text: "switch" onClicked: widgetsParent.parent == rect2 ? widgetsParent.parent = rect1 : widgetsParent.parent = rect2 } -} \ No newline at end of file +} diff --git a/tests/components/combobox.qml b/tests/components/combobox.qml index 76510f33d..dcc7336c0 100644 --- a/tests/components/combobox.qml +++ b/tests/components/combobox.qml @@ -38,4 +38,4 @@ Rectangle { } } } -} \ No newline at end of file +} diff --git a/tests/components/textarea.qml b/tests/components/textarea.qml index 72214346b..b16bc7931 100644 --- a/tests/components/textarea.qml +++ b/tests/components/textarea.qml @@ -37,4 +37,4 @@ Rectangle { height: 100 } } -} \ No newline at end of file +} diff --git a/tests/dialog_positioning2.qml b/tests/dialog_positioning2.qml index 406253f03..387d40b6c 100644 --- a/tests/dialog_positioning2.qml +++ b/tests/dialog_positioning2.qml @@ -29,7 +29,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras ColumnLayout { Controls.Label { - text: "Press the buttom and make sure the popup is on the correct place" + text: "Press the button and make sure the popup is on the correct place" wrapMode: Text.WordWrap } PlasmaComponents.Button { diff --git a/tests/dialog_positioning_parentrotated.qml b/tests/dialog_positioning_parentrotated.qml index 34e95c72d..cca460031 100644 --- a/tests/dialog_positioning_parentrotated.qml +++ b/tests/dialog_positioning_parentrotated.qml @@ -32,7 +32,7 @@ ColumnLayout height: units.gridUnit * 20 Controls.Label { id: label - text: "Press the buttom and make sure the popup is on the correct place" + text: "Press the button and make sure the popup is on the correct place" wrapMode: Text.WordWrap } PlasmaComponents.Button { diff --git a/tests/dpi/dpitest.h b/tests/dpi/dpitest.h index 65cd38e41..4e5561e20 100644 --- a/tests/dpi/dpitest.h +++ b/tests/dpi/dpitest.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#ifndef PLUGINTEST_H -#define PLUGINTEST_H +#ifndef DPITEST_H +#define DPITEST_H #include #include diff --git a/tests/testengine/testengine.h b/tests/testengine/testengine.h index 1c5b55751..95f1cb663 100644 --- a/tests/testengine/testengine.h +++ b/tests/testengine/testengine.h @@ -21,8 +21,8 @@ * A data engine meant to test the Plasma data engine explorer. */ -#ifndef __TESTDATAENGINE_H__ -#define __TESTDATAENGINE_H__ +#ifndef __TESTENGINE_H__ +#define __TESTENGINE_H__ #include "plasma/dataengine.h" @@ -44,4 +44,4 @@ protected: bool sourceRequestEvent(const QString &source) override; }; -#endif // __TESTDATAENGINE_H__ +#endif // __TESTENGINE_H__