Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit ea415539 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix minor EBN issues

parent 6298005f
......@@ -174,7 +174,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx)
QMenu *actionMenu = createMenu(idx);
if (actionMenu) {
//this is a workaround where Qt will fail to realise a mouse has been released
//this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
// https://bugreports.qt.io/browse/QTBUG-59044
......@@ -218,7 +218,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx)
QMenu *oldMenu = m_currentMenu;
m_currentMenu = actionMenu;
if (oldMenu && oldMenu != actionMenu) {
//dont initialize the currentIndex when another menu is already shown
//don't initialize the currentIndex when another menu is already shown
disconnect(oldMenu, &QMenu::aboutToHide, this, &AppMenuApplet::onMenuAboutToHide);
oldMenu->hide();
}
......
......@@ -19,6 +19,9 @@
*
******************************************************************/
#ifndef APPMENUMODEL_H
#define APPMENUMODEL_H
#include <QAbstractListModel>
#include <QAbstractNativeEventFilter>
#include <QStringList>
......@@ -84,3 +87,4 @@ private:
QPointer<KDBusMenuImporter> m_importer;
};
#endif
......@@ -51,4 +51,4 @@ Item {
}
}
}
}
\ No newline at end of file
}
......@@ -251,7 +251,7 @@ MouseArea {
} else if (deviceItem.state == 1) {
return i18nc("Accessing is a less technical word for Mounting; translation should be short and mean \'Currently mounting this device\'", "Accessing...")
} else {
return i18nc("Removing is a less technical word for Unmounting; translation shoud be short and mean \'Currently unmounting this device\'", "Removing...")
return i18nc("Removing is a less technical word for Unmounting; translation should be short and mean \'Currently unmounting this device\'", "Removing...")
}
}
}
......
add_subdirectory(plugin)
plasma_install_package(package org.kde.plasma.digitalclock)
\ No newline at end of file
plasma_install_package(package org.kde.plasma.digitalclock)
......@@ -17,4 +17,4 @@
import QtQuick 2.0
import org.kde.plasma.calendar 2.0 as PlasmaCalendar
PlasmaCalendar.MonthMenu { }
\ No newline at end of file
PlasmaCalendar.MonthMenu { }
......@@ -17,8 +17,8 @@
*/
#ifndef NOTIFICATIONSHELPERPLUGIN_H
#define NOTIFICATIONSHELPERPLUGIN_H
#ifndef DIGITALCLOCKPLUGIN_H
#define DIGITALCLOCKPLUGIN_H
#include <QQmlExtensionPlugin>
......@@ -31,4 +31,4 @@ public:
void registerTypes(const char *uri) override;
};
#endif // NOTIFICATIONSHELPERPLUGIN_H
#endif // DIGITALCLOCKPLUGIN_H
......@@ -151,7 +151,7 @@ ListView {
}
}
// first item determins the ListView height
// first item determines the ListView height
Binding {
target: previewList
property: "implicitHeight"
......
......@@ -164,7 +164,7 @@ void Thumbnailer::showContextMenu(int x, int y, const QString &path, QQuickItem
dialog->show();
});
//this is a workaround where Qt will fail to realise a mouse has been released
//this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
// https://bugreports.qt.io/browse/QTBUG-59044
......
......@@ -85,4 +85,4 @@ Applet {
}
}
}
}
\ No newline at end of file
}
......@@ -163,7 +163,7 @@ void SystemTray::showPlasmoidMenu(QQuickItem *appletInterface, int x, int y)
connect(this, &QObject::destroyed, desktopMenu, &QMenu::close);
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
//this is a workaround where Qt will fail to realise a mouse has been released
//this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
......@@ -413,7 +413,7 @@ void SystemTray::restorePlasmoids()
}
}
// insertMulti becase it is possible (though poor form) to have multiple applets
// insertMulti because it is possible (though poor form) to have multiple applets
// with the same visible name but different plugins
sortedApplets.insertMulti(info.name(), info);
}
......
......@@ -23,8 +23,8 @@
DEALINGS IN THE SOFTWARE.
*/
#ifndef KDBUSMENUIMPORTER_H
#define KDBUSMENUIMPORTER_H
#ifndef KDBUSIMPORTER_H
#define KDBUSIMPORTER_H
#include <dbusmenuimporter.h>
......@@ -51,4 +51,4 @@ protected:
}
};
#endif //KDBUSMENUIMPORTER_H
#endif //KDBUSIMPORTER_H
......@@ -20,8 +20,8 @@
THE SOFTWARE.
*/
#ifndef WIDGETEXPLORERPLUGIN_H
#define WIDGETEXPLORERPLUGIN_H
#ifndef SHELLPRIVATEPLUGIN_H
#define SHELLPRIVATEPLUGIN_H
#include <QQmlExtensionPlugin>
......
......@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef SWITCHWINDOW_HEADER
#define SWITCHWINDOW_HEADER
#ifndef LAUNCH_H
#define LAUNCH_H
#include <QMenu>
......
......@@ -224,7 +224,7 @@ void ContextMenu::lockScreen()
void ContextMenu::startLogout()
{
// this short delay is due to two issues:
// a) KWorkSpace's DBus alls are all syncronous
// a) KWorkSpace's DBus alls are all synchronous
// b) the destrution of the menu that this action is in is delayed
//
// (a) leads to the menu hanging out where everyone can see it because
......
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKJOB_H
#define TASKJOB_H
#ifndef APPJOB_H
#define APPJOB_H
// plasma
#include <Plasma/ServiceJob>
......@@ -42,4 +42,4 @@ class AppJob : public Plasma::ServiceJob
};
#endif // TASKJOB_H
#endif // APPJOB_H
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKSENGINE_H
#define TASKSENGINE_H
#ifndef APPSENGINE_H
#define APPSENGINE_H
// plasma
#include <Plasma/DataEngine>
......
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKSERVICE_H
#define TASKSERVICE_H
#ifndef APPSERVICE_H
#define APPSERVICE_H
// plasma
#include <Plasma/Service>
......@@ -45,4 +45,4 @@ class AppService : public Plasma::Service
AppSource *m_source;
};
#endif // TASKSERVICE_H
#endif // APPSERVICE_H
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKSOURCE_H
#define TASKSOURCE_H
#ifndef APPSOURCE_H
#define APPSOURCE_H
// plasma
#include <Plasma/DataContainer>
......@@ -56,4 +56,4 @@ class AppSource : public Plasma::DataContainer
};
#endif // TASKSOURCE_H
#endif // APPSOURCE_H
......@@ -38,7 +38,7 @@ QString NotificationSanitizer::parse(const QString &text)
// can happen for example when "\n \n" is sent, this replaces
// all <br/>s in succsession with just one
t.replace(QRegularExpression(QStringLiteral("<br/>\\s*<br/>(\\s|<br/>)*")), QLatin1String("<br/>"));
// This fancy RegExp escapes every occurence of & since QtQuick Text will blatantly cut off
// This fancy RegExp escapes every occurrence of & since QtQuick Text will blatantly cut off
// text where it finds a stray ampersand.
// Only &{apos, quot, gt, lt, amp}; as well as &#123 character references will be allowed
t.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|amp);|#)")), QLatin1String("&amp;"));
......
......@@ -17,6 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef NOTIFICATIONSANITIZER_H
#define NOTIFICATIONSANITIZER_H
#include <QString>
namespace NotificationSanitizer
......@@ -35,3 +38,5 @@ namespace NotificationSanitizer
*/
QString parse(const QString &in);
}
#endif
......@@ -63,4 +63,4 @@ Plasma::Service* PackagekitEngine::serviceForSource(const QString& source)
K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(packagekit, PackagekitEngine, "plasma-dataengine-packagekit.json")
#include "packagekitengine.moc"
\ No newline at end of file
#include "packagekitengine.moc"
......@@ -364,7 +364,7 @@ void ShareProvider::success(const QString &url)
void ShareProvider::error(const QString &msg)
{
// notify the service that it didnt work and the error msg
// notify the service that it didn't work and the error msg
emit finishedError(msg);
}
......
......@@ -141,7 +141,7 @@ void SystemMonitorEngine::answerReceived(int id, const QList<QByteArray> &answer
sensors.insert(newSensor);
m_sensors.append(newSensor);
{
// HACK: for backwards compability
// HACK: for backwards compatibility
// in case this source was created in sourceRequestEvent, stop it being
// automagically removed when disconnected from
Plasma::DataContainer *s = containerForSource( newSensor );
......
......@@ -94,7 +94,7 @@ void Menu::start(uint id)
m_menus[menu.id].append(menus);
}
// LibreOffice on startup fails to give us some menus right away, we'll also subscribe in onMenuChanged() if neccessary
// LibreOffice on startup fails to give us some menus right away, we'll also subscribe in onMenuChanged() if necessary
if (menus.isEmpty()) {
qCWarning(DBUSMENUPROXY) << "Got an empty menu for" << id << "on" << m_serviceName << "at" << m_objectPath;
return;
......
......@@ -456,7 +456,7 @@ uint Window::GetLayout(int parentId, int recursionDepth, const QStringList &prop
return 1;
}
// If a particular entry is requested, see what it is and resolve as neccessary
// If a particular entry is requested, see what it is and resolve as necessary
// for example the "File" entry on root is 0,0,1 but is a menu reference to e.g. 1,0,0
// so resolve that and return the correct menu
if (index > 0) {
......
......@@ -43,9 +43,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
{
......
......@@ -31,7 +31,6 @@
#include <KAuthorized>
#include <KWindowSystem>
#include <KWindowEffects>
#include <KAuthorized>
#include <KGlobalAccel>
#include <KLocalizedString>
#include <KDirWatch>
......
......@@ -41,7 +41,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <QStandardPaths>
#include <QX11Info>
#include <QScreen>
#include <QStandardPaths>
#include <KPackage/Package>
#include <KPackage/PackageLoader>
......@@ -179,7 +178,7 @@ void KSMShutdownDlg::init()
setGeometry(screen()->geometry());
});
//decide in backgroundcontrast wether doing things darker or lighter
//decide in backgroundcontrast whether doing things darker or lighter
//set backgroundcontrast here, because in QEvent::PlatformSurface
//is too early and we don't have the root object yet
const QColor backgroundColor = rootObject() ? rootObject()->property("backgroundColor").value<QColor>() : QColor();
......
......@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __KJOBTEST_H__
#define __KJOBTEST_H__
#ifndef __KUISERVERTEST_H__
#define __KUISERVERTEST_H__
#include <kjob.h>
#include <kjobuidelegate.h>
......@@ -49,4 +49,4 @@ private:
int seconds, total;
};
#endif // __KJOBTEST_H__
#endif // __KUISERVERTEST_H__
......@@ -14,8 +14,8 @@ 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, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#ifndef COLORCORRECT_COMPOSITORADAPTOR_H
#define COLORCORRECT_COMPOSITORADAPTOR_H
#ifndef COMPOSITORCOLORADAPTOR_H
#define COMPOSITORCOLORADAPTOR_H
#include <QObject>
#include <QTime>
......@@ -331,7 +331,7 @@ public:
* longitude values and in Timings mode the morning and evening begin, as
* well as the transition time.
*
* Returns true, if the configuration was succesfully applied.
* Returns true, if the configuration was successfully applied.
*
* @return bool
* @see sendConfigurationAll
......@@ -344,7 +344,7 @@ public:
* Send all currently staged values to the compositor in order
* to trigger a configuration change.
*
* Returns true, if the configuration was succesfully applied.
* Returns true, if the configuration was successfully applied.
*
* @return bool
* @see sendConfiguration
......@@ -476,4 +476,4 @@ private:
}
#endif // COLORCORRECT_COMPOSITORADAPTOR_H
#endif // COMPOSITORCOLORADAPTOR_H
......@@ -46,7 +46,6 @@
//#define BENCHMARK
#ifdef BENCHMARK
#include <QTime>
static QTime sChrono;
#endif
......
/* Define if you have X11 at all */
#define HAVE_X11 ${X11_FOUND}
\ No newline at end of file
#define HAVE_X11 ${X11_FOUND}
......@@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#ifndef ABSTRACTASKSMODELIFACE_H
#define ABSTRACTASKSMODELIFACE_H
#ifndef ABSTRACTTASKSMODELIFACE_H
#define ABSTRACTTASKSMODELIFACE_H
#include <QObject>
......
......@@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#ifndef ABSTRACTASKSPROXYMODELIFACE_H
#define ABSTRACTASKSPROXYMODELIFACE_H
#ifndef ABSTRACTTASKSPROXYMODELIFACE_H
#define ABSTRACTTASKSPROXYMODELIFACE_H
#include <QObject>
......
......@@ -21,9 +21,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
#include "tasktools.h"
#include "abstracttasksmodel.h"
#include "tasktools.h"
#include "abstracttasksmodel.h"
#include <KActivities/ResourceInstance>
#include <KConfigGroup>
#include <KDesktopFile>
......
......@@ -72,7 +72,7 @@ TASKMANAGER_EXPORT AppData appDataFromUrl(const QUrl &url, const QIcon &fallback
* the .desktop file for the application owning this window, or,
* failing that, the path to its executable.
*
* The source for the metadata is generally the the window's appId on
* The source for the metadata is generally the window's appId on
* Wayland, or the window class part of the WM_CLASS window property
* on X Windows.
*
......
......@@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#ifndef XWIDOWSYSTEMEVENTBATCHER_H
#define XWIDOWSYSTEMEVENTBATCHER_H
#ifndef XWINDOWSYSTEMEVENTBATCHER_H
#define XWINDOWSYSTEMEVENTBATCHER_H
#include <QObject>
......
......@@ -44,7 +44,7 @@ SessionManagementScreen {
var password = passwordBox.text
//this is partly because it looks nicer
//but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focussed
//but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focused
//See https://bugreports.qt.io/browse/QTBUG-55460
loginButton.forceActiveFocus();
loginRequest(password);
......
......@@ -105,7 +105,7 @@ bool KdePlatformPlugin::isMimeTypeAvailable(const QString &/*mimeType*/) const
// everything is supported.
// In particular there's two problems
// 1. mimetypes do not map well to actual formats because the majority of
// files these days are containers that can contain arbitary content
// files these days are containers that can contain arbitrary content
// streams, so mimetypes are too generic to properly define supportedness.
// 2. just about every multimedia library in the world draws format support
// from a plugin based architecture which means that technically everything
......
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifndef INSTALLERRUNNER_H
#define INSTALLERRUNNER_H
#ifndef APPSTREAMRUNNER_H
#define APPSTREAMRUNNER_H
#include <KRunner/AbstractRunner>
#include <AppStreamQt/pool.h>
......
......@@ -32,7 +32,6 @@
#include <QMimeData>
#include <QApplication>
#include <QDBusConnection>
#include <QTimer>
#include <Baloo/Query>
#include <Baloo/IndexerConfig>
......
......@@ -23,4 +23,4 @@
#define kdbg_code 1207
#endif
\ No newline at end of file
#endif
......@@ -28,7 +28,6 @@
#include <QFileInfo>
#include <QDebug>
#include "bookmarksrunner_defs.h"
#include <QFileInfo>
#include <QDir>
class ProfileBookmarks {
......
......@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef CHROMEFAVICON_H
#define CHROMEFAVICON_H
#ifndef FAVICONFROMBLOB_H
#define FAVICONFROMBLOB_H
#include <QIcon>
#include "favicon.h"
......@@ -47,4 +47,4 @@ private:
void cleanCacheDirectory();
};
#endif // CHROMEFAVICON_H
#endif // FAVICONFROMBLOB_H
......@@ -134,7 +134,7 @@ void ServiceRunnerTest::testKonsoleVsYakuakeComment()
void ServiceRunnerTest::testSystemSettings()
{
// In 5.9.0 'System Settings' suddenly didn't come back as a match for 'settings' anymore.
// Sytem Settings has a noKDE version and a KDE version, if the noKDE version is encountered
// System Settings has a noKDE version and a KDE version, if the noKDE version is encountered
// first it will be added to the seen cache, however disqualification of already seen items
// may then also disqualify the KDE version of system settings on account of having already
// seen it. This test makes sure we find the right version.
......
......@@ -78,7 +78,7 @@ class DeviceWrapper : public QObject
QString m_description;
QStringList m_actionIds;
// Solid doesn't like multithreading that much
// We cache the informations we need locally so that
// We cache the information we need locally so that
// 1) nothing possibly goes wrong when processing a query
// 2) performance++
......
/* Define if you have X11 at all */
#define HAVE_X11 ${X11_FOUND}
\ No newline at end of file
#define HAVE_X11 ${X11_FOUND}
......@@ -35,7 +35,7 @@ SessionManagementScreen {
var password = passwordBox.text
//this is partly because it looks nicer
//but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focussed
//but more importantly it works round a Qt bug that can trigger if the app is closed with a TextField focused
//DAVE REPORT THE FRICKING THING AND PUT A LINK
loginButton.forceActiveFocus();
loginRequest(username, password);
......
......@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef ALTERNATIVESDIALOG_H
#define ALTERNATIVESDIALOG_H
#ifndef ALTERNATIVESHELPER_H
#define ALTERNATIVESHELPER_H
#include <Plasma/Applet>
......
......@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef DESKTOVIEW_H
#define DESKTOVIEW_H
#ifndef DESKTOPVIEW_H
#define DESKTOPVIEW_H
#include <PlasmaQuick/ContainmentView>
......@@ -107,4 +107,4 @@ private:
KWayland::Client::PlasmaShellSurface *m_shellSurface;
};
#endif // DESKTOVIEW_H
#endif // DESKTOPVIEW_H
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA. *
*******************************************************************************/
#ifndef SHELLPACKAGES_H
#define SHELLPACKAGES_H
#ifndef LAYOUTTEMPLATE_H
#define LAYOUTTEMPLATE_H
#include <KPackage/PackageStructure>
......
......@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef WALLPAPERSTRUCTURE_H
#define WALLPAPERSTRUCTURE_H
#ifndef WALLPAPERPACKAGE_H
#define WALLPAPERPACKAGE_H
#include <KPackage/PackageStructure>
......
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef PLASMA_PANELSHADOWS_H
#define PLASMA_PANELSHADOWS_H
#ifndef PANELSHADOWS_P_H
#define PANELSHADOWS_P_H
#include <QSet>
......
......@@ -91,7 +91,7 @@ class PanelView : public PlasmaQuick::ContainmentView
Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged)
/**
* informations about the screen in which the panel is in
* information about the screen in which the panel is in
*/
Q_PROPERTY(QScreen *screenToFollow READ screenToFollow WRITE setScreenToFollow NOTIFY screenToFollowChanged)
......
......@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef SOFTWARERENDERNOTIFIER_H
#define SOFTWARERENDERNOTIFIER_H
#include <KStatusNotifierItem>
/**
......@@ -33,3 +36,5 @@ private:
SoftwareRendererNotifier(QObject *parent=nullptr);
~SoftwareRendererNotifier();
};
#endif
......@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#ifndef SIMPLESHELLCORONA_H
#define SIMPLESHELLCORONA_H
#ifndef STANDALONEAPPCORONA_H
#define STANDALONEAPPCORONA_H
#include <plasma/corona.h>
#include "desktopview.h"
......
/* Define if you have XCB at all */
#cmakedefine XCB_FOUND
\ No newline at end of file
#cmakedefine XCB_FOUND
......@@ -57,7 +57,7 @@ void TestResolutions::testResolutions_data()
qDebug() << formatResolution(image);
}