Fix minor issues found by EBN and typos

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
+#ifndef DIALOGNATIVETEST_H
-#define DIALOGTEST_H
+#define DIALOGNATIVETEST_H
 
 #include <QtTest>
 #include <QQuickView>

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
+#ifndef DIALOGQMLTEST_H
-#define DIALOLOADGTEST_H
+#define DIALOGQMLTEST_H
 
 #include <QtTest>
 

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
+#ifndef DIALOGSTATETEST_H
-#define DIALOGTEST_H
+#define DIALOGSTATETEST_H
 
 #include <QtTest>
 

autotests/pluginloadertest.h

@@ -17,8 +17,8 @@
 *   Boston, MA 02110-1301, USA.                                               *
 *******************************************************************************/
 
-#ifndef PLUGINTEST_H
+#ifndef PLUGINLOADERTEST_H
-#define PLUGINTEST_H
+#define PLUGINLOADERTEST_H
 
 #include <QCoreApplication>
 #include <plasma/dataengine.h>

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 <QString>
 #include <QDir>
@@ -65,3 +67,5 @@ static void installPlasmaTheme(const QString &theme = QStringLiteral("breeze"))
 
 } //TestUtils
 } //Plasma
+
+#endif

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)
 

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;

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

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();
 

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

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 */
     };

src/plasma/private/dataenginemanager_p.h

@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMA_DATAENGINEMANAGER_H
+#ifndef PLASMA_DATAENGINEMANAGER_P_H
-#define PLASMA_DATAENGINEMANAGER_H
+#define PLASMA_DATAENGINEMANAGER_P_H
 
 #include <plasma/dataengine.h>
 

src/plasma/private/effectwatcher_p.h

@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef BLURWATCHER_H
+#ifndef EFFECTWATCHER_P_H
-#define BLURWATCHER_H
+#define EFFECTWATCHER_P_H
 
 #include <QObject>
 

src/plasma/private/storage_p.h

@@ -20,8 +20,8 @@
 // 02110-1301  USA                                                     //
 /////////////////////////////////////////////////////////////////////////
 
-#ifndef PLASMA_STORAGE_H
+#ifndef PLASMA_STORAGE_P_H
-#define PLASMA_STORAGE_H
+#define PLASMA_STORAGE_P_H
 
 #include <QSqlDatabase>
 
@@ -72,4 +72,4 @@ private:
     QString m_clientName;
 };
 
-#endif //PLASMA_STORAGE_H
+#endif //PLASMA_STORAGE_P_H

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);

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);

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() );
 

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 {

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 {

tests/dpi/dpitest.h

@@ -17,8 +17,8 @@
 *   Boston, MA 02110-1301, USA.                                               *
 *******************************************************************************/
 
-#ifndef PLUGINTEST_H
+#ifndef DPITEST_H
-#define PLUGINTEST_H
+#define DPITEST_H
 
 #include <QCoreApplication>
 #include <QGuiApplication>

tests/testengine/testengine.h

@@ -21,8 +21,8 @@
  *  A data engine meant to test the Plasma data engine explorer.
  */
 
-#ifndef __TESTDATAENGINE_H__
+#ifndef __TESTENGINE_H__
-#define __TESTDATAENGINE_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__