Git commit bc9d074981f5147570ea22bbcfa8c67786b9fc07 by Laurent Montel. Committed on 27/09/2018 at 06:17. Pushed by mlaurent into branch 'master'. Fix pedentic + use nullptr + override M +1 -1 applets/kicker/plugin/abstractmodel.cpp M +1 -1 applets/kicker/plugin/abstractmodel.h M +2 -2 applets/kicker/plugin/appsmodel.h M +3 -3 applets/kicker/plugin/computermodel.h M +1 -1 applets/kicker/plugin/containmentinterface.h M +1 -1 applets/kicker/plugin/draghelper.h M +2 -2 applets/kicker/plugin/forwardingmodel.h M +1 -1 applets/kicker/plugin/funnelmodel.h M +1 -1 applets/kicker/plugin/kastatsfavoritesmodel.h M +1 -1 applets/kicker/plugin/menuentryeditor.h M +1 -1 applets/kicker/plugin/placeholdermodel.h M +1 -1 applets/kicker/plugin/processrunner.h M +1 -1 applets/kicker/plugin/recentcontactsmodel.h M +1 -1 applets/kicker/plugin/recentusagemodel.h M +1 -1 applets/kicker/plugin/rootmodel.h M +1 -1 applets/kicker/plugin/runnermatchesmodel.h M +3 -3 applets/kicker/plugin/runnermodel.h M +1 -1 applets/kicker/plugin/simplefavoritesmodel.h M +1 -1 applets/kicker/plugin/submenu.h M +1 -1 applets/kicker/plugin/systemmodel.h M +1 -1 applets/kicker/plugin/systemsettings.h M +1 -1 applets/kicker/plugin/wheelinterceptor.h M +1 -1 applets/kimpanel/backend/scim/main.cpp M +1 -1 applets/kimpanel/plugin/screen.h M +1 -1 applets/taskmanager/plugin/backend.h M +1 -1 kcms/cursortheme/xcursor/previewwidget.h M +1 -1 kcms/cursortheme/xcursor/sortproxymodel.h M +6 -6 kcms/cursortheme/xcursor/thememodel.h M +2 -2 kcms/fonts/fonts.h M +1 -1 kcms/formats/kcmformats.h M +1 -1 kcms/hardware/joystick/joystick.h M +1 -1 kcms/hardware/joystick/joywidget.h M +1 -1 kcms/hardware/joystick/poswidget.h M +4 -4 kcms/keyboard/kcm_view_models.h M +1 -1 kcms/keyboard/preview/kbpreviewframe.h M +1 -1 kcms/keys/select_scheme_dialog.h M +1 -1 kcms/kfontinst/dbus/FontinstIface.h M +1 -1 kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp M +1 -1 kcms/kfontinst/kcmfontinst/GroupList.cpp M +1 -1 kcms/kfontinst/kcmfontinst/GroupList.h M +2 -2 kcms/kfontinst/kcmfontinst/JobRunner.cpp M +1 -1 kcms/kfontinst/kcmfontinst/PreviewList.cpp M +1 -1 kcms/kfontinst/kcmfontinst/PreviewList.h M +5 -5 kcms/kfontinst/lib/FcEngine.cpp M +1 -1 kcms/kfontinst/lib/Misc.h M +1 -1 kcms/launch/launchfeedback.h M +1 -1 kcms/mouse/backends/kwin_wl/kwin_wl_backend.h M +1 -1 kcms/mouse/backends/x11/x11_libinput_backend.h M +1 -1 kcms/phonon/backendselection.h M +1 -1 kcms/phonon/devicepreference.h M +1 -1 kcms/solid_actions/ActionItem.h M +1 -1 kcms/solid_actions/ActionModel.h M +1 -1 kcms/solid_actions/PredicateModel.h M +1 -1 kcms/style/kcmstyle.cpp M +1 -1 kcms/touchpad/src/applet/touchpadservice.cpp M +1 -1 kcms/touchpad/src/applet/touchpadservice.h M +1 -1 kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.h M +1 -1 kcms/touchpad/src/backends/x11/xlibbackend.h M +1 -1 kcms/touchpad/src/kcm/xlib/customslider.h M +1 -1 kcms/touchpad/src/kcm/xlib/sliderpair.h M +1 -1 kcms/touchpad/src/kcm/xlib/touchpadparametersbase.h https://commits.kde.org/plasma-desktop/bc9d074981f5147570ea22bbcfa8c67786b9= fc07 diff --git a/applets/kicker/plugin/abstractmodel.cpp b/applets/kicker/plugi= n/abstractmodel.cpp index 6b170785..a4966d8d 100644 --- a/applets/kicker/plugin/abstractmodel.cpp +++ b/applets/kicker/plugin/abstractmodel.cpp @@ -92,7 +92,7 @@ AbstractModel *AbstractModel::modelForRow(int row) { Q_UNUSED(row) = - return 0; + return nullptr; } = int AbstractModel::rowForModel(AbstractModel *model) diff --git a/applets/kicker/plugin/abstractmodel.h b/applets/kicker/plugin/= abstractmodel.h index 7b48f78b..3e619248 100644 --- a/applets/kicker/plugin/abstractmodel.h +++ b/applets/kicker/plugin/abstractmodel.h @@ -36,7 +36,7 @@ class AbstractModel : public QAbstractListModel Q_PROPERTY(AbstractModel* favoritesModel READ favoritesModel WRITE set= FavoritesModel NOTIFY favoritesModelChanged) = public: - explicit AbstractModel(QObject *parent =3D 0); + explicit AbstractModel(QObject *parent =3D nullptr); ~AbstractModel(); = QHash roleNames() const override; diff --git a/applets/kicker/plugin/appsmodel.h b/applets/kicker/plugin/apps= model.h index 648ec0b0..516e0268 100644 --- a/applets/kicker/plugin/appsmodel.h +++ b/applets/kicker/plugin/appsmodel.h @@ -50,8 +50,8 @@ class AppsModel : public AbstractModel, public QQmlParser= Status = public: explicit AppsModel(const QString &entryPath =3D QString(), bool pa= ginate =3D false, int pageSize =3D 24, - bool flat =3D false, bool sorted =3D true, bool separators =3D= true, QObject *parent =3D 0); - explicit AppsModel(const QList entryList, bool de= leteEntriesOnDestruction, QObject *parent =3D 0); + bool flat =3D false, bool sorted =3D true, bool separators =3D= true, QObject *parent =3D nullptr); + explicit AppsModel(const QList entryList, bool de= leteEntriesOnDestruction, QObject *parent =3D nullptr); ~AppsModel(); = QString description() const override; diff --git a/applets/kicker/plugin/computermodel.h b/applets/kicker/plugin/= computermodel.h index 36b88185..7d16fc4f 100644 --- a/applets/kicker/plugin/computermodel.h +++ b/applets/kicker/plugin/computermodel.h @@ -40,7 +40,7 @@ class FilteredPlacesModel : public QSortFilterProxyModel Q_OBJECT = public: - FilteredPlacesModel(QObject *parent =3D 0); + FilteredPlacesModel(QObject *parent =3D nullptr); ~FilteredPlacesModel(); = QUrl url(const QModelIndex &index) const; @@ -60,7 +60,7 @@ class RunCommandModel : public AbstractModel Q_OBJECT = public: - RunCommandModel(QObject *parent =3D 0); + RunCommandModel(QObject *parent =3D nullptr); ~RunCommandModel(); = QString description() const override; @@ -81,7 +81,7 @@ class ComputerModel : public ForwardingModel Q_PROPERTY(QStringList systemApplications READ systemApplications WRIT= E setSystemApplications NOTIFY systemApplicationsChanged) = public: - explicit ComputerModel(QObject *parent =3D 0); + explicit ComputerModel(QObject *parent =3D nullptr); ~ComputerModel(); = QString description() const override; diff --git a/applets/kicker/plugin/containmentinterface.h b/applets/kicker/= plugin/containmentinterface.h index 2700ad86..94ab39fe 100644 --- a/applets/kicker/plugin/containmentinterface.h +++ b/applets/kicker/plugin/containmentinterface.h @@ -41,7 +41,7 @@ class ContainmentInterface : public QObject = Q_ENUM(Target) = - ContainmentInterface(QObject *parent =3D 0); + ContainmentInterface(QObject *parent =3D nullptr); ~ContainmentInterface(); = static Q_INVOKABLE bool mayAddLauncher(QObject *appletInterface, T= arget target, const QString &entryPath =3D QString()); diff --git a/applets/kicker/plugin/draghelper.h b/applets/kicker/plugin/dra= ghelper.h index b64203a9..84c9f4f3 100644 --- a/applets/kicker/plugin/draghelper.h +++ b/applets/kicker/plugin/draghelper.h @@ -32,7 +32,7 @@ class DragHelper : public QObject Q_PROPERTY(int dragIconSize READ dragIconSize WRITE setDragIconSize NO= TIFY dragIconSizeChanged) = public: - DragHelper(QObject *parent =3D 0); + DragHelper(QObject *parent =3D nullptr); ~DragHelper(); = int dragIconSize() const; diff --git a/applets/kicker/plugin/forwardingmodel.h b/applets/kicker/plugi= n/forwardingmodel.h index 088dbbd8..3ab31aca 100644 --- a/applets/kicker/plugin/forwardingmodel.h +++ b/applets/kicker/plugin/forwardingmodel.h @@ -28,10 +28,10 @@ class ForwardingModel : public AbstractModel { Q_OBJECT = - Q_PROPERTY(QAbstractItemModel* sourceModel READ sourceModel WRITE setS= ourceModel NOTIFY sourceModelChanged); + Q_PROPERTY(QAbstractItemModel* sourceModel READ sourceModel WRITE setS= ourceModel NOTIFY sourceModelChanged) = public: - explicit ForwardingModel(QObject *parent =3D 0); + explicit ForwardingModel(QObject *parent =3D nullptr); ~ForwardingModel(); = QString description() const override; diff --git a/applets/kicker/plugin/funnelmodel.h b/applets/kicker/plugin/fu= nnelmodel.h index 1550388c..b3feeb40 100644 --- a/applets/kicker/plugin/funnelmodel.h +++ b/applets/kicker/plugin/funnelmodel.h @@ -27,7 +27,7 @@ class FunnelModel : public ForwardingModel Q_OBJECT = public: - explicit FunnelModel(QObject *parent =3D 0); + explicit FunnelModel(QObject *parent =3D nullptr); ~FunnelModel(); = void setSourceModel(QAbstractItemModel *model) override; diff --git a/applets/kicker/plugin/kastatsfavoritesmodel.h b/applets/kicker= /plugin/kastatsfavoritesmodel.h index f41e4d09..a4104225 100644 --- a/applets/kicker/plugin/kastatsfavoritesmodel.h +++ b/applets/kicker/plugin/kastatsfavoritesmodel.h @@ -51,7 +51,7 @@ class KAStatsFavoritesModel : public PlaceholderModel Q_PROPERTY(QObject* activities READ activities CONSTANT) = public: - explicit KAStatsFavoritesModel(QObject *parent =3D 0); + explicit KAStatsFavoritesModel(QObject *parent =3D nullptr); ~KAStatsFavoritesModel(); = QString description() const; diff --git a/applets/kicker/plugin/menuentryeditor.h b/applets/kicker/plugi= n/menuentryeditor.h index 49b8c249..7484afba 100644 --- a/applets/kicker/plugin/menuentryeditor.h +++ b/applets/kicker/plugin/menuentryeditor.h @@ -27,7 +27,7 @@ class MenuEntryEditor : public QObject Q_OBJECT = public: - MenuEntryEditor(QObject *parent =3D 0); + MenuEntryEditor(QObject *parent =3D nullptr); ~MenuEntryEditor(); = bool canEdit(const QString &entryPath) const; diff --git a/applets/kicker/plugin/placeholdermodel.h b/applets/kicker/plug= in/placeholdermodel.h index c6835d8c..977f9f27 100644 --- a/applets/kicker/plugin/placeholdermodel.h +++ b/applets/kicker/plugin/placeholdermodel.h @@ -34,7 +34,7 @@ class PlaceholderModel : public AbstractModel Q_PROPERTY(int dropPlaceholderIndex READ dropPlaceholderIndex WRITE se= tDropPlaceholderIndex NOTIFY dropPlaceholderIndexChanged) = public: - explicit PlaceholderModel(QObject *parent =3D 0); + explicit PlaceholderModel(QObject *parent =3D nullptr); ~PlaceholderModel(); = QString description() const; diff --git a/applets/kicker/plugin/processrunner.h b/applets/kicker/plugin/= processrunner.h index 8390bc8c..a9005e33 100644 --- a/applets/kicker/plugin/processrunner.h +++ b/applets/kicker/plugin/processrunner.h @@ -27,7 +27,7 @@ class ProcessRunner : public QObject Q_OBJECT = public: - ProcessRunner(QObject *parent =3D 0); + ProcessRunner(QObject *parent =3D nullptr); ~ProcessRunner(); = Q_INVOKABLE void runMenuEditor(); diff --git a/applets/kicker/plugin/recentcontactsmodel.h b/applets/kicker/p= lugin/recentcontactsmodel.h index 1183655d..5f5d3be3 100644 --- a/applets/kicker/plugin/recentcontactsmodel.h +++ b/applets/kicker/plugin/recentcontactsmodel.h @@ -32,7 +32,7 @@ class RecentContactsModel : public ForwardingModel Q_OBJECT = public: - explicit RecentContactsModel(QObject *parent =3D 0); + explicit RecentContactsModel(QObject *parent =3D nullptr); ~RecentContactsModel(); = QString description() const override; diff --git a/applets/kicker/plugin/recentusagemodel.h b/applets/kicker/plug= in/recentusagemodel.h index 6e92958b..816e0a86 100644 --- a/applets/kicker/plugin/recentusagemodel.h +++ b/applets/kicker/plugin/recentusagemodel.h @@ -68,7 +68,7 @@ class RecentUsageModel : public ForwardingModel, public Q= QmlParserStatus enum Ordering { Recent, Popular }; = explicit RecentUsageModel( - QObject *parent =3D 0, + QObject *parent =3D nullptr, IncludeUsage usage =3D AppsAndDocs, int ordering =3D Recent); ~RecentUsageModel(); diff --git a/applets/kicker/plugin/rootmodel.h b/applets/kicker/plugin/root= model.h index 3101095c..3f1d425f 100644 --- a/applets/kicker/plugin/rootmodel.h +++ b/applets/kicker/plugin/rootmodel.h @@ -60,7 +60,7 @@ class RootModel : public AppsModel Q_PROPERTY(bool showPowerSession READ showPowerSession WRITE setShowPo= werSession NOTIFY showPowerSessionChanged) = public: - explicit RootModel(QObject *parent =3D 0); + explicit RootModel(QObject *parent =3D nullptr); ~RootModel(); = QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRo= le) const override; diff --git a/applets/kicker/plugin/runnermatchesmodel.h b/applets/kicker/pl= ugin/runnermatchesmodel.h index 063d2d0c..932fefe0 100644 --- a/applets/kicker/plugin/runnermatchesmodel.h +++ b/applets/kicker/plugin/runnermatchesmodel.h @@ -37,7 +37,7 @@ class RunnerMatchesModel : public AbstractModel = public: explicit RunnerMatchesModel(const QString &runnerId, const QString= &name, - Plasma::RunnerManager *manager, QObject *parent =3D 0); + Plasma::RunnerManager *manager, QObject *parent =3D nullptr); = QString description() const override; = diff --git a/applets/kicker/plugin/runnermodel.h b/applets/kicker/plugin/ru= nnermodel.h index 7685c1ab..65c23f6d 100644 --- a/applets/kicker/plugin/runnermodel.h +++ b/applets/kicker/plugin/runnermodel.h @@ -42,13 +42,13 @@ class RunnerModel : public QAbstractListModel Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(AbstractModel* favoritesModel READ favoritesModel WRITE set= FavoritesModel NOTIFY favoritesModelChanged) Q_PROPERTY(QObject* appletInterface READ appletInterface WRITE setAppl= etInterface NOTIFY appletInterfaceChanged) - Q_PROPERTY(QStringList runners READ runners WRITE setRunners NOTIFY ru= nnersChanged); - Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged= ); + Q_PROPERTY(QStringList runners READ runners WRITE setRunners NOTIFY ru= nnersChanged) + Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged) Q_PROPERTY(bool mergeResults READ mergeResults WRITE setMergeResults N= OTIFY mergeResultsChanged) Q_PROPERTY(bool deleteWhenEmpty READ deleteWhenEmpty WRITE setDeleteWh= enEmpty NOTIFY deleteWhenEmptyChanged) = public: - explicit RunnerModel(QObject *parent =3D 0); + explicit RunnerModel(QObject *parent =3D nullptr); ~RunnerModel(); = QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRo= le) const override; diff --git a/applets/kicker/plugin/simplefavoritesmodel.h b/applets/kicker/= plugin/simplefavoritesmodel.h index 77bb6c6a..4d4253b5 100644 --- a/applets/kicker/plugin/simplefavoritesmodel.h +++ b/applets/kicker/plugin/simplefavoritesmodel.h @@ -36,7 +36,7 @@ class SimpleFavoritesModel : public AbstractModel Q_PROPERTY(int dropPlaceholderIndex READ dropPlaceholderIndex WRITE se= tDropPlaceholderIndex NOTIFY dropPlaceholderIndexChanged) = public: - explicit SimpleFavoritesModel(QObject *parent =3D 0); + explicit SimpleFavoritesModel(QObject *parent =3D nullptr); ~SimpleFavoritesModel(); = QString description() const override; diff --git a/applets/kicker/plugin/submenu.h b/applets/kicker/plugin/submen= u.h index 43852e80..2ceaa452 100644 --- a/applets/kicker/plugin/submenu.h +++ b/applets/kicker/plugin/submenu.h @@ -33,7 +33,7 @@ class SubMenu : public PlasmaQuick::Dialog Q_PROPERTY(bool facingLeft READ facingLeft NOTIFY facingLeftChanged) = public: - SubMenu(QQuickItem *parent =3D 0); + SubMenu(QQuickItem *parent =3D nullptr); ~SubMenu(); = Q_INVOKABLE QRect availableScreenRectForItem(QQuickItem *item) con= st; diff --git a/applets/kicker/plugin/systemmodel.h b/applets/kicker/plugin/sy= stemmodel.h index a1d9e39e..ff0a0c83 100644 --- a/applets/kicker/plugin/systemmodel.h +++ b/applets/kicker/plugin/systemmodel.h @@ -29,7 +29,7 @@ class SystemModel : public AbstractModel Q_OBJECT = public: - explicit SystemModel(QObject *parent =3D 0); + explicit SystemModel(QObject *parent =3D nullptr); ~SystemModel(); = QString description() const override; diff --git a/applets/kicker/plugin/systemsettings.h b/applets/kicker/plugin= /systemsettings.h index 9485f4eb..0d6c762c 100644 --- a/applets/kicker/plugin/systemsettings.h +++ b/applets/kicker/plugin/systemsettings.h @@ -27,7 +27,7 @@ class SystemSettings : public QObject Q_OBJECT = public: - SystemSettings(QObject *parent =3D 0); + SystemSettings(QObject *parent =3D nullptr); ~SystemSettings(); = Q_INVOKABLE QString picturesLocation() const; diff --git a/applets/kicker/plugin/wheelinterceptor.h b/applets/kicker/plug= in/wheelinterceptor.h index 59edf060..612f718b 100644 --- a/applets/kicker/plugin/wheelinterceptor.h +++ b/applets/kicker/plugin/wheelinterceptor.h @@ -30,7 +30,7 @@ class WheelInterceptor : public QQuickItem Q_PROPERTY(QQuickItem* destination READ destination WRITE setDestinati= on NOTIFY destinationChanged) = public: - WheelInterceptor(QQuickItem *parent =3D 0); + WheelInterceptor(QQuickItem *parent =3D nullptr); ~WheelInterceptor(); = QQuickItem *destination() const; diff --git a/applets/kimpanel/backend/scim/main.cpp b/applets/kimpanel/back= end/scim/main.cpp index 5ae36c27..b1ff48e7 100644 --- a/applets/kimpanel/backend/scim/main.cpp +++ b/applets/kimpanel/backend/scim/main.cpp @@ -1258,7 +1258,7 @@ int main(int argc, char *argv []) KDE_signal(SIGINT, signalhandler); KDE_signal(SIGHUP, signalhandler); = - const char *p =3D qgetenv("DISPLAY"); + const char *p =3D qgetenv("DISPLAY").constData(); if (p) display_name =3D String(p); = if (!initialize_panel_agent(config_name, display_name, should_resident= )) { diff --git a/applets/kimpanel/plugin/screen.h b/applets/kimpanel/plugin/scr= een.h index 34ac74b2..be434c3a 100644 --- a/applets/kimpanel/plugin/screen.h +++ b/applets/kimpanel/plugin/screen.h @@ -28,7 +28,7 @@ class Screen : public QObject { Q_OBJECT public: - Screen(QObject* parent =3D 0); + Screen(QObject* parent =3D nullptr); ~Screen(); = Q_INVOKABLE QRect geometryForPoint(int x, int y); diff --git a/applets/taskmanager/plugin/backend.h b/applets/taskmanager/plu= gin/backend.h index 0ddacb94..d5476f86 100644 --- a/applets/taskmanager/plugin/backend.h +++ b/applets/taskmanager/plugin/backend.h @@ -56,7 +56,7 @@ class Backend : public QObject = Q_ENUM(MiddleClickAction); = - Backend(QObject *parent =3D 0); + Backend(QObject *parent =3D nullptr); ~Backend(); = QQuickItem *taskManagerItem() const; diff --git a/kcms/cursortheme/xcursor/previewwidget.h b/kcms/cursortheme/xc= ursor/previewwidget.h index 1028b1e9..a23090d7 100644 --- a/kcms/cursortheme/xcursor/previewwidget.h +++ b/kcms/cursortheme/xcursor/previewwidget.h @@ -35,7 +35,7 @@ class PreviewWidget : public QQuickPaintedItem = = public: - PreviewWidget(QQuickItem *parent =3D 0); + PreviewWidget(QQuickItem *parent =3D nullptr); ~PreviewWidget(); = void setTheme(const CursorTheme *theme, const int size); diff --git a/kcms/cursortheme/xcursor/sortproxymodel.h b/kcms/cursortheme/x= cursor/sortproxymodel.h index 650ad039..67fac0ea 100644 --- a/kcms/cursortheme/xcursor/sortproxymodel.h +++ b/kcms/cursortheme/xcursor/sortproxymodel.h @@ -36,7 +36,7 @@ class SortProxyModel : public QSortFilterProxyModel { Q_OBJECT public: - SortProxyModel(QObject *parent =3D 0) : QSortFilterProxyModel(pare= nt) {} + SortProxyModel(QObject *parent =3D nullptr) : QSortFilterProxyMode= l(parent) {} ~SortProxyModel() {} QHash roleNames() const; inline const CursorTheme *theme(const QModelIndex &index) const; diff --git a/kcms/cursortheme/xcursor/thememodel.h b/kcms/cursortheme/xcurs= or/thememodel.h index a9ff4a20..58af9576 100644 --- a/kcms/cursortheme/xcursor/thememodel.h +++ b/kcms/cursortheme/xcursor/thememodel.h @@ -60,14 +60,14 @@ class CursorThemeModel : public QAbstractTableModel Q_OBJECT = public: - CursorThemeModel(QObject *parent =3D 0); - ~CursorThemeModel(); - QHash roleNames() const; + explicit CursorThemeModel(QObject *parent =3D nullptr); + ~CursorThemeModel() override; + QHash roleNames() const override; inline int columnCount(const QModelIndex &parent =3D QModelIndex())= const; inline int rowCount(const QModelIndex &parent =3D QModelIndex()) c= onst; - QVariant headerData(int section, Qt::Orientation orientation, int = role) const; - QVariant data(const QModelIndex &index, int role) const; - void sort(int column, Qt::SortOrder order =3D Qt::AscendingOrder); + QVariant headerData(int section, Qt::Orientation orientation, int = role) const override; + QVariant data(const QModelIndex &index, int role) const override; + void sort(int column, Qt::SortOrder order =3D Qt::AscendingOrder) = override; = /// Returns the CursorTheme at @p index. const CursorTheme *theme(const QModelIndex &index); diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h index ba2c9887..25433b29 100644 --- a/kcms/fonts/fonts.h +++ b/kcms/fonts/fonts.h @@ -39,9 +39,9 @@ class FontAASettings : public QObject Q_OBJECT = Q_PROPERTY(QAbstractItemModel *subPixelOptionsModel READ subPixelOptio= nsModel CONSTANT) - Q_PROPERTY(int subPixelCurrentIndex READ subPixelCurrentIndex WRITE se= tSubPixelCurrentIndex NOTIFY subPixelCurrentIndexChanged); + Q_PROPERTY(int subPixelCurrentIndex READ subPixelCurrentIndex WRITE se= tSubPixelCurrentIndex NOTIFY subPixelCurrentIndexChanged) Q_PROPERTY(QAbstractItemModel *hintingOptionsModel READ hintingOptions= Model CONSTANT) - Q_PROPERTY(int hintingCurrentIndex READ hintingCurrentIndex WRITE setH= intingCurrentIndex NOTIFY hintingCurrentIndexChanged); + Q_PROPERTY(int hintingCurrentIndex READ hintingCurrentIndex WRITE setH= intingCurrentIndex NOTIFY hintingCurrentIndexChanged) = Q_PROPERTY(bool exclude READ exclude WRITE setExclude NOTIFY excludeCh= anged) Q_PROPERTY(int excludeTo READ excludeTo WRITE setExcludeTo NOTIFY excl= udeToChanged) diff --git a/kcms/formats/kcmformats.h b/kcms/formats/kcmformats.h index 1fcf8cc7..5ee3ee50 100644 --- a/kcms/formats/kcmformats.h +++ b/kcms/formats/kcmformats.h @@ -36,7 +36,7 @@ class KCMFormats : public KCModule Q_OBJECT = public: - explicit KCMFormats(QWidget *parent =3D 0, const QVariantList &list = =3D QVariantList()); + explicit KCMFormats(QWidget *parent =3D nullptr, const QVariantList &l= ist =3D QVariantList()); ~KCMFormats(); = void load() override; diff --git a/kcms/hardware/joystick/joystick.h b/kcms/hardware/joystick/joy= stick.h index bbb6f2f6..b1f7abed 100644 --- a/kcms/hardware/joystick/joystick.h +++ b/kcms/hardware/joystick/joystick.h @@ -34,7 +34,7 @@ class Joystick: public KCModule Q_OBJECT = public: - explicit Joystick(QWidget *parent =3D 0, const QVariantList &list =3D = QVariantList()); + explicit Joystick(QWidget *parent =3D nullptr, const QVariantList &lis= t =3D QVariantList()); = void load() override; void defaults() override; diff --git a/kcms/hardware/joystick/joywidget.h b/kcms/hardware/joystick/jo= ywidget.h index 74e99d17..76c403a8 100644 --- a/kcms/hardware/joystick/joywidget.h +++ b/kcms/hardware/joystick/joywidget.h @@ -41,7 +41,7 @@ class JoyWidget : public QWidget Q_OBJECT = public: - JoyWidget(QWidget *parent =3D 0); + JoyWidget(QWidget *parent =3D nullptr); = ~JoyWidget(); = diff --git a/kcms/hardware/joystick/poswidget.h b/kcms/hardware/joystick/po= swidget.h index c7a3dadd..7cf28907 100644 --- a/kcms/hardware/joystick/poswidget.h +++ b/kcms/hardware/joystick/poswidget.h @@ -33,7 +33,7 @@ class PosWidget : public QWidget Q_OBJECT = public: - PosWidget(QWidget *parent =3D 0); + PosWidget(QWidget *parent =3D nullptr); = void changeX(int x); void changeY(int y); diff --git a/kcms/keyboard/kcm_view_models.h b/kcms/keyboard/kcm_view_model= s.h index 5137a913..bc712318 100644 --- a/kcms/keyboard/kcm_view_models.h +++ b/kcms/keyboard/kcm_view_models.h @@ -35,7 +35,7 @@ class LayoutsTableModel : public QAbstractTableModel Q_OBJECT = public: - LayoutsTableModel(Rules* rules, Flags *flags, KeyboardConfig* keyboar= dConfig, QObject *parent =3D 0); + LayoutsTableModel(Rules* rules, Flags *flags, KeyboardConfig* keyboar= dConfig, QObject *parent =3D nullptr); = int columnCount(const QModelIndex&) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; @@ -71,7 +71,7 @@ class LabelEditDelegate : public QStyledItemDelegate Q_OBJECT = public: - explicit LabelEditDelegate(const KeyboardConfig* keyboardConfig, QObject = *parent =3D 0); + explicit LabelEditDelegate(const KeyboardConfig* keyboardConfig, QObject = *parent =3D nullptr); = QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; @@ -90,7 +90,7 @@ class VariantComboDelegate : public QStyledItemDelegate Q_OBJECT = public: - VariantComboDelegate(const KeyboardConfig* keyboardConfig, const Rules* r= ules, QObject *parent =3D 0); + VariantComboDelegate(const KeyboardConfig* keyboardConfig, const Rules* r= ules, QObject *parent =3D nullptr); = QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; @@ -112,7 +112,7 @@ class KKeySequenceWidgetDelegate : public QStyledItemDe= legate Q_OBJECT = public: - KKeySequenceWidgetDelegate(const KeyboardConfig* keyboardConfig_, QObject= *parent =3D 0); + KKeySequenceWidgetDelegate(const KeyboardConfig* keyboardConfig_, QObject= *parent =3D nullptr); = QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; diff --git a/kcms/keyboard/preview/kbpreviewframe.h b/kcms/keyboard/preview= /kbpreviewframe.h index 61894873..77c9c958 100644 --- a/kcms/keyboard/preview/kbpreviewframe.h +++ b/kcms/keyboard/preview/kbpreviewframe.h @@ -63,7 +63,7 @@ protected: bool event(QEvent *event) override; = public: - explicit KbPreviewFrame(QWidget *parent =3D 0); + explicit KbPreviewFrame(QWidget *parent =3D nullptr); ~KbPreviewFrame() override; void paintEvent(QPaintEvent *event) override; void generateKeyboardLayout(const QString &layout, const QString &layo= utVariant, const QString &model); diff --git a/kcms/keys/select_scheme_dialog.h b/kcms/keys/select_scheme_dia= log.h index 279436cd..face9106 100644 --- a/kcms/keys/select_scheme_dialog.h +++ b/kcms/keys/select_scheme_dialog.h @@ -31,7 +31,7 @@ class SelectSchemeDialog : public QDialog { Q_OBJECT public: - SelectSchemeDialog(QWidget *parent =3D 0); + SelectSchemeDialog(QWidget *parent =3D nullptr); ~SelectSchemeDialog(); = QUrl selectedScheme() const; diff --git a/kcms/kfontinst/dbus/FontinstIface.h b/kcms/kfontinst/dbus/Font= instIface.h index cda8cfc2..a04fa5ee 100644 --- a/kcms/kfontinst/dbus/FontinstIface.h +++ b/kcms/kfontinst/dbus/FontinstIface.h @@ -36,7 +36,7 @@ public: { return "org.kde.fontinst"; } = public: - OrgKdeFontinstInterface(const QString &service, const QString &path, c= onst QDBusConnection &connection, QObject *parent =3D 0); + OrgKdeFontinstInterface(const QString &service, const QString &path, c= onst QDBusConnection &connection, QObject *parent =3D nullptr); = ~OrgKdeFontinstInterface(); = diff --git a/kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp b/kcms/kfontin= st/kcmfontinst/DuplicatesDialog.cpp index 6f439fe8..a26d287e 100644 --- a/kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp +++ b/kcms/kfontinst/kcmfontinst/DuplicatesDialog.cpp @@ -179,7 +179,7 @@ void CDuplicatesDialog::scanFinished() top->setFont(COL_FILE, boldFont); } = - QTreeWidgetItem *item=3D0L; + QTreeWidgetItem *item=3D nullptr; for(int i=3D0; (item=3DitsView->topLevelItem(i)); ++i) item->setExpanded(true); = diff --git a/kcms/kfontinst/kcmfontinst/GroupList.cpp b/kcms/kfontinst/kcmf= ontinst/GroupList.cpp index 4e34ac54..3187466a 100644 --- a/kcms/kfontinst/kcmfontinst/GroupList.cpp +++ b/kcms/kfontinst/kcmfontinst/GroupList.cpp @@ -842,7 +842,7 @@ CGroupListView::CGroupListView(QWidget *parent, CGroupL= ist *model) this, SIGNAL(print())); } else - itsPrintAct=3D0L; + itsPrintAct=3D nullptr; itsMenu->addSeparator(); itsExportAct=3DitsMenu->addAction(QIcon::fromTheme("document-export"),= i18n("Export..."), this, SIGNAL(zip())); diff --git a/kcms/kfontinst/kcmfontinst/GroupList.h b/kcms/kfontinst/kcmfon= tinst/GroupList.h index c816b890..44676575 100644 --- a/kcms/kfontinst/kcmfontinst/GroupList.h +++ b/kcms/kfontinst/kcmfontinst/GroupList.h @@ -106,7 +106,7 @@ class CGroupList : public QAbstractItemModel = public: = - CGroupList(QWidget *parent =3D 0); + CGroupList(QWidget *parent =3D nullptr); ~CGroupList(); = QVariant data(const QModelIndex &index, int role) const overrid= e; diff --git a/kcms/kfontinst/kcmfontinst/JobRunner.cpp b/kcms/kfontinst/kcmf= ontinst/JobRunner.cpp index 124d4590..5a70f826 100644 --- a/kcms/kfontinst/kcmfontinst/JobRunner.cpp +++ b/kcms/kfontinst/kcmfontinst/JobRunner.cpp @@ -204,7 +204,7 @@ CJobRunner::CJobRunner(QWidget *parent, int xid) itsStack->insertWidget(PAGE_CANCEL, page); = if(KSharedConfig::openConfig(KFI_UI_CFG_FILE)->group(CFG_GROUP).readEn= try(CFG_DONT_SHOW_FINISHED_MSG, false)) - itsDontShowFinishedMsg=3D0L; + itsDontShowFinishedMsg=3D nullptr; else { page=3Dnew QFrame(itsStack); @@ -383,7 +383,7 @@ int CJobRunner::exec(ECommand cmd, const ItemList &urls= , bool destIsSystem) if(itsTempDir) { delete itsTempDir; - itsTempDir=3D0L; + itsTempDir=3D nullptr; } return rv; } diff --git a/kcms/kfontinst/kcmfontinst/PreviewList.cpp b/kcms/kfontinst/kc= mfontinst/PreviewList.cpp index 92250b1e..a0103f7c 100644 --- a/kcms/kfontinst/kcmfontinst/PreviewList.cpp +++ b/kcms/kfontinst/kcmfontinst/PreviewList.cpp @@ -37,7 +37,7 @@ namespace KFI { = -static CFcEngine * theFcEngine=3D0L; +static CFcEngine * theFcEngine=3D nullptr; = CPreviewList::CPreviewList(QObject *parent) : QAbstractItemModel(parent) diff --git a/kcms/kfontinst/kcmfontinst/PreviewList.h b/kcms/kfontinst/kcmf= ontinst/PreviewList.h index 6a58efb4..036231c1 100644 --- a/kcms/kfontinst/kcmfontinst/PreviewList.h +++ b/kcms/kfontinst/kcmfontinst/PreviewList.h @@ -60,7 +60,7 @@ class CPreviewList : public QAbstractItemModel = public: = - CPreviewList(QObject *parent =3D 0); + CPreviewList(QObject *parent =3D nullptr); virtual ~CPreviewList() { clear(); } = QVariant data(const QModelIndex &index, int role) const overrid= e; diff --git a/kcms/kfontinst/lib/FcEngine.cpp b/kcms/kfontinst/lib/FcEngine.= cpp index eeb504ec..62d628e8 100644 --- a/kcms/kfontinst/lib/FcEngine.cpp +++ b/kcms/kfontinst/lib/FcEngine.cpp @@ -136,7 +136,7 @@ static void closeFont(XftFont *&font) { if(font) XftFontClose(QX11Info::display(), font); - font=3D0L; + font=3D nullptr; } = class CFcEngine::Xft @@ -207,9 +207,9 @@ class CFcEngine::Xft bool drawGlyph(XftFont *xftFont, FT_UInt i, int &x, int &y, int w, int= h, int fontHeight,bool oneLine, QRect &r) const; bool drawAllGlyphs(XftFont *xftFont, int fontHeight, int &x, int &y, i= nt w, int h, - bool oneLine=3Dfalse, int max=3D-1, QRect *used=3D0= L) const; + bool oneLine=3Dfalse, int max=3D-1, QRect *used=3D = nullptr) const; bool drawAllChars(XftFont *xftFont, int fontHeight, int &x, int &y, in= t w, int h, - bool oneLine=3Dfalse, int max=3D-1, QRect *used=3D0L= ) const; + bool oneLine=3Dfalse, int max=3D-1, QRect *used=3D n= ullptr) const; QImage toImage(int w, int h) const; = private: @@ -223,7 +223,7 @@ class CFcEngine::Xft = CFcEngine::Xft::Xft() { - itsDraw=3D0L; + itsDraw=3D nullptr; itsTxtColor.color.alpha=3D0x0000; init(Qt::black, Qt::white, 64, 64); } @@ -234,7 +234,7 @@ CFcEngine::Xft::~Xft() if(itsDraw) { XftDrawDestroy(itsDraw); - itsDraw=3D0L; + itsDraw=3D nullptr; } } = diff --git a/kcms/kfontinst/lib/Misc.h b/kcms/kfontinst/lib/Misc.h index 644ae766..a5e7c784 100644 --- a/kcms/kfontinst/lib/Misc.h +++ b/kcms/kfontinst/lib/Misc.h @@ -103,7 +103,7 @@ namespace Misc { return folder+file[0].toLower()+'/'; } - extern Q_DECL_EXPORT QString app(const QString &name, const char *path= =3D0L); + extern Q_DECL_EXPORT QString app(const QString &name, const char *path= =3D nullptr); } = } diff --git a/kcms/launch/launchfeedback.h b/kcms/launch/launchfeedback.h index 0b5798c8..228d2b25 100644 --- a/kcms/launch/launchfeedback.h +++ b/kcms/launch/launchfeedback.h @@ -32,7 +32,7 @@ class LaunchFeedback : public KQuickAddons::ConfigModule Q_PROPERTY(int notificationTimeout READ notificationTimeout WRITE setN= otificationTimeout NOTIFY notificationTimeoutChanged) = public: - explicit LaunchFeedback(QObject* parent =3D 0, const QVariantList = &list =3D QVariantList()); + explicit LaunchFeedback(QObject* parent =3D nullptr, const QVarian= tList &list =3D QVariantList()); ~LaunchFeedback() override; = int busyCursorCurrentIndex() const; diff --git a/kcms/mouse/backends/kwin_wl/kwin_wl_backend.h b/kcms/mouse/bac= kends/kwin_wl/kwin_wl_backend.h index 6018d136..ad054e45 100644 --- a/kcms/mouse/backends/kwin_wl/kwin_wl_backend.h +++ b/kcms/mouse/backends/kwin_wl/kwin_wl_backend.h @@ -33,7 +33,7 @@ class KWinWaylandBackend : public InputBackend Q_PROPERTY(int deviceCount READ deviceCount CONSTANT) = public: - explicit KWinWaylandBackend(QObject *parent =3D 0); + explicit KWinWaylandBackend(QObject *parent =3D nullptr); ~KWinWaylandBackend(); = bool applyConfig() override; diff --git a/kcms/mouse/backends/x11/x11_libinput_backend.h b/kcms/mouse/ba= ckends/x11/x11_libinput_backend.h index 9343dc77..a0ac9f76 100644 --- a/kcms/mouse/backends/x11/x11_libinput_backend.h +++ b/kcms/mouse/backends/x11/x11_libinput_backend.h @@ -30,7 +30,7 @@ class X11LibinputBackend : public X11Backend Q_PROPERTY(int deviceCount READ deviceCount CONSTANT) = public: - explicit X11LibinputBackend(QObject *parent =3D 0); + explicit X11LibinputBackend(QObject *parent =3D nullptr); ~X11LibinputBackend() =3D default; = void kcmInit() override; diff --git a/kcms/phonon/backendselection.h b/kcms/phonon/backendselection.h index 15eea61c..f000e34c 100644 --- a/kcms/phonon/backendselection.h +++ b/kcms/phonon/backendselection.h @@ -51,7 +51,7 @@ class BackendSelection : public QWidget, private Ui::Back= endSelection { Q_OBJECT public: - explicit BackendSelection(QWidget *parent =3D 0); + explicit BackendSelection(QWidget *parent =3D nullptr); = void load(); void save(); diff --git a/kcms/phonon/devicepreference.h b/kcms/phonon/devicepreference.h index fcae4b2d..2ed8f368 100644 --- a/kcms/phonon/devicepreference.h +++ b/kcms/phonon/devicepreference.h @@ -39,7 +39,7 @@ class DevicePreference : public QWidget, private Ui::Devi= cePreference { Q_OBJECT public: - explicit DevicePreference(QWidget *parent =3D 0); + explicit DevicePreference(QWidget *parent =3D nullptr); ~DevicePreference() override; = void load(); diff --git a/kcms/solid_actions/ActionItem.h b/kcms/solid_actions/ActionIte= m.h index 9ebc7c02..0a88f5ca 100644 --- a/kcms/solid_actions/ActionItem.h +++ b/kcms/solid_actions/ActionItem.h @@ -35,7 +35,7 @@ class ActionItem: public QObject Q_OBJECT = public: - ActionItem(const QString& pathToDesktop, const QString& action, QObjec= t *parent =3D 0); + ActionItem(const QString& pathToDesktop, const QString& action, QObjec= t *parent =3D nullptr); ~ActionItem(); = bool isUserSupplied() const; diff --git a/kcms/solid_actions/ActionModel.h b/kcms/solid_actions/ActionMo= del.h index f333df54..eae6a029 100644 --- a/kcms/solid_actions/ActionModel.h +++ b/kcms/solid_actions/ActionModel.h @@ -29,7 +29,7 @@ class ActionModel : public QAbstractTableModel Q_OBJECT = public: - explicit ActionModel( QObject *parent =3D 0 ); + explicit ActionModel( QObject *parent =3D nullptr ); ~ActionModel(); = QVariant data( const QModelIndex &index, int role ) const override; diff --git a/kcms/solid_actions/PredicateModel.h b/kcms/solid_actions/Predi= cateModel.h index 70ca6b73..f59bd933 100644 --- a/kcms/solid_actions/PredicateModel.h +++ b/kcms/solid_actions/PredicateModel.h @@ -31,7 +31,7 @@ class PredicateModel : public QAbstractItemModel Q_OBJECT = public: - explicit PredicateModel( PredicateItem * menuRoot, QObject *parent =3D= 0 ); + explicit PredicateModel( PredicateItem * menuRoot, QObject *parent =3D= nullptr ); ~PredicateModel(); = QVariant data( const QModelIndex &index, int role ) const override; diff --git a/kcms/style/kcmstyle.cpp b/kcms/style/kcmstyle.cpp index 041b984f..ae6b4061 100644 --- a/kcms/style/kcmstyle.cpp +++ b/kcms/style/kcmstyle.cpp @@ -109,7 +109,7 @@ extern "C" class StylePreview : public QWidget, public Ui::StylePreview { public: - StylePreview(QWidget *parent =3D 0) + StylePreview(QWidget *parent =3D nullptr) : QWidget(parent) { setupUi(this); diff --git a/kcms/touchpad/src/applet/touchpadservice.cpp b/kcms/touchpad/s= rc/applet/touchpadservice.cpp index cdbae627..300b2301 100644 --- a/kcms/touchpad/src/applet/touchpadservice.cpp +++ b/kcms/touchpad/src/applet/touchpadservice.cpp @@ -38,7 +38,7 @@ class TouchpadJob : public Plasma::ServiceJob public: TouchpadJob(OrgKdeTouchpadInterface *daemon, const QString &destination, const QString &operation, - const QMap ¶meters, QObject *parent= =3D 0) + const QMap ¶meters, QObject *parent= =3D nullptr) : Plasma::ServiceJob(destination, operation, parameters, parent), m_daemon(daemon) { diff --git a/kcms/touchpad/src/applet/touchpadservice.h b/kcms/touchpad/src= /applet/touchpadservice.h index e9fbc673..28d6a823 100644 --- a/kcms/touchpad/src/applet/touchpadservice.h +++ b/kcms/touchpad/src/applet/touchpadservice.h @@ -27,7 +27,7 @@ class TouchpadService : public Plasma::Service Q_OBJECT public: TouchpadService(OrgKdeTouchpadInterface *daemon, const QString &destin= ation, - QObject *parent =3D 0); + QObject *parent =3D nullptr); ~TouchpadService(); = protected: diff --git a/kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.h b= /kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.h index 6529026b..b31e3a94 100644 --- a/kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.h +++ b/kcms/touchpad/src/backends/kwin_wayland/kwinwaylandbackend.h @@ -33,7 +33,7 @@ class KWinWaylandBackend : public TouchpadBackend Q_PROPERTY(int touchpadCount READ touchpadCount CONSTANT) = public: - explicit KWinWaylandBackend(QObject *parent =3D 0); + explicit KWinWaylandBackend(QObject *parent =3D nullptr); ~KWinWaylandBackend(); = bool applyConfig() override; diff --git a/kcms/touchpad/src/backends/x11/xlibbackend.h b/kcms/touchpad/s= rc/backends/x11/xlibbackend.h index 1f39c383..95a09f58 100644 --- a/kcms/touchpad/src/backends/x11/xlibbackend.h +++ b/kcms/touchpad/src/backends/x11/xlibbackend.h @@ -44,7 +44,7 @@ class XlibBackend : public TouchpadBackend Q_OBJECT = public: - static XlibBackend* initialize(QObject *parent =3D 0); + static XlibBackend* initialize(QObject *parent =3D nullptr); ~XlibBackend(); = bool applyConfig(const QVariantHash &) override; diff --git a/kcms/touchpad/src/kcm/xlib/customslider.h b/kcms/touchpad/src/= kcm/xlib/customslider.h index 8034ea35..d3550538 100644 --- a/kcms/touchpad/src/kcm/xlib/customslider.h +++ b/kcms/touchpad/src/kcm/xlib/customslider.h @@ -31,7 +31,7 @@ class CustomSlider : public QSlider NOTIFY valueChanged USER true) = public: - explicit CustomSlider(QWidget *parent =3D 0); + explicit CustomSlider(QWidget *parent =3D nullptr); = void setDoubleMinimum(double); double doubleMinimum() const; diff --git a/kcms/touchpad/src/kcm/xlib/sliderpair.h b/kcms/touchpad/src/kc= m/xlib/sliderpair.h index 6b9d69ed..1e495b7b 100644 --- a/kcms/touchpad/src/kcm/xlib/sliderpair.h +++ b/kcms/touchpad/src/kcm/xlib/sliderpair.h @@ -27,7 +27,7 @@ class SliderPair : public QObject { Q_OBJECT public: - SliderPair(QSlider *minSlider, QSlider *maxSlider, QObject *parent =3D= 0); + SliderPair(QSlider *minSlider, QSlider *maxSlider, QObject *parent =3D= nullptr); = private Q_SLOTS: void adjustMinSlider(); diff --git a/kcms/touchpad/src/kcm/xlib/touchpadparametersbase.h b/kcms/tou= chpad/src/kcm/xlib/touchpadparametersbase.h index 8d0a17d3..5e7ba1c5 100644 --- a/kcms/touchpad/src/kcm/xlib/touchpadparametersbase.h +++ b/kcms/touchpad/src/kcm/xlib/touchpadparametersbase.h @@ -27,7 +27,7 @@ class TouchpadParametersBase : public KCoreConfigSkeleton { public: explicit TouchpadParametersBase(const QString &configname =3D QString(= ), - QObject *parent =3D 0); + QObject *parent =3D nullptr); = QVariantHash values() const; void setValues(const QVariantHash &);