From kde-commits Mon Aug 27 06:35:02 2018 From: Yuri Chornoivan Date: Mon, 27 Aug 2018 06:35:02 +0000 To: kde-commits Subject: [plasma-workspace] /: Fix minor EBN issues Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153535171601694 Git commit ea415539fc6256494d5c12296a6216e522e12b0a by Yuri Chornoivan. Committed on 27/08/2018 at 06:34. Pushed by yurchor into branch 'master'. Fix minor EBN issues M +2 -2 applets/appmenu/lib/appmenuapplet.cpp M +4 -0 applets/appmenu/plugin/appmenumodel.h M +1 -1 applets/calendar/package/contents/ui/configAgenda.qml M +1 -1 applets/devicenotifier/package/contents/ui/DeviceItem.qml M +1 -1 applets/digital-clock/CMakeLists.txt M +1 -1 applets/digital-clock/package/contents/ui/MonthMenu.qml M +3 -3 applets/digital-clock/plugin/digitalclockplugin.h M +1 -1 applets/notifications/package/contents/ui/ThumbnailStrip.qml M +1 -1 applets/notifications/plugin/thumbnailer.cpp M +1 -1 applets/systemmonitor/diskusage/contents/ui/diskusage.qml M +2 -2 applets/systemtray/systemtray.cpp M +3 -3 appmenu/kdbusimporter.h M +2 -2 components/shellprivate/shellprivateplugin.h M +2 -2 containmentactions/applauncher/launch.h M +1 -1 containmentactions/contextmenu/menu.cpp M +3 -3 dataengines/apps/appjob.h M +2 -2 dataengines/apps/appsengine.h M +3 -3 dataengines/apps/appservice.h M +3 -3 dataengines/apps/appsource.h M +1 -1 dataengines/notifications/notificationsanitizer.cpp M +5 -0 dataengines/notifications/notificationsanitizer.h M +1 -1 dataengines/packagekit/packagekitengine.cpp M +1 -1 dataengines/share/shareprovider.cpp M +1 -1 dataengines/systemmonitor/systemmonitor.cpp M +1 -1 gmenu-dbusmenu-proxy/menu.cpp M +1 -1 gmenu-dbusmenu-proxy/window.cpp M +3 -3 klipper/autotests/modeltest.h M +0 -1 krunner/view.cpp M +1 -2 ksmserver/logout-greeter/shutdowndlg.cpp M +3 -3 kuiserver/tests/kuiservertest.h M +5 -5 libcolorcorrect/compositorcoloradaptor.h M +0 -1 libdbusmenuqt/dbusmenuimporter.cpp M +1 -1 libkworkspace/config-libkworkspace.h.cmake M +2 -2 libtaskmanager/abstracttasksmodeliface.h M +2 -2 libtaskmanager/abstracttasksproxymodeliface.h M +0 -3 libtaskmanager/tasktools.cpp M +1 -1 libtaskmanager/tasktools.h M +2 -2 libtaskmanager/xwindowsystemeventbatcher.h M +1 -1 lookandfeel/contents/lockscreen/MainBlock.qml M +1 -1 phonon/platform_kde/kdeplatformplugin.cpp M +2 -2 runners/appstream/appstreamrunner.h M +0 -1 runners/baloo/baloosearchrunner.cpp M +1 -1 runners/bookmarks/bookmarksrunner_defs.h M +0 -1 runners/bookmarks/browsers/chrome.cpp M +3 -3 runners/bookmarks/faviconfromblob.h M +1 -1 runners/services/autotests/servicerunnertest.cpp M +1 -1 runners/solid/devicewrapper.h M +1 -1 runners/windows/config-windowsrunner.h.cmake M +1 -1 sddm-theme/Login.qml M +2 -2 shell/alternativeshelper.h M +3 -3 shell/desktopview.h M +2 -2 shell/packageplugins/layouttemplate/layouttemplate.h M +2 -2 shell/packageplugins/wallpaperimages/wallpaperpackage.h M +2 -2 shell/panelshadows_p.h M +1 -1 shell/panelview.h M +5 -0 shell/softwarerendernotifier.h M +2 -2 shell/standaloneappcorona.h M +1 -1 startkde/kcminit/config-xcb.h.cmake M +1 -1 wallpapers/image/autotests/testfindpreferredimage.cpp M +1 -1 wallpapers/image/image.cpp M +1 -1 xembed-sni-proxy/Readme.md M +1 -1 xembed-sni-proxy/fdoselectionmanager.cpp M +1 -1 xembed-sni-proxy/snidbus.cpp M +1 -1 xembed-sni-proxy/sniproxy.cpp https://commits.kde.org/plasma-workspace/ea415539fc6256494d5c12296a6216e522= e12b0a diff --git a/applets/appmenu/lib/appmenuapplet.cpp b/applets/appmenu/lib/ap= pmenuapplet.cpp index 495e0414..fd7b660d 100644 --- a/applets/appmenu/lib/appmenuapplet.cpp +++ b/applets/appmenu/lib/appmenuapplet.cpp @@ -174,7 +174,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx) QMenu *actionMenu =3D createMenu(idx); if (actionMenu) { = - //this is a workaround where Qt will fail to realise a mouse has b= een released + //this is a workaround where Qt will fail to realize a mouse has b= een released // this happens if a window which does not accept focus spawns a n= ew 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 =3D m_currentMenu; m_currentMenu =3D actionMenu; if (oldMenu && oldMenu !=3D actionMenu) { - //dont initialize the currentIndex when another menu is al= ready shown + //don't initialize the currentIndex when another menu is a= lready shown disconnect(oldMenu, &QMenu::aboutToHide, this, &AppMenuApp= let::onMenuAboutToHide); oldMenu->hide(); } diff --git a/applets/appmenu/plugin/appmenumodel.h b/applets/appmenu/plugin= /appmenumodel.h index 7bd35fca..32fba6a5 100644 --- a/applets/appmenu/plugin/appmenumodel.h +++ b/applets/appmenu/plugin/appmenumodel.h @@ -19,6 +19,9 @@ * ******************************************************************/ = +#ifndef APPMENUMODEL_H +#define APPMENUMODEL_H + #include #include #include @@ -84,3 +87,4 @@ private: QPointer m_importer; }; = +#endif diff --git a/applets/calendar/package/contents/ui/configAgenda.qml b/applet= s/calendar/package/contents/ui/configAgenda.qml index c6fbf460..ff33ddde 100644 --- a/applets/calendar/package/contents/ui/configAgenda.qml +++ b/applets/calendar/package/contents/ui/configAgenda.qml @@ -51,4 +51,4 @@ Item { } } } -} \ No newline at end of file +} diff --git a/applets/devicenotifier/package/contents/ui/DeviceItem.qml b/ap= plets/devicenotifier/package/contents/ui/DeviceItem.qml index bd7c3584..a3828284 100644 --- a/applets/devicenotifier/package/contents/ui/DeviceItem.qml +++ b/applets/devicenotifier/package/contents/ui/DeviceItem.qml @@ -251,7 +251,7 @@ MouseArea { } else if (deviceItem.state =3D=3D 1) { return i18nc("Accessing is a less technical word f= or Mounting; translation should be short and mean \'Currently mounting this= device\'", "Accessing...") } else { - return i18nc("Removing is a less technical word fo= r Unmounting; translation shoud be short and mean \'Currently unmounting th= is device\'", "Removing...") + return i18nc("Removing is a less technical word fo= r Unmounting; translation should be short and mean \'Currently unmounting t= his device\'", "Removing...") } } } diff --git a/applets/digital-clock/CMakeLists.txt b/applets/digital-clock/C= MakeLists.txt index 3114564a..7eed012f 100644 --- a/applets/digital-clock/CMakeLists.txt +++ b/applets/digital-clock/CMakeLists.txt @@ -1,3 +1,3 @@ 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) diff --git a/applets/digital-clock/package/contents/ui/MonthMenu.qml b/appl= ets/digital-clock/package/contents/ui/MonthMenu.qml index 170ce62d..6bff1205 100644 --- a/applets/digital-clock/package/contents/ui/MonthMenu.qml +++ b/applets/digital-clock/package/contents/ui/MonthMenu.qml @@ -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 { } diff --git a/applets/digital-clock/plugin/digitalclockplugin.h b/applets/di= gital-clock/plugin/digitalclockplugin.h index 1d5d678d..d80e0516 100644 --- a/applets/digital-clock/plugin/digitalclockplugin.h +++ b/applets/digital-clock/plugin/digitalclockplugin.h @@ -17,8 +17,8 @@ */ = = -#ifndef NOTIFICATIONSHELPERPLUGIN_H -#define NOTIFICATIONSHELPERPLUGIN_H +#ifndef DIGITALCLOCKPLUGIN_H +#define DIGITALCLOCKPLUGIN_H = #include = @@ -31,4 +31,4 @@ public: void registerTypes(const char *uri) override; }; = -#endif // NOTIFICATIONSHELPERPLUGIN_H +#endif // DIGITALCLOCKPLUGIN_H diff --git a/applets/notifications/package/contents/ui/ThumbnailStrip.qml b= /applets/notifications/package/contents/ui/ThumbnailStrip.qml index ea561e1b..3cf589aa 100644 --- a/applets/notifications/package/contents/ui/ThumbnailStrip.qml +++ b/applets/notifications/package/contents/ui/ThumbnailStrip.qml @@ -151,7 +151,7 @@ ListView { } } = - // first item determins the ListView height + // first item determines the ListView height Binding { target: previewList property: "implicitHeight" diff --git a/applets/notifications/plugin/thumbnailer.cpp b/applets/notific= ations/plugin/thumbnailer.cpp index 6b9c4e75..bfb80827 100644 --- a/applets/notifications/plugin/thumbnailer.cpp +++ b/applets/notifications/plugin/thumbnailer.cpp @@ -164,7 +164,7 @@ void Thumbnailer::showContextMenu(int x, int y, const Q= String &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 w= indow that takes focus and X grab // whilst the mouse is depressed // https://bugreports.qt.io/browse/QTBUG-59044 diff --git a/applets/systemmonitor/diskusage/contents/ui/diskusage.qml b/ap= plets/systemmonitor/diskusage/contents/ui/diskusage.qml index 52d10360..9cde32a6 100644 --- a/applets/systemmonitor/diskusage/contents/ui/diskusage.qml +++ b/applets/systemmonitor/diskusage/contents/ui/diskusage.qml @@ -85,4 +85,4 @@ Applet { } } } -} \ No newline at end of file +} diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemt= ray.cpp index 76bcf876..42d13126 100644 --- a/applets/systemtray/systemtray.cpp +++ b/applets/systemtray/systemtray.cpp @@ -163,7 +163,7 @@ void SystemTray::showPlasmoidMenu(QQuickItem *appletInt= erface, 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 w= indow 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 hav= e multiple applets + // insertMulti because it is possible (though poor form) to ha= ve multiple applets // with the same visible name but different plugins sortedApplets.insertMulti(info.name(), info); } diff --git a/appmenu/kdbusimporter.h b/appmenu/kdbusimporter.h index ead7d65f..0e196ba2 100644 --- a/appmenu/kdbusimporter.h +++ b/appmenu/kdbusimporter.h @@ -23,8 +23,8 @@ DEALINGS IN THE SOFTWARE. */ = -#ifndef KDBUSMENUIMPORTER_H -#define KDBUSMENUIMPORTER_H +#ifndef KDBUSIMPORTER_H +#define KDBUSIMPORTER_H = #include = @@ -51,4 +51,4 @@ protected: } }; = -#endif //KDBUSMENUIMPORTER_H +#endif //KDBUSIMPORTER_H diff --git a/components/shellprivate/shellprivateplugin.h b/components/shel= lprivate/shellprivateplugin.h index a00dac92..9f30d48e 100644 --- a/components/shellprivate/shellprivateplugin.h +++ b/components/shellprivate/shellprivateplugin.h @@ -20,8 +20,8 @@ THE SOFTWARE. */ = -#ifndef WIDGETEXPLORERPLUGIN_H -#define WIDGETEXPLORERPLUGIN_H +#ifndef SHELLPRIVATEPLUGIN_H +#define SHELLPRIVATEPLUGIN_H = #include = diff --git a/containmentactions/applauncher/launch.h b/containmentactions/a= pplauncher/launch.h index 95b5123e..8d954f5d 100644 --- a/containmentactions/applauncher/launch.h +++ b/containmentactions/applauncher/launch.h @@ -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 = diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/c= ontextmenu/menu.cpp index b2bd484e..a8480a68 100644 --- a/containmentactions/contextmenu/menu.cpp +++ b/containmentactions/contextmenu/menu.cpp @@ -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 diff --git a/dataengines/apps/appjob.h b/dataengines/apps/appjob.h index f2947ca1..b5c47923 100644 --- a/dataengines/apps/appjob.h +++ b/dataengines/apps/appjob.h @@ -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 @@ -42,4 +42,4 @@ class AppJob : public Plasma::ServiceJob = }; = -#endif // TASKJOB_H +#endif // APPJOB_H diff --git a/dataengines/apps/appsengine.h b/dataengines/apps/appsengine.h index 518c31c3..ed80de0f 100644 --- a/dataengines/apps/appsengine.h +++ b/dataengines/apps/appsengine.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 diff --git a/dataengines/apps/appservice.h b/dataengines/apps/appservice.h index 03a3be96..59f2351b 100644 --- a/dataengines/apps/appservice.h +++ b/dataengines/apps/appservice.h @@ -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 @@ -45,4 +45,4 @@ class AppService : public Plasma::Service AppSource *m_source; }; = -#endif // TASKSERVICE_H +#endif // APPSERVICE_H diff --git a/dataengines/apps/appsource.h b/dataengines/apps/appsource.h index a90b3135..e713298d 100644 --- a/dataengines/apps/appsource.h +++ b/dataengines/apps/appsource.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 @@ -56,4 +56,4 @@ class AppSource : public Plasma::DataContainer = }; = -#endif // TASKSOURCE_H +#endif // APPSOURCE_H diff --git a/dataengines/notifications/notificationsanitizer.cpp b/dataengi= nes/notifications/notificationsanitizer.cpp index 0d2452c2..9855f73b 100644 --- a/dataengines/notifications/notificationsanitizer.cpp +++ b/dataengines/notifications/notificationsanitizer.cpp @@ -38,7 +38,7 @@ QString NotificationSanitizer::parse(const QString &text) // can happen for example when "\n \n" is sent, this replaces // all
s in succsession with just one t.replace(QRegularExpression(QStringLiteral("
\\s*
(\\s|
)= *")), QLatin1String("
")); - // This fancy RegExp escapes every occurence of & since QtQuick Text w= ill 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 { character referen= ces will be allowed t.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|am= p);|#)")), QLatin1String("&")); diff --git a/dataengines/notifications/notificationsanitizer.h b/dataengine= s/notifications/notificationsanitizer.h index 173cc396..0b5cde18 100644 --- a/dataengines/notifications/notificationsanitizer.h +++ b/dataengines/notifications/notificationsanitizer.h @@ -17,6 +17,9 @@ * Boston, MA 02110-1301, USA. */ = +#ifndef NOTIFICATIONSANITIZER_H +#define NOTIFICATIONSANITIZER_H + #include = namespace NotificationSanitizer @@ -35,3 +38,5 @@ namespace NotificationSanitizer */ QString parse(const QString &in); } + +#endif diff --git a/dataengines/packagekit/packagekitengine.cpp b/dataengines/pack= agekit/packagekitengine.cpp index 3e372044..137781be 100644 --- a/dataengines/packagekit/packagekitengine.cpp +++ b/dataengines/packagekit/packagekitengine.cpp @@ -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" diff --git a/dataengines/share/shareprovider.cpp b/dataengines/share/sharep= rovider.cpp index 11fba096..72c1f920 100644 --- a/dataengines/share/shareprovider.cpp +++ b/dataengines/share/shareprovider.cpp @@ -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); } = diff --git a/dataengines/systemmonitor/systemmonitor.cpp b/dataengines/syst= emmonitor/systemmonitor.cpp index f0bfa218..80b90642 100644 --- a/dataengines/systemmonitor/systemmonitor.cpp +++ b/dataengines/systemmonitor/systemmonitor.cpp @@ -141,7 +141,7 @@ void SystemMonitorEngine::answerReceived(int id, const = QList &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 =3D containerForSource( newSensor= ); diff --git a/gmenu-dbusmenu-proxy/menu.cpp b/gmenu-dbusmenu-proxy/menu.cpp index 4e5ba6d9..b4566150 100644 --- a/gmenu-dbusmenu-proxy/menu.cpp +++ b/gmenu-dbusmenu-proxy/menu.cpp @@ -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 aw= ay, we'll also subscribe in onMenuChanged() if neccessary + // LibreOffice on startup fails to give us some menus right aw= ay, 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; diff --git a/gmenu-dbusmenu-proxy/window.cpp b/gmenu-dbusmenu-proxy/window.= cpp index d84760ec..ba26d7ab 100644 --- a/gmenu-dbusmenu-proxy/window.cpp +++ b/gmenu-dbusmenu-proxy/window.cpp @@ -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 n= eccessary + // If a particular entry is requested, see what it is and resolve as n= ecessary // for example the "File" entry on root is 0,0,1 but is a menu referen= ce to e.g. 1,0,0 // so resolve that and return the correct menu if (index > 0) { diff --git a/klipper/autotests/modeltest.h b/klipper/autotests/modeltest.h index a02f9905..4e9253d1 100644 --- a/klipper/autotests/modeltest.h +++ b/klipper/autotests/modeltest.h @@ -43,9 +43,9 @@ #ifndef MODELTEST_H #define MODELTEST_H = -#include -#include -#include +#include +#include +#include = class ModelTest : public QObject { diff --git a/krunner/view.cpp b/krunner/view.cpp index 53006be2..33ee575e 100644 --- a/krunner/view.cpp +++ b/krunner/view.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/ksmserver/logout-greeter/shutdowndlg.cpp b/ksmserver/logout-gr= eeter/shutdowndlg.cpp index a6d13d61..ec01894c 100644 --- a/ksmserver/logout-greeter/shutdowndlg.cpp +++ b/ksmserver/logout-greeter/shutdowndlg.cpp @@ -41,7 +41,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS= IN THE SOFTWARE. #include #include #include -#include = #include #include @@ -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 =3D rootObject() ? rootObject()->property= ("backgroundColor").value() : QColor(); diff --git a/kuiserver/tests/kuiservertest.h b/kuiserver/tests/kuiservertes= t.h index 9408c471..53946e71 100644 --- a/kuiserver/tests/kuiservertest.h +++ b/kuiserver/tests/kuiservertest.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ = -#ifndef __KJOBTEST_H__ -#define __KJOBTEST_H__ +#ifndef __KUISERVERTEST_H__ +#define __KUISERVERTEST_H__ = #include #include @@ -49,4 +49,4 @@ private: int seconds, total; }; = -#endif // __KJOBTEST_H__ +#endif // __KUISERVERTEST_H__ diff --git a/libcolorcorrect/compositorcoloradaptor.h b/libcolorcorrect/com= positorcoloradaptor.h index 266409d3..9bd3c207 100644 --- a/libcolorcorrect/compositorcoloradaptor.h +++ b/libcolorcorrect/compositorcoloradaptor.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 . *********************************************************************/ -#ifndef COLORCORRECT_COMPOSITORADAPTOR_H -#define COLORCORRECT_COMPOSITORADAPTOR_H +#ifndef COMPOSITORCOLORADAPTOR_H +#define COMPOSITORCOLORADAPTOR_H = #include #include @@ -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 diff --git a/libdbusmenuqt/dbusmenuimporter.cpp b/libdbusmenuqt/dbusmenuimp= orter.cpp index 702840fd..a23ed839 100644 --- a/libdbusmenuqt/dbusmenuimporter.cpp +++ b/libdbusmenuqt/dbusmenuimporter.cpp @@ -46,7 +46,6 @@ = //#define BENCHMARK #ifdef BENCHMARK -#include static QTime sChrono; #endif = diff --git a/libkworkspace/config-libkworkspace.h.cmake b/libkworkspace/con= fig-libkworkspace.h.cmake index d3d962f5..36a826ee 100644 --- a/libkworkspace/config-libkworkspace.h.cmake +++ b/libkworkspace/config-libkworkspace.h.cmake @@ -1,2 +1,2 @@ /* Define if you have X11 at all */ -#define HAVE_X11 ${X11_FOUND} \ No newline at end of file +#define HAVE_X11 ${X11_FOUND} diff --git a/libtaskmanager/abstracttasksmodeliface.h b/libtaskmanager/abst= racttasksmodeliface.h index 951b16b8..78811017 100644 --- a/libtaskmanager/abstracttasksmodeliface.h +++ b/libtaskmanager/abstracttasksmodeliface.h @@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General= Public License along with this library. If not, see . *********************************************************************/ = -#ifndef ABSTRACTASKSMODELIFACE_H -#define ABSTRACTASKSMODELIFACE_H +#ifndef ABSTRACTTASKSMODELIFACE_H +#define ABSTRACTTASKSMODELIFACE_H = #include = diff --git a/libtaskmanager/abstracttasksproxymodeliface.h b/libtaskmanager= /abstracttasksproxymodeliface.h index bd95bbe4..84467b90 100644 --- a/libtaskmanager/abstracttasksproxymodeliface.h +++ b/libtaskmanager/abstracttasksproxymodeliface.h @@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General= Public License along with this library. If not, see . *********************************************************************/ = -#ifndef ABSTRACTASKSPROXYMODELIFACE_H -#define ABSTRACTASKSPROXYMODELIFACE_H +#ifndef ABSTRACTTASKSPROXYMODELIFACE_H +#define ABSTRACTTASKSPROXYMODELIFACE_H = #include = diff --git a/libtaskmanager/tasktools.cpp b/libtaskmanager/tasktools.cpp index ed48fb7c..6be094e2 100644 --- a/libtaskmanager/tasktools.cpp +++ b/libtaskmanager/tasktools.cpp @@ -21,9 +21,6 @@ License along with this library. If not, see . #include "tasktools.h" #include "abstracttasksmodel.h" = -#include "tasktools.h" -#include "abstracttasksmodel.h" - #include #include #include diff --git a/libtaskmanager/tasktools.h b/libtaskmanager/tasktools.h index d8b12f58..b8b8ec79 100644 --- a/libtaskmanager/tasktools.h +++ b/libtaskmanager/tasktools.h @@ -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. * diff --git a/libtaskmanager/xwindowsystemeventbatcher.h b/libtaskmanager/xw= indowsystemeventbatcher.h index 4cd84894..c954473b 100644 --- a/libtaskmanager/xwindowsystemeventbatcher.h +++ b/libtaskmanager/xwindowsystemeventbatcher.h @@ -18,8 +18,8 @@ You should have received a copy of the GNU Lesser General= Public License along with this library. If not, see . *********************************************************************/ = -#ifndef XWIDOWSYSTEMEVENTBATCHER_H -#define XWIDOWSYSTEMEVENTBATCHER_H +#ifndef XWINDOWSYSTEMEVENTBATCHER_H +#define XWINDOWSYSTEMEVENTBATCHER_H = #include = diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/co= ntents/lockscreen/MainBlock.qml index 865ad643..9124c739 100644 --- a/lookandfeel/contents/lockscreen/MainBlock.qml +++ b/lookandfeel/contents/lockscreen/MainBlock.qml @@ -44,7 +44,7 @@ SessionManagementScreen { var password =3D 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); diff --git a/phonon/platform_kde/kdeplatformplugin.cpp b/phonon/platform_kd= e/kdeplatformplugin.cpp index cee4c8ad..f30cc71f 100644 --- a/phonon/platform_kde/kdeplatformplugin.cpp +++ b/phonon/platform_kde/kdeplatformplugin.cpp @@ -105,7 +105,7 @@ bool KdePlatformPlugin::isMimeTypeAvailable(const QStri= ng &/*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 conte= nt // streams, so mimetypes are too generic to properly define support= edness. // 2. just about every multimedia library in the world draws format su= pport // from a plugin based architecture which means that technically ev= erything diff --git a/runners/appstream/appstreamrunner.h b/runners/appstream/appstr= eamrunner.h index fbac0215..004c5f36 100644 --- a/runners/appstream/appstreamrunner.h +++ b/runners/appstream/appstreamrunner.h @@ -18,8 +18,8 @@ * along with this program. If not, see .= * *************************************************************************= **/ = -#ifndef INSTALLERRUNNER_H -#define INSTALLERRUNNER_H +#ifndef APPSTREAMRUNNER_H +#define APPSTREAMRUNNER_H = #include #include diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearc= hrunner.cpp index de70fcc0..a55912d6 100644 --- a/runners/baloo/baloosearchrunner.cpp +++ b/runners/baloo/baloosearchrunner.cpp @@ -32,7 +32,6 @@ #include #include #include -#include = #include #include diff --git a/runners/bookmarks/bookmarksrunner_defs.h b/runners/bookmarks/b= ookmarksrunner_defs.h index 211925af..8b1b732c 100644 --- a/runners/bookmarks/bookmarksrunner_defs.h +++ b/runners/bookmarks/bookmarksrunner_defs.h @@ -23,4 +23,4 @@ = #define kdbg_code 1207 = -#endif \ No newline at end of file +#endif diff --git a/runners/bookmarks/browsers/chrome.cpp b/runners/bookmarks/brow= sers/chrome.cpp index 3755f274..3e49c9fc 100644 --- a/runners/bookmarks/browsers/chrome.cpp +++ b/runners/bookmarks/browsers/chrome.cpp @@ -28,7 +28,6 @@ #include #include #include "bookmarksrunner_defs.h" -#include #include = class ProfileBookmarks { diff --git a/runners/bookmarks/faviconfromblob.h b/runners/bookmarks/favico= nfromblob.h index 54a5d20c..2d17e8dd 100644 --- a/runners/bookmarks/faviconfromblob.h +++ b/runners/bookmarks/faviconfromblob.h @@ -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 #include "favicon.h" @@ -47,4 +47,4 @@ private: void cleanCacheDirectory(); }; = -#endif // CHROMEFAVICON_H +#endif // FAVICONFROMBLOB_H diff --git a/runners/services/autotests/servicerunnertest.cpp b/runners/ser= vices/autotests/servicerunnertest.cpp index 7ae14533..f8b92256 100644 --- a/runners/services/autotests/servicerunnertest.cpp +++ b/runners/services/autotests/servicerunnertest.cpp @@ -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 acco= unt of having already // seen it. This test makes sure we find the right version. diff --git a/runners/solid/devicewrapper.h b/runners/solid/devicewrapper.h index d9dbb6cd..92f53ef9 100644 --- a/runners/solid/devicewrapper.h +++ b/runners/solid/devicewrapper.h @@ -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++ = diff --git a/runners/windows/config-windowsrunner.h.cmake b/runners/windows= /config-windowsrunner.h.cmake index d3d962f5..36a826ee 100644 --- a/runners/windows/config-windowsrunner.h.cmake +++ b/runners/windows/config-windowsrunner.h.cmake @@ -1,2 +1,2 @@ /* Define if you have X11 at all */ -#define HAVE_X11 ${X11_FOUND} \ No newline at end of file +#define HAVE_X11 ${X11_FOUND} diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml index 967fbc40..381bdba2 100644 --- a/sddm-theme/Login.qml +++ b/sddm-theme/Login.qml @@ -35,7 +35,7 @@ SessionManagementScreen { var password =3D 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); diff --git a/shell/alternativeshelper.h b/shell/alternativeshelper.h index 44e8f534..ae7f9c1c 100644 --- a/shell/alternativeshelper.h +++ b/shell/alternativeshelper.h @@ -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 = diff --git a/shell/desktopview.h b/shell/desktopview.h index 074afafe..59fa2366 100644 --- a/shell/desktopview.h +++ b/shell/desktopview.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1= 301, USA. */ = -#ifndef DESKTOVIEW_H -#define DESKTOVIEW_H +#ifndef DESKTOPVIEW_H +#define DESKTOPVIEW_H = = #include @@ -107,4 +107,4 @@ private: KWayland::Client::PlasmaShellSurface *m_shellSurface; }; = -#endif // DESKTOVIEW_H +#endif // DESKTOPVIEW_H diff --git a/shell/packageplugins/layouttemplate/layouttemplate.h b/shell/p= ackageplugins/layouttemplate/layouttemplate.h index 89d6eca4..fc44fef1 100644 --- a/shell/packageplugins/layouttemplate/layouttemplate.h +++ b/shell/packageplugins/layouttemplate/layouttemplate.h @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. = * **************************************************************************= *****/ = -#ifndef SHELLPACKAGES_H -#define SHELLPACKAGES_H +#ifndef LAYOUTTEMPLATE_H +#define LAYOUTTEMPLATE_H = #include = diff --git a/shell/packageplugins/wallpaperimages/wallpaperpackage.h b/shel= l/packageplugins/wallpaperimages/wallpaperpackage.h index aebf254f..f87eafd5 100644 --- a/shell/packageplugins/wallpaperimages/wallpaperpackage.h +++ b/shell/packageplugins/wallpaperimages/wallpaperpackage.h @@ -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 = diff --git a/shell/panelshadows_p.h b/shell/panelshadows_p.h index 81298742..037d37f2 100644 --- a/shell/panelshadows_p.h +++ b/shell/panelshadows_p.h @@ -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 = diff --git a/shell/panelview.h b/shell/panelview.h index 3a22d2b8..d12cba43 100644 --- a/shell/panelview.h +++ b/shell/panelview.h @@ -91,7 +91,7 @@ class PanelView : public PlasmaQuick::ContainmentView Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enable= dBorders 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 setScreen= ToFollow NOTIFY screenToFollowChanged) = diff --git a/shell/softwarerendernotifier.h b/shell/softwarerendernotifier.h index 59ef7638..88cfbe97 100644 --- a/shell/softwarerendernotifier.h +++ b/shell/softwarerendernotifier.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1= 301, USA. */ = +#ifndef SOFTWARERENDERNOTIFIER_H +#define SOFTWARERENDERNOTIFIER_H + #include = /** @@ -33,3 +36,5 @@ private: SoftwareRendererNotifier(QObject *parent=3Dnullptr); ~SoftwareRendererNotifier(); }; + +#endif diff --git a/shell/standaloneappcorona.h b/shell/standaloneappcorona.h index 0d774098..ea01d31f 100644 --- a/shell/standaloneappcorona.h +++ b/shell/standaloneappcorona.h @@ -19,8 +19,8 @@ * along with this program. If not, see */ = -#ifndef SIMPLESHELLCORONA_H -#define SIMPLESHELLCORONA_H +#ifndef STANDALONEAPPCORONA_H +#define STANDALONEAPPCORONA_H = #include #include "desktopview.h" diff --git a/startkde/kcminit/config-xcb.h.cmake b/startkde/kcminit/config-= xcb.h.cmake index d15a49a4..bff341fc 100644 --- a/startkde/kcminit/config-xcb.h.cmake +++ b/startkde/kcminit/config-xcb.h.cmake @@ -1,2 +1,2 @@ /* Define if you have XCB at all */ -#cmakedefine XCB_FOUND \ No newline at end of file +#cmakedefine XCB_FOUND diff --git a/wallpapers/image/autotests/testfindpreferredimage.cpp b/wallpa= pers/image/autotests/testfindpreferredimage.cpp index cfe4bc03..ac9b5c6a 100644 --- a/wallpapers/image/autotests/testfindpreferredimage.cpp +++ b/wallpapers/image/autotests/testfindpreferredimage.cpp @@ -57,7 +57,7 @@ void TestResolutions::testResolutions_data() qDebug() << formatResolution(image); } = - // The list of possible screen resolutions to test and the appropiate = images that should be chosen + // The list of possible screen resolutions to test and the appropriate= images that should be chosen QTest::addColumn("resolution"); QTest::addColumn("expected"); QTest::newRow("1280x1024") << QStringLiteral("1280x1024") << QStringLi= teral("1280x1024"); diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp index cf04f7a9..c3b38f3c 100644 --- a/wallpapers/image/image.cpp +++ b/wallpapers/image/image.cpp @@ -149,7 +149,7 @@ void Image::setRenderingMode(RenderingMode mode) updateDirWatch(m_slidePaths); updateDirWatch(m_slidePaths); } else { - // we need to reset the prefered image + // we need to reset the preferred image setSingleImage(); } } diff --git a/xembed-sni-proxy/Readme.md b/xembed-sni-proxy/Readme.md index 4201349a..3bfb77f5 100644 --- a/xembed-sni-proxy/Readme.md +++ b/xembed-sni-proxy/Readme.md @@ -11,7 +11,7 @@ This project should be portable onto all other DEs that s= peak SNI. ##How it works (in theory) = * We register a window as a system tray container -* We render embeded windows composited offscreen +* We render embedded windows composited offscreen * We render contents into an image and send this over DBus via the SNI pro= tocol * XDamage events trigger a repaint * Activate and context menu events are replyed via X send event into the e= mbedded container as left and right clicks diff --git a/xembed-sni-proxy/fdoselectionmanager.cpp b/xembed-sni-proxy/fd= oselectionmanager.cpp index 90703083..993d1db2 100644 --- a/xembed-sni-proxy/fdoselectionmanager.cpp +++ b/xembed-sni-proxy/fdoselectionmanager.cpp @@ -109,7 +109,7 @@ bool FdoSelectionManager::addDamageWatch(xcb_window_t c= lient) // if we would remove the event mask again, other areas will break. const auto changeAttrCookie =3D xcb_change_window_attributes_checked(c= , client, XCB_CW_EVENT_MASK, &events); QScopedPointer changeAt= trError(xcb_request_check(c, changeAttrCookie)); - // if window is gone by this point, it will be catched by eventFilter,= so no need to check later errors. + // if window is gone by this point, it will be caught by eventFilter, = so no need to check later errors. if (changeAttrError && changeAttrError->error_code =3D=3D XCB_WINDOW) { return false; } diff --git a/xembed-sni-proxy/snidbus.cpp b/xembed-sni-proxy/snidbus.cpp index 4ebb7a02..651d3b89 100644 --- a/xembed-sni-proxy/snidbus.cpp +++ b/xembed-sni-proxy/snidbus.cpp @@ -145,4 +145,4 @@ const QDBusArgument &operator>>(const QDBusArgument &ar= gument, KDbusToolTipStruc toolTip.subTitle =3D subTitle; = return argument; -} \ No newline at end of file +} diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp index c2ba4607..2949ba2f 100644 --- a/xembed-sni-proxy/sniproxy.cpp +++ b/xembed-sni-proxy/sniproxy.cpp @@ -101,7 +101,7 @@ SNIProxy::SNIProxy(xcb_window_t wid, QObject* parent): m_containerWid =3D xcb_generate_id(c); uint32_t values[2]; auto mask =3D XCB_CW_BACK_PIXEL | XCB_CW_OVERRIDE_REDIRECT; - values[0] =3D screen->black_pixel; //draw a solid background so the em= beded icon doesn't get garbage in it + values[0] =3D screen->black_pixel; //draw a solid background so the em= bedded icon doesn't get garbage in it values[1] =3D true; //bypass wM xcb_create_window (c, /* connection */ XCB_COPY_FROM_PARENT, /* depth */