diff --git a/autotests/modeltest.h b/autotests/modeltest.h index c89e3bcce..5c11d5020 100644 --- a/autotests/modeltest.h +++ b/autotests/modeltest.h @@ -42,9 +42,9 @@ #ifndef MODELTEST_H #define MODELTEST_H -#include -#include -#include +#include +#include +#include class ModelTest : public QObject { diff --git a/src/declarativeimports/calendar/daydata.h b/src/declarativeimports/calendar/daydata.h index 26616f0ba..58d62b34e 100644 --- a/src/declarativeimports/calendar/daydata.h +++ b/src/declarativeimports/calendar/daydata.h @@ -1,3 +1,20 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +*/ + #ifndef DAYDATA_H #define DAYDATA_H diff --git a/src/declarativeimports/core/colorscope.h b/src/declarativeimports/core/colorscope.h index bbb92bb3c..bad04dddf 100644 --- a/src/declarativeimports/core/colorscope.h +++ b/src/declarativeimports/core/colorscope.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/declarativeimports/core/framesvgitem.h b/src/declarativeimports/core/framesvgitem.h index 8bd64d11f..06206a2ad 100644 --- a/src/declarativeimports/core/framesvgitem.h +++ b/src/declarativeimports/core/framesvgitem.h @@ -166,7 +166,7 @@ class FrameSvgItem : public QQuickItem /** * Set a color group for the FrameSvgItem. * if the Svg uses stylesheets and has elements - * that are eithe TextColor or BackgroundColor class, + * that are either TextColor or BackgroundColor class, * make them use ButtonTextColor/ButtonBackgroundColor * or ViewTextColor/ViewBackgroundColor, ComplementaryTextColor etc. */ diff --git a/src/declarativeimports/core/tooltip.h b/src/declarativeimports/core/tooltip.h index 576f77c14..1bd871f4c 100644 --- a/src/declarativeimports/core/tooltip.h +++ b/src/declarativeimports/core/tooltip.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include class QQuickItem; diff --git a/src/declarativeimports/core/tooltipdialog.h b/src/declarativeimports/core/tooltipdialog.h index 9ec91b728..bf4dcf0d4 100644 --- a/src/declarativeimports/core/tooltipdialog.h +++ b/src/declarativeimports/core/tooltipdialog.h @@ -24,7 +24,7 @@ #include #include -#include +#include class QQuickItem; class QGraphicsWidget; diff --git a/src/declarativeimports/plasmacomponents/fullscreenwindow.cpp b/src/declarativeimports/plasmacomponents/fullscreenwindow.cpp index 05da708b9..d6fece73f 100644 --- a/src/declarativeimports/plasmacomponents/fullscreenwindow.cpp +++ b/src/declarativeimports/plasmacomponents/fullscreenwindow.cpp @@ -185,7 +185,7 @@ void FullScreenWindow::setMainItem(QGraphicsObject *mainItem) mainItem->installEventFilter(this); } - //if this is called in Compenent.onCompleted we have to wait a loop the item is added to a scene + //if this is called in Component.onCompleted we have to wait a loop the item is added to a scene QTimer::singleShot(0, this, SLOT(syncViewToMainItem())); } } @@ -196,7 +196,7 @@ void FullScreenWindow::syncViewToMainItem() return; } - //not have a scene? go up in the hyerarchy until we find something with a scene + //not have a scene? go up in the hierarchy until we find something with a scene QGraphicsScene *scene = m_mainItem.data()->scene(); if (!scene) { QObject *parent = m_mainItem.data(); diff --git a/src/declarativeimports/plasmacomponents/qml/PageStack.qml b/src/declarativeimports/plasmacomponents/qml/PageStack.qml index 38a0b03d8..070b8bd07 100644 --- a/src/declarativeimports/plasmacomponents/qml/PageStack.qml +++ b/src/declarativeimports/plasmacomponents/qml/PageStack.qml @@ -225,7 +225,7 @@ Item { // The number of ongoing transitions. property int ongoingTransitionCount: 0 - //FIXME: there should be a way to access to theh without storing it in an ugly way + //FIXME: there should be a way to access to them without storing it in an ugly way property bool completed: false // Sets the page status. @@ -298,7 +298,7 @@ Item { } } - // Handles state change depening on transition animation status + // Handles state change depending on transition animation status function setState(newState) { if (transitionAnimationRunning) diff --git a/src/declarativeimports/plasmacomponents/qml/ToolBar.qml b/src/declarativeimports/plasmacomponents/qml/ToolBar.qml index 6794a263e..119cef4d7 100644 --- a/src/declarativeimports/plasmacomponents/qml/ToolBar.qml +++ b/src/declarativeimports/plasmacomponents/qml/ToolBar.qml @@ -171,7 +171,7 @@ Item{ fill: parent leftMargin: -margins.left rightMargin: -margins.right - //FIXME: difference between actial border and shadow + //FIXME: difference between actual border and shadow topMargin: toolBar.y <= 0 ? -margins.top : -margins.top/2 bottomMargin: toolBar.y >= toolBar.parent.height - toolBar.height ? -margins.bottom : -margins.bottom/2 } diff --git a/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml b/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml index daa770ac0..3ef0fdcef 100644 --- a/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml +++ b/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml @@ -100,7 +100,7 @@ Item { property variant parentPos imagePath: fallbackComponent.svgPath property bool under: root.visualParent ? internal.parentPos.y + root.visualParent.height + height < dismissArea.height : true - //bindings won't work inside anchers definition + //bindings won't work inside anchors definition onUnderChanged: { if (under) { tipSvg.anchors.top = undefined diff --git a/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml b/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml index c1dd54573..e9de3116a 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/PageRow.qml @@ -177,7 +177,7 @@ Item { // The number of ongoing transitions. property int ongoingTransitionCount: 0 - //FIXME: there should be a way to access to theh without storing it in an ugly way + //FIXME: there should be a way to access to them without storing it in an ugly way property bool completed: false // Duration of transition animation (in ms) @@ -354,7 +354,7 @@ Item { } } - // Handles state change depening on transition animation status + // Handles state change depending on transition animation status function setState(newState) { if (transitionAnimationRunning) diff --git a/src/declarativeimports/plasmastyle/TextFieldStyle.qml b/src/declarativeimports/plasmastyle/TextFieldStyle.qml index f14f25b3f..33814b3cc 100644 --- a/src/declarativeimports/plasmastyle/TextFieldStyle.qml +++ b/src/declarativeimports/plasmastyle/TextFieldStyle.qml @@ -1,5 +1,5 @@ /* -* Copyright (C) 2014 by Marco MArtin +* Copyright (C) 2014 by Marco Martin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -37,7 +37,7 @@ QtQuickControlStyle.TextFieldStyle { placeholderTextColor: Qt.rgba(theme.viewTextColor.r, theme.viewTextColor.g, theme.viewTextColor.b, 0.5) /* - * Since the password echo is a circle woithout vertical or horizontal lines, it won't be + * Since the password echo is a circle without vertical or horizontal lines, it won't be * more blurred with different rendring types. * Using Qt rendering, the dots will look more aligned and equally spaced. * Also if we are on mobile, make sure we use QtRendering @@ -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 arbirtary value of 25) + //QQC lineedits are only from the background (and if background is not set, just an arbirtrary 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.cpp b/src/plasma/applet.cpp index 3e6831bb7..eaec9a58a 100644 --- a/src/plasma/applet.cpp +++ b/src/plasma/applet.cpp @@ -527,7 +527,7 @@ void Applet::flushPendingConstraintsEvents() d->constraintsTimer.stop(); } - //qCDebug(LOG_PLASMA) << "fushing constraints: " << d->pendingConstraints << "!!!!!!!!!!!!!!!!!!!!!!!!!!!"; + //qCDebug(LOG_PLASMA) << "flushing constraints: " << d->pendingConstraints << "!!!!!!!!!!!!!!!!!!!!!!!!!!!"; Plasma::Types::Constraints c = d->pendingConstraints; d->pendingConstraints = Types::NoConstraint; @@ -578,7 +578,7 @@ void Applet::flushPendingConstraintsEvents() action->setEnabled(canConfig); } - //an immutable constraint will alwasy happen at startup + //an immutable constraint will always happen at startup //make sure don't emit a change signal for nothing if (d->oldImmutability != immutability()) { emit immutabilityChanged(immutability()); @@ -586,7 +586,7 @@ void Applet::flushPendingConstraintsEvents() d->oldImmutability = immutability(); } - // now take care of constraints in special subclass: Contaiment + // now take care of constraints in special subclass: Containment Containment *containment = qobject_cast(this); if (containment) { containment->d->containmentConstraintsEvent(c); diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp index 49b67418e..96acf4ba2 100644 --- a/src/plasma/containment.cpp +++ b/src/plasma/containment.cpp @@ -34,7 +34,6 @@ #include #include -#include #include #include #include diff --git a/src/plasma/containment.h b/src/plasma/containment.h index 258ef409e..5f581cbfe 100644 --- a/src/plasma/containment.h +++ b/src/plasma/containment.h @@ -42,7 +42,7 @@ class ContainmentPrivate; * Containment objects provide the means to group applets into functional sets. * They also provide the following: * - * creation of focussing event + * creation of focusing event * - drawing of the background image (which can be interactive) * - form factors (e.g. panel, desktop, full screen, etc) * - applet layout management diff --git a/src/plasma/containmentactions.cpp b/src/plasma/containmentactions.cpp index 8aaca3328..23dcbdc86 100644 --- a/src/plasma/containmentactions.cpp +++ b/src/plasma/containmentactions.cpp @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp index 3791d6bf9..3a18c9487 100644 --- a/src/plasma/corona.cpp +++ b/src/plasma/corona.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include diff --git a/src/plasma/corona.h b/src/plasma/corona.h index 2464d9733..d23a4022d 100644 --- a/src/plasma/corona.h +++ b/src/plasma/corona.h @@ -222,7 +222,7 @@ public: QList freeEdges(int screen) const; /** - * The actions assocated with this Corona + * The actions associated with this Corona */ KActionCollection *actions() const; @@ -391,10 +391,10 @@ protected: /** * Loads a containment with delayed initialization, primarily useful * for implementations of loadDefaultLayout. The caller is responsible - * for all initializating, saving and notification of a new containment. + * for all initialization, saving and notification of a new containment. * * @param name the plugin name for the containment, as given by - * KPluginInfo::pluginName(). If an empty string is passed in, the defalt + * KPluginInfo::pluginName(). If an empty string is passed in, the default * containment plugin will be used (usually DesktopContainment). If the * string literal "null" is passed in, then no plugin will be loaded and * a simple Containment object will be created instead. diff --git a/src/plasma/datacontainer.cpp b/src/plasma/datacontainer.cpp index 90f725f65..193ea7db3 100644 --- a/src/plasma/datacontainer.cpp +++ b/src/plasma/datacontainer.cpp @@ -175,7 +175,7 @@ void DataContainer::connectVisualization(QObject *visualization, uint pollingInt } } else { //qCDebug(LOG_PLASMA) << " connecting to a relay"; - // we only want to do an imediate update if this is not the first object to connect to us + // we only want to do an immediate update if this is not the first object to connect to us // if it is the first visualization, then the source will already have been populated // engine's sourceRequested method bool immediateUpdate = connected || d->relayObjects.count() > 1; diff --git a/src/plasma/datacontainer.h b/src/plasma/datacontainer.h index 3d680584f..8a6af40a5 100644 --- a/src/plasma/datacontainer.h +++ b/src/plasma/datacontainer.h @@ -20,9 +20,9 @@ #ifndef PLASMA_DATACONTAINER_H #define PLASMA_DATACONTAINER_H -#include -#include -#include +#include +#include +#include #include #include @@ -113,7 +113,7 @@ public: * that is intended to be a long list of items. * * The ownership of the model is transferred to the DataContainer, - * so the model will be deletd when a new one is set or when the + * so the model will be deleted when a new one is set or when the * DataContainer itself is deleted, so it will be deleted when there won't be any * visualization associated to this source. * diff --git a/src/plasma/dataengine.cpp b/src/plasma/dataengine.cpp index 02f45cc83..a51270158 100644 --- a/src/plasma/dataengine.cpp +++ b/src/plasma/dataengine.cpp @@ -41,7 +41,6 @@ #include "service.h" #include "scripting/dataenginescript.h" -#include "private/datacontainer_p.h" #include "private/service_p.h" #include "private/storage_p.h" #include "config-plasma.h" diff --git a/src/plasma/dataengine.h b/src/plasma/dataengine.h index 497779ecb..cc1f42a4d 100644 --- a/src/plasma/dataengine.h +++ b/src/plasma/dataengine.h @@ -20,9 +20,9 @@ #ifndef PLASMA_DATAENGINE_H #define PLASMA_DATAENGINE_H -#include -#include -#include +#include +#include +#include #include #include @@ -321,7 +321,7 @@ protected: * doesn't exist then it is created. The source will have the key "HasModel" to easily indicate there is a model present. * * The ownership of the model is transferred to the DataContainer, - * so the model will be deletd when a new one is set or when the + * so the model will be deleted when a new one is set or when the * DataContainer itself is deleted. As the DataContainer, it will be * deleted when there won't be any * visualization associated to this source. diff --git a/src/plasma/dataengineconsumer.h b/src/plasma/dataengineconsumer.h index 16bd97a66..3f97ce629 100644 --- a/src/plasma/dataengineconsumer.h +++ b/src/plasma/dataengineconsumer.h @@ -20,7 +20,7 @@ #ifndef PLASMA_DATAENGINECONSUMER_H #define PLASMA_DATAENGINECONSUMER_H -#include +#include #include diff --git a/src/plasma/package.h b/src/plasma/package.h index 3f7d74a99..9276801aa 100644 --- a/src/plasma/package.h +++ b/src/plasma/package.h @@ -20,7 +20,7 @@ #ifndef PLASMA_PACKAGE_H #define PLASMA_PACKAGE_H -#include +#include #include diff --git a/src/plasma/packagestructure.h b/src/plasma/packagestructure.h index 1afb96067..2173314cf 100644 --- a/src/plasma/packagestructure.h +++ b/src/plasma/packagestructure.h @@ -20,7 +20,7 @@ #ifndef PLASMA_PACKAGESTRUCTURE_H #define PLASMA_PACKAGESTRUCTURE_H -#include +#include #include diff --git a/src/plasma/plasma.cpp b/src/plasma/plasma.cpp index 38c5fc5c8..49ffb32ee 100644 --- a/src/plasma/plasma.cpp +++ b/src/plasma/plasma.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include "containment.h" diff --git a/src/plasma/plasma.h b/src/plasma/plasma.h index 6c46fb8f8..0c4b4a77d 100644 --- a/src/plasma/plasma.h +++ b/src/plasma/plasma.h @@ -106,13 +106,13 @@ public: Q_ENUM(ContainmentType) /** - * A descriptrive type for QActions, to help categorizing them when presented to the user + * A descriptive type for QActions, to help categorizing them when presented to the user */ enum ActionType { AddAction = 0, /**< The action will cause something new being created*/ ConfigureAction = 100, /**< The Action will make some kind of configuration ui to appear */ ControlAction = 200, /**< Generic control, similar to ConfigureAction TODO: better doc */ - MiscAction = 300, /**< A type of action that doesn't fit in the oher categories */ + MiscAction = 300, /**< A type of action that doesn't fit in the other categories */ DestructiveAction = 400, /**< A dangerous action, such as deletion of objects, plasmoids and files. They are intended to be shown separated from other actions */ UserAction = DestructiveAction + 1000 /**< If new types are needed in a C++ implementation, define them as ids more than UserAction*/ }; @@ -122,7 +122,7 @@ public: * The Direction enumeration describes in which direction, relative to the * Applet (and its managing container), popup menus, expanders, balloons, * message boxes, arrows and other such visually associated widgets should - * appear in. This is usually the oposite of the Location. + * appear in. This is usually the opposite of the Location. **/ enum Direction { Down = 0, /**< Display downards */ diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp index 8faefa442..8459a6b55 100644 --- a/src/plasma/pluginloader.cpp +++ b/src/plasma/pluginloader.cpp @@ -91,7 +91,7 @@ QString PluginLoaderPrivate::s_containmentActionsPluginDir = QStringLiteral("pla QSet PluginLoaderPrivate::knownCategories() { - // this is to trick the tranlsation tools into making the correct + // this is to trick the translation tools into making the correct // strings for translation QSet categories = s_customCategories; categories << QStringLiteral(I18N_NOOP("Accessibility")).toLower() @@ -563,7 +563,7 @@ KPluginInfo::List PluginLoader::listAppletInfo(const QString &category, const QS const auto plugins = listAppletMetaData(category, parentApp); //NOTE: it still produces kplugininfos from KServices because some user code expects - //info.sevice() to be valid and would crash ohtherwise + //info.service() to be valid and would crash otherwise foreach (auto& md, plugins) { auto pi = md.metaDataFileName().endsWith(QLatin1String(".json")) ? KPluginInfo(md) : KPluginInfo(KService::serviceByStorageId(md.metaDataFileName())); if (!pi.isValid()) { diff --git a/src/plasma/pluginloader.h b/src/plasma/pluginloader.h index 886f70b8a..31b1b464c 100644 --- a/src/plasma/pluginloader.h +++ b/src/plasma/pluginloader.h @@ -138,7 +138,7 @@ public: * @param parent the parent containment. @since 4.6 null is allowed. * @param name the plugin name, as returned by KPluginInfo::pluginName() * @param args to send the containmentactions extra arguments - * @return a ContaimentActions object + * @return a ContainmentActions object **/ ContainmentActions *loadContainmentActions(Containment *parent, const QString &containmentActionsName, const QVariantList &args = QVariantList()); @@ -160,7 +160,7 @@ public: * Returns a list of all known applets. * This may skip applets based on security settings and ExcludeCategories in the application's config. * - * @param category Only applets matchin this category will be returned. + * @param category Only applets matching this category will be returned. * Useful in conjunction with knownCategories. * If "Misc" is passed in, then applets without a * Categories= entry are also returned. @@ -290,7 +290,7 @@ public: * @param type Only containments with this string in X-Plasma-ContainmentType * in their .desktop files will be returned. Common values are panel and * desktop - * @param category Only containments matchin this category will be returned. + * @param category Only containments matching this category will be returned. * Useful in conjunction with knownCategories. * If "Miscellaneous" is passed in, then containments without a * Categories= entry are also returned. @@ -414,7 +414,7 @@ protected: * @param parent the parent containment. @since 4.6 null is allowed. * @param name the plugin name, as returned by KPluginInfo::pluginName() * @param args to send the containmentactions extra arguments - * @return a ContaimentActions object + * @return a ContainmentActions object **/ virtual ContainmentActions *internalLoadContainmentActions(Containment *parent, const QString &containmentActionsName, const QVariantList &args); diff --git a/src/plasma/private/applet_p.h b/src/plasma/private/applet_p.h index 14a44268b..8c4221cf7 100644 --- a/src/plasma/private/applet_p.h +++ b/src/plasma/private/applet_p.h @@ -91,7 +91,7 @@ public: KConfigGroup *mainConfig; Plasma::Types::Constraints pendingConstraints; - // sripting and package stuff + // scripting and package stuff AppletScript *script; KPackage::Package package; KConfigLoader *configLoader; diff --git a/src/plasma/private/authorizationmanager_p.h b/src/plasma/private/authorizationmanager_p.h index 125ca4625..427805b3d 100644 --- a/src/plasma/private/authorizationmanager_p.h +++ b/src/plasma/private/authorizationmanager_p.h @@ -22,8 +22,8 @@ #include "config-plasma.h" -#include -#include +#include +#include #if ENABLE_REMOTE_WIDGETS #include diff --git a/src/plasma/private/datacontainer_p.h b/src/plasma/private/datacontainer_p.h index 70c284561..de63a4e45 100644 --- a/src/plasma/private/datacontainer_p.h +++ b/src/plasma/private/datacontainer_p.h @@ -23,9 +23,9 @@ #include "servicejob.h" #include "storage_p.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/plasma/private/dataenginemanager.cpp b/src/plasma/private/dataenginemanager.cpp index 4ab0f4674..b58cae538 100644 --- a/src/plasma/private/dataenginemanager.cpp +++ b/src/plasma/private/dataenginemanager.cpp @@ -165,7 +165,7 @@ void DataEngineManager::timerEvent(QTimerEvent *) QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QStringLiteral("/plasma_dataenginemanager_log"); QFile f(path); if (!f.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { - // qCDebug(LOG_PLASMA) << "faild to open" << path; + // qCDebug(LOG_PLASMA) << "failed to open" << path; return; } diff --git a/src/plasma/private/sharedtimer_p.h b/src/plasma/private/sharedtimer_p.h index 7ea04c229..376bba342 100644 --- a/src/plasma/private/sharedtimer_p.h +++ b/src/plasma/private/sharedtimer_p.h @@ -20,7 +20,7 @@ #ifndef PLASMA_SHAREDTIMER_P_H #define PLASMA_SHAREDTIMER_P_H -#include +#include namespace Plasma { diff --git a/src/plasma/scripting/appletscript.h b/src/plasma/scripting/appletscript.h index fe3bbc808..6adbd6867 100644 --- a/src/plasma/scripting/appletscript.h +++ b/src/plasma/scripting/appletscript.h @@ -20,9 +20,9 @@ #ifndef PLASMA_APPLETSCRIPT_H #define PLASMA_APPLETSCRIPT_H -#include -#include -#include +#include +#include +#include #include diff --git a/src/plasma/scripting/scriptengine.h b/src/plasma/scripting/scriptengine.h index a54db5445..988c4a711 100644 --- a/src/plasma/scripting/scriptengine.h +++ b/src/plasma/scripting/scriptengine.h @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include class QPainter; diff --git a/src/plasma/service.h b/src/plasma/service.h index 60d868eb5..485d23f03 100644 --- a/src/plasma/service.h +++ b/src/plasma/service.h @@ -20,9 +20,9 @@ #ifndef PLASMA_SERVICE_H #define PLASMA_SERVICE_H -#include -#include -#include +#include +#include +#include #include @@ -210,7 +210,7 @@ protected: * Enables a given service by name * * @param operation the name of the operation to enable or disable - * @param enable true if the operation should be enabld, false if disabled + * @param enable true if the operation should be enabled, false if disabled */ void setOperationEnabled(const QString &operation, bool enable); diff --git a/src/plasma/servicejob.h b/src/plasma/servicejob.h index 33908c494..f38df7e1b 100644 --- a/src/plasma/servicejob.h +++ b/src/plasma/servicejob.h @@ -20,7 +20,7 @@ #ifndef PLASMA_SERVICEJOB_H #define PLASMA_SERVICEJOB_H -#include +#include #include diff --git a/src/plasma/svg.h b/src/plasma/svg.h index e960d79cb..6504e598e 100644 --- a/src/plasma/svg.h +++ b/src/plasma/svg.h @@ -20,7 +20,7 @@ #ifndef PLASMA_SVG_H #define PLASMA_SVG_H -#include +#include #include #include @@ -104,14 +104,14 @@ public: qreal devicePixelRatio(); /** - * Settng a scale factor greater than one it will result in final images scaled by it. + * Setting a scale factor greater than one it will result in final images scaled by it. * Unlike devicePixelRatio, every size and element rect will be scaled accordingly. * @return how much to scale the rendered image. */ qreal scaleFactor() const; /** - * Settng a scale factor greater than one it will result in final images scaled by it. + * Setting a scale factor greater than one it will result in final images scaled by it. * Unlike devicePixelRatio, every size and element rect will be scaled accordingly. * The default value is 1.0 and the scale will be done rounded to the floor integer. * @param how much to scale the Svg @@ -121,7 +121,7 @@ public: /** * Set a color group for the Svg. * if the Svg uses stylesheets and has elements - * that are eithe TextColor or BackgroundColor class, + * that are either TextColor or BackgroundColor class, * make them use ButtonTextColor/ButtonBackgroundColor * or ViewTextColor/ViewBackgroundColor */ diff --git a/src/plasma/theme.cpp b/src/plasma/theme.cpp index 057da851e..9e119e287 100644 --- a/src/plasma/theme.cpp +++ b/src/plasma/theme.cpp @@ -78,7 +78,7 @@ Theme::Theme(const QString &themeName, QObject *parent) ThemePrivate::themesRefCount[themeName].ref(); d = ThemePrivate::themes[themeName]; - // turn off caching so we don't accidently trigger unnecessary disk activity at this point + // turn off caching so we don't accidentally trigger unnecessary disk activity at this point bool useCache = d->cacheTheme; d->cacheTheme = false; d->setThemeName(themeName, false, false); diff --git a/src/plasma/theme.h b/src/plasma/theme.h index 98bb095a7..59c65a2ed 100644 --- a/src/plasma/theme.h +++ b/src/plasma/theme.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -242,7 +242,7 @@ public: * overwritten. * The actual insert is delayed for optimization reasons and the id * parameter is used to discard repeated inserts in the delay time, useful - * when for instance the graphics to inser comes from a quickly resizing + * when for instance the graphics to insert comes from a quickly resizing * object: the frames between the start and destination sizes aren't * useful in the cache and just cause overhead. * @@ -300,16 +300,16 @@ public: /** * Discards all the information about a given image from the rectangle disk cache * - * @param image the path to the image the cache is assoiated with + * @param image the path to the image the cache is associated with **/ void invalidateRectsCache(const QString &image); /** * Frees up memory used by cached information for a given image without removing - * the permenant record of it on disk. + * the permanent record of it on disk. * @see invalidateRectsCache * - * @param image the path to the image the cache is assoiated with + * @param image the path to the image the cache is associated with */ void releaseRectsCache(const QString &image); diff --git a/src/plasmaquick/appletquickitem.h b/src/plasmaquick/appletquickitem.h index 9f0e53241..34c91ab2e 100644 --- a/src/plasmaquick/appletquickitem.h +++ b/src/plasmaquick/appletquickitem.h @@ -81,7 +81,7 @@ class PLASMAQUICK_EXPORT AppletQuickItem : public QQuickItem /** * True when the applet wants the activation signal act in toggle mode, i.e. while being expanded - * the signal shrinks the applet to its not exanded state instead of reexpanding it. + * the signal shrinks the applet to its not expanded state instead of reexpanding it. */ Q_PROPERTY(bool activationTogglesExpanded WRITE setActivationTogglesExpanded READ isActivationTogglesExpanded NOTIFY activationTogglesExpandedChanged) diff --git a/src/plasmaquick/configmodel.h b/src/plasmaquick/configmodel.h index fb5b571ad..72bca4303 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 particulary smart resolving namespaces, hence fully qualified signature + // QML Engine isn't particularily 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/plasmaquick/containmentview.cpp b/src/plasmaquick/containmentview.cpp index 225b14cc2..5cc0274a7 100644 --- a/src/plasmaquick/containmentview.cpp +++ b/src/plasmaquick/containmentview.cpp @@ -94,7 +94,7 @@ void ContainmentViewPrivate::setContainment(Plasma::Containment *cont) //we are QuickViewSharedEngine::SizeRootObjectToView, but that's not enough, as //the root object isn't immediately resized (done at the resizeEvent handler). - //by resising it just before restoring the containment, it removes a chain of resizes at startup + //by resizing it just before restoring the containment, it removes a chain of resizes at startup if (q->rootObject()) { q->rootObject()->setSize(q->size()); } diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp index b3fe857f4..46f4cecb1 100644 --- a/src/plasmaquick/dialog.cpp +++ b/src/plasmaquick/dialog.cpp @@ -52,7 +52,6 @@ #include #endif -#include #if HAVE_XCB_SHAPE #include #include @@ -191,7 +190,7 @@ QRect DialogPrivate::availableScreenGeometryForPosition(const QPoint& pos) const * more reliable anyways (could be tried to remove the whole Q_FOREACH * at this point) * - * imporant: screen can be a nullptr... see bug 345173 + * important: screen can be a nullptr... see bug 345173 */ if (avail.isEmpty() && q->screen()) { avail = q->screen()->availableGeometry(); diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp index 749066755..543aaffe4 100644 --- a/src/scriptengines/qml/plasmoid/appletinterface.cpp +++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp @@ -208,7 +208,7 @@ void AppletInterface::destroyedChanged(bool destroyed) } if (isAncestor) { - //Found? remove focus for the whole hierachy + //Found? remove focus for the whole hierarchy candidate = focus; while (candidate && candidate != this) { @@ -294,8 +294,8 @@ QString AppletInterface::toolTipMainText() const void AppletInterface::setToolTipMainText(const QString &text) { - //Here we are abusing the differentce between a null and and empty string. - //by default is null so fallsback to the name + //Here we are abusing the difference between a null and an empty string. + //by default is null so falls back to the name //the fist time it gets set, an empty non null one is set, and won't fallback anymore if (!m_toolTipMainText.isNull() && m_toolTipMainText == text) { return; diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp index 3c4bb3359..9cde92105 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -519,7 +519,7 @@ void ContainmentInterface::processMimeData(QMimeData *mimeData, int x, int y, KI if (seenPlugins.isEmpty()) { // do nothing - //directly create if only one offer only if the conteinment didn't pass an existing plugin + //directly create if only one offer only if the containment didn't pass an existing plugin } else if (seenPlugins.count() == 1) { selectedPlugin = seenPlugins.constBegin().key(); Plasma::Applet *applet = createApplet(selectedPlugin, QVariantList(), QRect(x, y, -1, -1)); diff --git a/src/tools/inkscape extensions/plasmarename.py b/src/tools/inkscape extensions/plasmarename.py index 3f228741b..3373b4b67 100644 --- a/src/tools/inkscape extensions/plasmarename.py +++ b/src/tools/inkscape extensions/plasmarename.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ''' diff --git a/tests/dialog_visualParentChange.qml b/tests/dialog_visualParentChange.qml index a0a6c28ad..c6240e63c 100644 --- a/tests/dialog_visualParentChange.qml +++ b/tests/dialog_visualParentChange.qml @@ -28,7 +28,7 @@ ColumnLayout { Controls.Label { Layout.maximumWidth: mainLayout.width wrapMode: Text.WordWrap - text: "Click on each coloured box to make a dialog popup. It should popup in the correct position. The popup should also move from one rectanlge to the other on hovering" + text: "Click on each coloured box to make a dialog popup. It should popup in the correct position. The popup should also move from one rectangle to the other on hovering" } RowLayout { diff --git a/tests/testengine/testengine.cpp b/tests/testengine/testengine.cpp index ade16c2ac..eab73dcb5 100644 --- a/tests/testengine/testengine.cpp +++ b/tests/testengine/testengine.cpp @@ -19,10 +19,10 @@ #include "testengine.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -117,7 +117,7 @@ void TestEngine::init() setData(dsn, QStringLiteral("QPixmap"), QVariant(QPixmap(12, 34))); // QVariant::Point setData(dsn, QStringLiteral("QPoint"), QVariant(QPoint(12, 34))); - // QVariant::PointArray (obsoloted in Qt4, see QPolygon) + // QVariant::PointArray (obsoleted in Qt4, see QPolygon) // QVariant::PointF setData(dsn, QStringLiteral("QPointF"), QVariant(QPointF(12.34, 56.78))); // QVariant::Polygon