alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix minor EBN issues and typos

Browse Source
This commit is contained in:
Yuri Chornoivan 2018-10-22 21:05:29 +03:00
parent 9b6c2cddc7
commit 72ca2f79e0
50 changed files with 108 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autotests/modeltest.h
View File

@ -42,9 +42,9 @@
#ifndef MODELTEST_H
#define MODELTEST_H
#include <QtCore/QObject>
#include <QtCore/QAbstractItemModel>
#include <QtCore/QStack>
#include <QObject>
#include <QAbstractItemModel>
#include <QStack>
class ModelTest : public QObject
{

17
src/declarativeimports/calendar/daydata.h
View File

@ -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

2
src/declarativeimports/core/colorscope.h
View File

@ -22,7 +22,7 @@
#include <QQuickItem>
#include <QPointer>
#include <QtCore/QVariant>
#include <QVariant>
#include <Plasma/Plasma>
#include <Plasma/Theme>

2
src/declarativeimports/core/framesvgitem.h
View File

@ -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.
*/

2
src/declarativeimports/core/tooltip.h
View File

@ -24,7 +24,7 @@
#include <QQuickItem>
#include <QPointer>
#include <QtCore/QVariant>
#include <QVariant>
#include <Plasma/Plasma>
class QQuickItem;

2
src/declarativeimports/core/tooltipdialog.h
View File

@ -24,7 +24,7 @@
#include <QTimer>
#include <QQuickWindow>
#include <QtCore/QVariant>
#include <QVariant>
class QQuickItem;
class QGraphicsWidget;

4
src/declarativeimports/plasmacomponents/fullscreenwindow.cpp
View File

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

4
src/declarativeimports/plasmacomponents/qml/PageStack.qml
View File

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

2
src/declarativeimports/plasmacomponents/qml/ToolBar.qml
View File

@ -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
}

2
src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml
View File

@ -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

4
src/declarativeimports/plasmaextracomponents/qml/PageRow.qml
View File

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

6
src/declarativeimports/plasmastyle/TextFieldStyle.qml
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2014 by Marco MArtin <mart@kde.org>
* Copyright (C) 2014 by Marco Martin <mart@kde.org>
*
* 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

6
src/plasma/applet.cpp
View File

@ -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<Plasma::Containment *>(this);
if (containment) {
containment->d->containmentConstraintsEvent(c);

1
src/plasma/containment.cpp
View File

@ -34,7 +34,6 @@
#include <qtemporaryfile.h>
#include <qmimedatabase.h>
#include <QDebug>
#include <kauthorized.h>
#include <klocalizedstring.h>
#include <KConfigSkeleton>

2
src/plasma/containment.h
View File

@ -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

2
src/plasma/containmentactions.cpp
View File

@ -27,8 +27,6 @@
#include <QMouseEvent>
#include <QWheelEvent>
#include <QContextMenuEvent>
#include <QMouseEvent>
#include <QWheelEvent>
#include <QDebug>
#include <klocalizedstring.h>

1
src/plasma/corona.cpp
View File

@ -28,7 +28,6 @@
#include <QPainter>
#include <QTimer>
#include <QScreen>
#include <QScreen>
#include <cmath>

6
src/plasma/corona.h
View File

@ -222,7 +222,7 @@ public:
QList<Plasma::Types::Location> 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.

2
src/plasma/datacontainer.cpp
View File

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

8
src/plasma/datacontainer.h
View File

@ -20,9 +20,9 @@
#ifndef PLASMA_DATACONTAINER_H
#define PLASMA_DATACONTAINER_H
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QHash>
#include <QObject>
#include <QTimer>
#include <kjob.h>
#include <plasma/plasma_export.h>
@ -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.
*

1
src/plasma/dataengine.cpp
View File

@ -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"

8
src/plasma/dataengine.h
View File

@ -20,9 +20,9 @@
#ifndef PLASMA_DATAENGINE_H
#define PLASMA_DATAENGINE_H
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QStringList>
#include <QHash>
#include <QObject>
#include <QStringList>
#include <kplugininfo.h>
#include <kservice.h>
@ -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.

2
src/plasma/dataengineconsumer.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_DATAENGINECONSUMER_H
#define PLASMA_DATAENGINECONSUMER_H
#include <QtCore/QUrl>
#include <QUrl>
#include <plasma/plasma_export.h>

2
src/plasma/package.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_PACKAGE_H
#define PLASMA_PACKAGE_H
#include <QtCore/QStringList>
#include <QStringList>
#include <kplugininfo.h>

2
src/plasma/packagestructure.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_PACKAGESTRUCTURE_H
#define PLASMA_PACKAGESTRUCTURE_H
#include <QtCore/QStringList>
#include <QStringList>
#include <kplugininfo.h>

2
src/plasma/plasma.cpp
View File

@ -19,7 +19,7 @@
#include <plasma/plasma.h>
#include <QtWidgets/QAction>
#include <QAction>
#include <QMenu>
#include "containment.h"

6
src/plasma/plasma.h
View File

@ -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 */

4
src/plasma/pluginloader.cpp
View File

@ -91,7 +91,7 @@ QString PluginLoaderPrivate::s_containmentActionsPluginDir = QStringLiteral("pla
QSet<QString> 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<QString> 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()) {

8
src/plasma/pluginloader.h
View File

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

2
src/plasma/private/applet_p.h
View File

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

4
src/plasma/private/authorizationmanager_p.h
View File

@ -22,8 +22,8 @@
#include "config-plasma.h"
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QMap>
#include <QString>
#if ENABLE_REMOTE_WIDGETS
#include <QtCrypto>

6
src/plasma/private/datacontainer_p.h
View File

@ -23,9 +23,9 @@
#include "servicejob.h"
#include "storage_p.h"
#include <QtCore/QTimerEvent>
#include <QtCore/QElapsedTimer>
#include <QtCore/QBasicTimer>
#include <QTimerEvent>
#include <QElapsedTimer>
#include <QBasicTimer>
#include <QAbstractItemModel>

2
src/plasma/private/dataenginemanager.cpp
View File

@ -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;
}

2
src/plasma/private/sharedtimer_p.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_SHAREDTIMER_P_H
#define PLASMA_SHAREDTIMER_P_H
#include <QtCore/QObject>
#include <QObject>
namespace Plasma
{

6
src/plasma/scripting/appletscript.h
View File

@ -20,9 +20,9 @@
#ifndef PLASMA_APPLETSCRIPT_H
#define PLASMA_APPLETSCRIPT_H
#include <QtCore/QObject>
#include <QtCore/QRect>
#include <QtCore/QSizeF>
#include <QObject>
#include <QRect>
#include <QSizeF>
#include <kplugininfo.h>

6
src/plasma/scripting/scriptengine.h
View File

@ -24,9 +24,9 @@
#include <plasma/plasma_export.h>
#include <plasma/plasma.h>
#include <QtCore/QObject>
#include <QtCore/QRect>
#include <QtCore/QSizeF>
#include <QObject>
#include <QRect>
#include <QSizeF>
class QPainter;

8
src/plasma/service.h
View File

@ -20,9 +20,9 @@
#ifndef PLASMA_SERVICE_H
#define PLASMA_SERVICE_H
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QVariant>
#include <QHash>
#include <QObject>
#include <QVariant>
#include <kconfiggroup.h>
@ -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);

2
src/plasma/servicejob.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_SERVICEJOB_H
#define PLASMA_SERVICEJOB_H
#include <QtCore/QVariant>
#include <QVariant>
#include <kjob.h>

8
src/plasma/svg.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_SVG_H
#define PLASMA_SVG_H
#include <QtCore/QObject>
#include <QObject>
#include <QPixmap>
#include <plasma/plasma_export.h>
@ -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
*/

2
src/plasma/theme.cpp
View File

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

10
src/plasma/theme.h
View File

@ -23,7 +23,7 @@
#include <QGuiApplication>
#include <QFont>
#include <QtCore/QObject>
#include <QObject>
#include <kplugininfo.h>
#include <ksharedconfig.h>
@ -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);

2
src/plasmaquick/appletquickitem.h
View File

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

2
src/plasmaquick/configmodel.h
View File

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

2
src/plasmaquick/containmentview.cpp
View File

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

3
src/plasmaquick/dialog.cpp
View File

@ -52,7 +52,6 @@
#include <KWayland/Client/surface.h>
#endif
#include <config-plasma.h>
#if HAVE_XCB_SHAPE
#include <QX11Info>
#include <xcb/shape.h>
@ -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();

6
src/scriptengines/qml/plasmoid/appletinterface.cpp
View File

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

2
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

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

2
src/tools/inkscape extensions/plasmarename.py
View File

@ -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
'''

2
tests/dialog_visualParentChange.qml
View File

@ -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 {

10
tests/testengine/testengine.cpp
View File

@ -19,10 +19,10 @@
#include "testengine.h"
#include <QtCore/QBitArray>
#include <QtCore/QDate>
#include <QtCore/QLocale>
#include <QtCore/QUrl>
#include <QBitArray>
#include <QDate>
#include <QLocale>
#include <QUrl>
#include <QBitmap>
#include <QBrush>
#include <QCursor>
@ -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