[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-workspace] /: Use nullptr
From: Laurent Montel <null () kde ! org>
Date: 2018-01-28 19:55:50
Message-ID: E1eft3O-0007yd-Th () code ! kde ! org
[Download RAW message or body]
Git commit 31421a6e5f8bcb31046f4f798e5a2a09fffb23e5 by Laurent Montel.
Committed on 28/01/2018 at 19:55.
Pushed by mlaurent into branch 'master'.
Use nullptr
M +1 -1 applets/appmenu/plugin/appmenumodel.h
M +2 -2 applets/digital-clock/plugin/timezonemodel.h
M +1 -1 applets/digital-clock/plugin/timezonesi18n.h
M +1 -1 applets/notifications/plugin/draghelper.h
M +1 -1 applets/notifications/plugin/notificationshelper.h
M +1 -1 components/keyboardlayout/keyboardlayout.h
M +2 -2 components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h
M +2 -2 components/shellprivate/widgetexplorer/widgetexplorer.h
M +1 -1 dataengines/activities/activityjob.h
M +1 -1 dataengines/applicationjobs/kuiserverengine.h
M +1 -1 dataengines/apps/appjob.h
M +1 -1 dataengines/executable/executable.h
M +1 -1 dataengines/mpris2/multiplexedservice.h
M +1 -1 dataengines/mpris2/multiplexer.h
M +1 -1 dataengines/packagekit/packagekitservice.h
M +1 -1 dataengines/powermanagement/powermanagementjob.h
M +1 -1 dataengines/powermanagement/powermanagementservice.h
M +1 -1 dataengines/share/shareprovider.h
M +1 -1 dataengines/share/shareservice.h
M +1 -1 dataengines/soliddevice/devicesignalmapmanager.h
M +3 -3 dataengines/soliddevice/devicesignalmapper.h
M +1 -1 dataengines/soliddevice/hddtemp.h
M +1 -1 dataengines/time/timeengine.h
M +1 -1 dataengines/time/timesource.h
M +1 -1 klipper/clipboardjob.h
M +3 -3 klipper/editactiondialog.cpp
M +2 -2 klipper/historyurlitem.cpp
M +1 -1 klipper/historyurlitem.h
M +9 -6 klipper/klipper.cpp
M +1 -1 klipper/klipper.h
M +1 -1 klipper/tray.cpp
M +4 -4 klipper/urlgrabber.cpp
M +1 -1 kuiserver/jobview.h
M +1 -1 kuiserver/progresslistmodel.h
M +1 -1 kuiserver/uiserver.cpp
M +4 -4 kuiserver/uiserver.h
M +1 -1 libdbusmenuqt/dbusmenuimporter.h
M +1 -1 libtaskmanager/activityinfo.h
M +1 -1 libtaskmanager/concatenatetasksproxymodel.h
M +1 -1 libtaskmanager/flattentaskgroupsproxymodel.h
M +1 -1 libtaskmanager/launchertasksmodel.h
M +1 -1 libtaskmanager/startuptasksmodel.h
M +1 -1 libtaskmanager/taskfilterproxymodel.h
M +1 -1 libtaskmanager/taskgroupingproxymodel.h
M +1 -1 libtaskmanager/tasksmodel.h
M +1 -1 libtaskmanager/virtualdesktopinfo.h
M +1 -1 libtaskmanager/waylandtasksmodel.h
M +1 -1 libtaskmanager/windowtasksmodel.h
M +1 -1 libtaskmanager/xwindowtasksmodel.h
M +1 -1 phonon/platform_kde/kiomediastream.h
M +1 -1 runners/bookmarks/browsers/opera.h
M +10 -8 runners/bookmarks/faviconfromblob.cpp
M +3 -3 runners/bookmarks/faviconfromblob.h
M +1 -1 runners/bookmarks/fetchsqlite.h
M +1 -1 runners/bookmarks/tests/testchromebookmarks.h
M +1 -1 runners/calculator/qalculate_engine.h
M +1 -1 shell/alternativeshelper.h
M +1 -1 shell/currentcontainmentactionsmodel.h
M +1 -1 shell/scripting/applet.h
M +1 -1 shell/scripting/containment.h
M +1 -1 shell/scripting/panel.h
M +1 -1 shell/scripting/scriptengine.h
M +1 -1 shell/scripting/widget.h
M +1 -1 shell/shellcorona.h
M +1 -2 systemmonitor/ksystemactivitydialog.cpp
M +1 -1 wallpapers/image/backgroundlistmodel.h
M +1 -1 wallpapers/image/image.h
M +1 -1 xembed-sni-proxy/sniproxy.h
https://commits.kde.org/plasma-workspace/31421a6e5f8bcb31046f4f798e5a2a09fffb23e5
diff --git a/applets/appmenu/plugin/appmenumodel.h \
b/applets/appmenu/plugin/appmenumodel.h index 13943967..438472ce 100644
--- a/applets/appmenu/plugin/appmenumodel.h
+++ b/applets/appmenu/plugin/appmenumodel.h
@@ -38,7 +38,7 @@ class AppMenuModel : public QAbstractListModel, public \
QAbstractNativeEventFilte
Q_PROPERTY(bool menuAvailable READ menuAvailable WRITE setMenuAvailable NOTIFY \
menuAvailableChanged)
public:
- explicit AppMenuModel(QObject *parent = 0);
+ explicit AppMenuModel(QObject *parent = nullptr);
~AppMenuModel();
enum AppMenuRole {
diff --git a/applets/digital-clock/plugin/timezonemodel.h \
b/applets/digital-clock/plugin/timezonemodel.h index 5f1237df..fed9b115 100644
--- a/applets/digital-clock/plugin/timezonemodel.h
+++ b/applets/digital-clock/plugin/timezonemodel.h
@@ -34,7 +34,7 @@ class TimeZoneFilterProxy : public QSortFilterProxyModel
Q_PROPERTY(QString filterString WRITE setFilterString MEMBER m_filterString \
NOTIFY filterStringChanged)
public:
- explicit TimeZoneFilterProxy(QObject *parent = 0);
+ explicit TimeZoneFilterProxy(QObject *parent = nullptr);
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const \
override;
void setFilterString(const QString &filterString);
@@ -55,7 +55,7 @@ class TimeZoneModel : public QAbstractListModel
Q_PROPERTY(QStringList selectedTimeZones WRITE setSelectedTimeZones MEMBER \
m_selectedTimeZones NOTIFY selectedTimeZonesChanged)
public:
- explicit TimeZoneModel(QObject *parent = 0);
+ explicit TimeZoneModel(QObject *parent = nullptr);
~TimeZoneModel() override;
enum Roles {
diff --git a/applets/digital-clock/plugin/timezonesi18n.h \
b/applets/digital-clock/plugin/timezonesi18n.h index 15332ab6..ea226e3c 100644
--- a/applets/digital-clock/plugin/timezonesi18n.h
+++ b/applets/digital-clock/plugin/timezonesi18n.h
@@ -31,7 +31,7 @@ class TimezonesI18n : public QObject
Q_OBJECT
public:
- TimezonesI18n(QObject *parent = 0);
+ TimezonesI18n(QObject *parent = nullptr);
Q_INVOKABLE QString i18nCity(const QString &city);
Q_INVOKABLE QString i18nContinents(const QString &continent);
Q_INVOKABLE QString i18nCountry(QLocale::Country country);
diff --git a/applets/notifications/plugin/draghelper.h \
b/applets/notifications/plugin/draghelper.h index a70cef58..6c623073 100644
--- a/applets/notifications/plugin/draghelper.h
+++ b/applets/notifications/plugin/draghelper.h
@@ -33,7 +33,7 @@ Q_OBJECT
Q_PROPERTY(bool dragActive READ dragActive NOTIFY dragActiveChanged)
public:
- DragHelper(QObject *parent = 0);
+ DragHelper(QObject *parent = nullptr);
~DragHelper();
bool dragActive() const;
diff --git a/applets/notifications/plugin/notificationshelper.h \
b/applets/notifications/plugin/notificationshelper.h index 2fe6e01a..64a16981 100644
--- a/applets/notifications/plugin/notificationshelper.h
+++ b/applets/notifications/plugin/notificationshelper.h
@@ -48,7 +48,7 @@ public:
};
Q_ENUM(PositionOnScreen)
- NotificationsHelper(QObject *parent = 0);
+ NotificationsHelper(QObject *parent = nullptr);
~NotificationsHelper() override;
Q_INVOKABLE void addNotificationPopup(QObject *win);
Q_INVOKABLE void closePopup(const QString &sourceName);
diff --git a/components/keyboardlayout/keyboardlayout.h \
b/components/keyboardlayout/keyboardlayout.h index ad2a8337..8cb66b6b 100644
--- a/components/keyboardlayout/keyboardlayout.h
+++ b/components/keyboardlayout/keyboardlayout.h
@@ -44,7 +44,7 @@ class KeyboardLayout : public QObject
NOTIFY layoutsChanged)
public:
- KeyboardLayout(QObject *parent = 0);
+ KeyboardLayout(QObject *parent = nullptr);
~KeyboardLayout() override;
QString currentLayout() const;
diff --git a/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h \
b/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h index \
7f139655..17fe7f60 100644
--- a/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h
+++ b/components/shellprivate/widgetexplorer/kcategorizeditemsviewmodels_p.h
@@ -93,7 +93,7 @@ public:
FilterDataRole = Qt::UserRole+2,
SeparatorRole = Qt::UserRole+3
};
- DefaultFilterModel(QObject *parent = 0);
+ DefaultFilterModel(QObject *parent = nullptr);
QHash<int, QByteArray> roleNames() const override;
@@ -130,7 +130,7 @@ class DefaultItemFilterProxyModel : public QSortFilterProxyModel
Q_PROPERTY(int count READ count NOTIFY countChanged)
public:
- DefaultItemFilterProxyModel(QObject *parent = 0);
+ DefaultItemFilterProxyModel(QObject *parent = nullptr);
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const \
override;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.h \
b/components/shellprivate/widgetexplorer/widgetexplorer.h index 98987dce..14712f42 \
100644
--- a/components/shellprivate/widgetexplorer/widgetexplorer.h
+++ b/components/shellprivate/widgetexplorer/widgetexplorer.h
@@ -44,7 +44,7 @@ class WidgetAction : public QAction
Q_PROPERTY(bool separator READ isSeparator WRITE setSeparator NOTIFY \
separatorChanged)
public:
- WidgetAction(QObject *parent = 0);
+ WidgetAction(QObject *parent = nullptr);
WidgetAction(const QIcon &icon, const QString &text, QObject *parent);
Q_SIGNALS:
@@ -96,7 +96,7 @@ class WidgetExplorer : public QObject, public QQmlParserStatus
Q_PROPERTY(Plasma::Containment *containment READ containment WRITE \
setContainment NOTIFY containmentChanged)
public:
- explicit WidgetExplorer(QObject *parent = 0);
+ explicit WidgetExplorer(QObject *parent = nullptr);
~WidgetExplorer() override;
QString application();
diff --git a/dataengines/activities/activityjob.h \
b/dataengines/activities/activityjob.h index 983e1f01..2cdcf058 100644
--- a/dataengines/activities/activityjob.h
+++ b/dataengines/activities/activityjob.h
@@ -33,7 +33,7 @@ class ActivityJob : public Plasma::ServiceJob
Q_OBJECT
public:
- ActivityJob(KActivities::Controller *controller, const QString &id, const \
QString &operation, QMap<QString, QVariant> ¶meters, QObject *parent = 0); + \
ActivityJob(KActivities::Controller *controller, const QString &id, const QString \
&operation, QMap<QString, QVariant> ¶meters, QObject *parent = nullptr); \
~ActivityJob() override;
protected:
diff --git a/dataengines/applicationjobs/kuiserverengine.h \
b/dataengines/applicationjobs/kuiserverengine.h index 8b9a627d..ff25c51e 100644
--- a/dataengines/applicationjobs/kuiserverengine.h
+++ b/dataengines/applicationjobs/kuiserverengine.h
@@ -69,7 +69,7 @@ public:
Stopped = 2
};
- JobView(QObject *parent = 0);
+ JobView(QObject *parent = nullptr);
~JobView() override;
uint jobId() const;
diff --git a/dataengines/apps/appjob.h b/dataengines/apps/appjob.h
index 3ce0e05b..f2947ca1 100644
--- a/dataengines/apps/appjob.h
+++ b/dataengines/apps/appjob.h
@@ -31,7 +31,7 @@ class AppJob : public Plasma::ServiceJob
Q_OBJECT
public:
- AppJob(AppSource *source, const QString &operation, QMap<QString, QVariant> \
¶meters, QObject *parent = 0); + AppJob(AppSource *source, const QString \
&operation, QMap<QString, QVariant> ¶meters, QObject *parent = nullptr); \
~AppJob() override;
protected:
diff --git a/dataengines/executable/executable.h \
b/dataengines/executable/executable.h index 33539541..772d95c2 100644
--- a/dataengines/executable/executable.h
+++ b/dataengines/executable/executable.h
@@ -27,7 +27,7 @@ class ExecutableContainer : public Plasma::DataContainer
{
Q_OBJECT
public:
- explicit ExecutableContainer(const QString& command, QObject *parent = 0);
+ explicit ExecutableContainer(const QString& command, QObject *parent = \
nullptr); ~ExecutableContainer() override;
protected Q_SLOTS:
diff --git a/dataengines/mpris2/multiplexedservice.h \
b/dataengines/mpris2/multiplexedservice.h index 37398769..d3165568 100644
--- a/dataengines/mpris2/multiplexedservice.h
+++ b/dataengines/mpris2/multiplexedservice.h
@@ -33,7 +33,7 @@ class MultiplexedService : public Plasma::Service
Q_OBJECT
public:
- MultiplexedService(Multiplexer *multiplexer, QObject *parent = 0);
+ MultiplexedService(Multiplexer *multiplexer, QObject *parent = nullptr);
protected:
Plasma::ServiceJob *createJob(const QString &operation,
diff --git a/dataengines/mpris2/multiplexer.h b/dataengines/mpris2/multiplexer.h
index 7b4d10a2..1dcf318e 100644
--- a/dataengines/mpris2/multiplexer.h
+++ b/dataengines/mpris2/multiplexer.h
@@ -33,7 +33,7 @@ class Multiplexer : public Plasma::DataContainer
public:
static const QLatin1String sourceName;
- explicit Multiplexer(QObject *parent = 0);
+ explicit Multiplexer(QObject *parent = nullptr);
void addPlayer(PlayerContainer *container);
void removePlayer(const QString &name);
diff --git a/dataengines/packagekit/packagekitservice.h \
b/dataengines/packagekit/packagekitservice.h index 0e6158bd..d0357511 100644
--- a/dataengines/packagekit/packagekitservice.h
+++ b/dataengines/packagekit/packagekitservice.h
@@ -28,7 +28,7 @@ class PackagekitService : public Plasma::Service
{
Q_OBJECT
public:
- PackagekitService(QObject* parent = 0);
+ PackagekitService(QObject* parent = nullptr);
Plasma::ServiceJob* createJob(const QString& operation, QMap< QString, QVariant \
>& parameters) override; };
diff --git a/dataengines/powermanagement/powermanagementjob.h \
b/dataengines/powermanagement/powermanagementjob.h index ed885784..fbaeb675 100644
--- a/dataengines/powermanagement/powermanagementjob.h
+++ b/dataengines/powermanagement/powermanagementjob.h
@@ -29,7 +29,7 @@ class PowerManagementJob : public Plasma::ServiceJob
public:
PowerManagementJob(const QString &operation, QMap<QString, QVariant> \
¶meters,
- QObject *parent = 0);
+ QObject *parent = nullptr);
~PowerManagementJob() override;
protected:
diff --git a/dataengines/powermanagement/powermanagementservice.h \
b/dataengines/powermanagement/powermanagementservice.h index 17599f50..85b85000 \
100644
--- a/dataengines/powermanagement/powermanagementservice.h
+++ b/dataengines/powermanagement/powermanagementservice.h
@@ -32,7 +32,7 @@ class PowerManagementService : public Plasma::Service
Q_OBJECT
public:
- PowerManagementService(QObject *parent = 0);
+ PowerManagementService(QObject *parent = nullptr);
ServiceJob *createJob(const QString &operation, QMap<QString, QVariant> \
¶meters) override; };
diff --git a/dataengines/share/shareprovider.h b/dataengines/share/shareprovider.h
index c64758c8..f3dbd505 100644
--- a/dataengines/share/shareprovider.h
+++ b/dataengines/share/shareprovider.h
@@ -35,7 +35,7 @@ class ShareProvider : public QObject
Q_OBJECT
public:
- ShareProvider(KJSEmbed::Engine* engine, QObject *parent = 0);
+ ShareProvider(KJSEmbed::Engine* engine, QObject *parent = nullptr);
QString method() const;
void setMethod(const QString &method);
diff --git a/dataengines/share/shareservice.h b/dataengines/share/shareservice.h
index 3a5cdf34..47c63dc0 100644
--- a/dataengines/share/shareservice.h
+++ b/dataengines/share/shareservice.h
@@ -52,7 +52,7 @@ class ShareJob : public Plasma::ServiceJob
public:
ShareJob(const QString &destination, const QString &operation,
- QMap<QString, QVariant> ¶meters, QObject *parent = 0);
+ QMap<QString, QVariant> ¶meters, QObject *parent = nullptr);
~ShareJob() override;
void start() override;
diff --git a/dataengines/soliddevice/devicesignalmapmanager.h \
b/dataengines/soliddevice/devicesignalmapmanager.h index 8e60f535..3e4856d0 100644
--- a/dataengines/soliddevice/devicesignalmapmanager.h
+++ b/dataengines/soliddevice/devicesignalmapmanager.h
@@ -28,7 +28,7 @@ class DeviceSignalMapManager : public QObject
Q_OBJECT
public:
- DeviceSignalMapManager(QObject *parent=0);
+ DeviceSignalMapManager(QObject *parent = nullptr);
~DeviceSignalMapManager() override;
void mapDevice(Solid::Battery *battery, const QString &udi);
diff --git a/dataengines/soliddevice/devicesignalmapper.h \
b/dataengines/soliddevice/devicesignalmapper.h index ce4edaa7..45a19cf8 100644
--- a/dataengines/soliddevice/devicesignalmapper.h
+++ b/dataengines/soliddevice/devicesignalmapper.h
@@ -43,7 +43,7 @@ class DeviceSignalMapper : public QSignalMapper
Q_OBJECT
public:
- DeviceSignalMapper(QObject *parent=0);
+ DeviceSignalMapper(QObject *parent = nullptr);
~DeviceSignalMapper() override;
void setMapping(QObject* device, const QString &udi);
@@ -60,7 +60,7 @@ class BatterySignalMapper : public DeviceSignalMapper
Q_OBJECT
public:
- BatterySignalMapper(QObject *parent=0);
+ BatterySignalMapper(QObject *parent = nullptr);
~BatterySignalMapper() override;
public Q_SLOTS:
@@ -74,7 +74,7 @@ class StorageAccessSignalMapper : public DeviceSignalMapper
Q_OBJECT
public:
- StorageAccessSignalMapper(QObject *parent=0);
+ StorageAccessSignalMapper(QObject *parent = nullptr);
~StorageAccessSignalMapper() override;
public Q_SLOTS:
diff --git a/dataengines/soliddevice/hddtemp.h b/dataengines/soliddevice/hddtemp.h
index d3410165..e603498e 100644
--- a/dataengines/soliddevice/hddtemp.h
+++ b/dataengines/soliddevice/hddtemp.h
@@ -35,7 +35,7 @@ class HddTemp : public QObject
public:
enum DataType {Temperature=0, Unit};
- HddTemp(QObject *parent=0);
+ HddTemp(QObject *parent = nullptr);
~HddTemp() override;
QStringList sources();
QVariant data(const QString source, const DataType type) const;
diff --git a/dataengines/time/timeengine.h b/dataengines/time/timeengine.h
index 9cb6810a..292104b0 100644
--- a/dataengines/time/timeengine.h
+++ b/dataengines/time/timeengine.h
@@ -38,7 +38,7 @@ class TimeEngine : public Plasma::DataEngine
Q_OBJECT
public:
- explicit TimeEngine(const KPluginInfo &plugin, QObject *parent=0);
+ explicit TimeEngine(const KPluginInfo &plugin, QObject *parent = nullptr);
TimeEngine(QObject* parent, const QVariantList& args);
~TimeEngine() override;
diff --git a/dataengines/time/timesource.h b/dataengines/time/timesource.h
index 845ded58..553fff25 100644
--- a/dataengines/time/timesource.h
+++ b/dataengines/time/timesource.h
@@ -31,7 +31,7 @@ class TimeSource : public Plasma::DataContainer
Q_OBJECT
public:
- explicit TimeSource(const QString &name, QObject *parent = 0);
+ explicit TimeSource(const QString &name, QObject *parent = nullptr);
~TimeSource() override;
void setTimeZone(const QString &name);
void updateTime();
diff --git a/klipper/clipboardjob.h b/klipper/clipboardjob.h
index af0114b0..583e5a30 100644
--- a/klipper/clipboardjob.h
+++ b/klipper/clipboardjob.h
@@ -28,7 +28,7 @@ class ClipboardJob : public Plasma::ServiceJob
{
Q_OBJECT
public:
- ClipboardJob(Klipper *klipper, const QString &destination, const QString \
&operation, const QVariantMap ¶meters, QObject *parent=0); + \
ClipboardJob(Klipper *klipper, const QString &destination, const QString &operation, \
const QVariantMap ¶meters, QObject *parent = nullptr); ~ClipboardJob() override \
= default;
void start() override;
diff --git a/klipper/editactiondialog.cpp b/klipper/editactiondialog.cpp
index c001f1cc..ccece962 100644
--- a/klipper/editactiondialog.cpp
+++ b/klipper/editactiondialog.cpp
@@ -52,7 +52,7 @@ namespace {
*/
class ActionOutputDelegate : public QItemDelegate {
public:
- ActionOutputDelegate(QObject* parent = 0) : QItemDelegate(parent){
+ ActionOutputDelegate(QObject* parent = nullptr) : QItemDelegate(parent){
}
QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& \
/*option*/, const QModelIndex& /*index*/) const override { @@ -124,9 +124,9 @@ void \
ActionDetailModel::setIconForCommand(ClipCommand& cmd) {
// let's try to update icon of the item according to command
QString command = cmd.command;
- if ( command.contains( ' ' ) ) {
+ if ( command.contains( QLatin1Char(' ') ) ) {
// get first word
- command = command.section( ' ', 0, 0 );
+ command = command.section( QLatin1Char(' '), 0, 0 );
}
QPixmap iconPix = KIconLoader::global()->loadIcon(
diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp
index 12d672bc..0d18853a 100644
--- a/klipper/historyurlitem.cpp
+++ b/klipper/historyurlitem.cpp
@@ -22,7 +22,7 @@
#include <QCryptographicHash>
namespace {
- QByteArray compute_uuid(const QList<QUrl>& _urls, KUrlMimeData::MetaDataMap \
_metaData, bool _cut ) { + QByteArray compute_uuid(const QList<QUrl>& _urls, const \
KUrlMimeData::MetaDataMap &_metaData, bool _cut ) { QCryptographicHash \
hash(QCryptographicHash::Sha1); foreach(const QUrl& url, _urls) {
hash.addData(url.toEncoded());
@@ -36,7 +36,7 @@ namespace {
}
}
-HistoryURLItem::HistoryURLItem( const QList<QUrl>& _urls, KUrlMimeData::MetaDataMap \
_metaData, bool _cut ) +HistoryURLItem::HistoryURLItem( const QList<QUrl>& _urls, \
const KUrlMimeData::MetaDataMap &_metaData, bool _cut ) : \
HistoryItem(compute_uuid(_urls, _metaData, _cut)) , m_urls( _urls )
, m_metaData( _metaData )
diff --git a/klipper/historyurlitem.h b/klipper/historyurlitem.h
index 6cf22717..c947025f 100644
--- a/klipper/historyurlitem.h
+++ b/klipper/historyurlitem.h
@@ -29,7 +29,7 @@
class HistoryURLItem : public HistoryItem
{
public:
- HistoryURLItem( const QList<QUrl>& urls, KUrlMimeData::MetaDataMap metaData, \
bool cut ); + HistoryURLItem(const QList<QUrl>& urls, const \
KUrlMimeData::MetaDataMap &metaData, bool cut ); QString text() const override;
bool operator==( const HistoryItem& rhs) const override;
QMimeData* mimeData() const override;
diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
index a68627e1..46c0e80c 100644
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -251,16 +251,19 @@ QString Klipper::getClipboardContents()
return getClipboardHistoryItem(0);
}
-void Klipper::showKlipperPopupMenu() {
+void Klipper::showKlipperPopupMenu()
+{
slotPopupMenu();
}
-void Klipper::showKlipperManuallyInvokeActionMenu() {
+
+void Klipper::showKlipperManuallyInvokeActionMenu()
+{
slotRepeatAction();
}
// DBUS - don't call from Klipper itself
-void Klipper::setClipboardContents(QString s)
+void Klipper::setClipboardContents(const QString &s)
{
if (s.isEmpty())
return;
@@ -368,7 +371,7 @@ void Klipper::saveSettings() const
void Klipper::showPopupMenu( QMenu* menu )
{
- Q_ASSERT( menu != 0L );
+ Q_ASSERT( menu != nullptr );
QSize size = menu->sizeHint(); // geometry is not valid until it's shown
QPoint pos = QCursor::pos();
@@ -528,7 +531,7 @@ void Klipper::slotQuit()
}
saveSession();
- int autoStart = KMessageBox::questionYesNoCancel(0, i18n("Should Klipper start \
automatically when you login?"), + int autoStart = \
KMessageBox::questionYesNoCancel(nullptr, i18n("Should Klipper start automatically \
when you login?"),
i18n("Automatically Start \
Klipper?"), KGuiItem(i18n("Start")),
KGuiItem(i18n("Do Not Start")), \
KStandardGuiItem::cancel(), QStringLiteral("StartAutomatically"));
@@ -959,7 +962,7 @@ void Klipper::showBarcode(const QSharedPointer< const HistoryItem \
> &item)
void Klipper::slotAskClearHistory()
{
- int clearHist = KMessageBox::questionYesNo(0,
+ int clearHist = KMessageBox::questionYesNo(nullptr,
i18n("Really delete entire clipboard \
history?"),
i18n("Delete clipboard history?"),
KStandardGuiItem::yes(),
diff --git a/klipper/klipper.h b/klipper/klipper.h
index 99c71f33..685fae03 100644
--- a/klipper/klipper.h
+++ b/klipper/klipper.h
@@ -54,7 +54,7 @@ class Klipper : public QObject
public Q_SLOTS:
Q_SCRIPTABLE QString getClipboardContents();
- Q_SCRIPTABLE void setClipboardContents(QString s);
+ Q_SCRIPTABLE void setClipboardContents(const QString &s);
Q_SCRIPTABLE void clearClipboardContents();
Q_SCRIPTABLE void clearClipboardHistory();
Q_SCRIPTABLE void saveClipboardHistory();
diff --git a/klipper/tray.cpp b/klipper/tray.cpp
index 75fbe7fc..80f93ace 100644
--- a/klipper/tray.cpp
+++ b/klipper/tray.cpp
@@ -33,7 +33,7 @@ KlipperTray::KlipperTray()
: KStatusNotifierItem()
{
setTitle( i18n( "Klipper" ) );
- QString klipperIconName = QStringLiteral("klipper");
+ const QString klipperIconName = QStringLiteral("klipper");
setIconByName( klipperIconName );
setToolTip( klipperIconName, i18n( "Clipboard Contents" ), i18n( "Clipboard is \
empty" ) ); setCategory( SystemServices );
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 6a7a30fb..2c529ff9 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -44,8 +44,8 @@
#include "historystringitem.h"
URLGrabber::URLGrabber(History* history):
- m_myCurrentAction(0L),
- m_myMenu(0L),
+ m_myCurrentAction(nullptr),
+ m_myMenu(nullptr),
m_myPopupKillTimer(new QTimer( this )),
m_myPopupKillTimeout(8),
m_stripWhiteSpace(true),
@@ -368,7 +368,7 @@ void URLGrabber::slotKillPopupMenu()
if ( m_myMenu ) {
m_myMenu->deleteLater();
- m_myMenu = 0;
+ m_myMenu = nullptr;
}
}
@@ -390,7 +390,7 @@ ClipCommand::ClipCommand(const QString&_command, const QString& \
_description, else
{
// try to find suitable icon
- QString appName = command.section( ' ', 0, 0 );
+ QString appName = command.section( QLatin1Char(' '), 0, 0 );
if ( !appName.isEmpty() )
{
QPixmap iconPix = KIconLoader::global()->loadIcon(
diff --git a/kuiserver/jobview.h b/kuiserver/jobview.h
index d0997d05..216a071b 100644
--- a/kuiserver/jobview.h
+++ b/kuiserver/jobview.h
@@ -64,7 +64,7 @@ public:
Stopped = 2
};
- JobView(uint jobId, QObject *parent = 0);
+ JobView(uint jobId, QObject *parent = nullptr);
~JobView() override;
void terminate(const QString &errorMessage);
diff --git a/kuiserver/progresslistmodel.h b/kuiserver/progresslistmodel.h
index 875b58e1..a709e3e9 100644
--- a/kuiserver/progresslistmodel.h
+++ b/kuiserver/progresslistmodel.h
@@ -42,7 +42,7 @@ class ProgressListModel: public QAbstractItemModel, protected \
QDBusContext
public:
- explicit ProgressListModel(QObject *parent = 0);
+ explicit ProgressListModel(QObject *parent = nullptr);
~ProgressListModel() override;
QModelIndex parent(const QModelIndex&) const override;
diff --git a/kuiserver/uiserver.cpp b/kuiserver/uiserver.cpp
index 93717ea6..ea967fdd 100644
--- a/kuiserver/uiserver.cpp
+++ b/kuiserver/uiserver.cpp
@@ -35,7 +35,7 @@
#include <kconfigdialog.h>
UiServer::UiServer(ProgressListModel* model)
- : KXmlGuiWindow(0), m_systemTray(0)
+ : KXmlGuiWindow(nullptr)
{
//NOTE: if enough people really hate this dialog (having centralized information \
and such),
//I imagine we could somehow forward it to the old dialogs, which would be \
displayed 1 for each job.
diff --git a/kuiserver/uiserver.h b/kuiserver/uiserver.h
index f3dcb753..75f3971c 100644
--- a/kuiserver/uiserver.h
+++ b/kuiserver/uiserver.h
@@ -56,11 +56,11 @@ private Q_SLOTS:
void showConfigurationDialog();
private:
- ProgressListDelegate *progressListDelegate;
- QListView *listProgress;
+ ProgressListDelegate *progressListDelegate = nullptr;
+ QListView *listProgress = nullptr;
- QToolBar *toolBar;
- QSystemTrayIcon *m_systemTray;
+ QToolBar *toolBar = nullptr;
+ QSystemTrayIcon *m_systemTray = nullptr;
};
diff --git a/libdbusmenuqt/dbusmenuimporter.h b/libdbusmenuqt/dbusmenuimporter.h
index 6f91ee91..f6ac4b67 100644
--- a/libdbusmenuqt/dbusmenuimporter.h
+++ b/libdbusmenuqt/dbusmenuimporter.h
@@ -43,7 +43,7 @@ public:
/**
* Creates a DBusMenuImporter listening over DBus on service, path
*/
- DBusMenuImporter(const QString &service, const QString &path, QObject *parent = \
0); + DBusMenuImporter(const QString &service, const QString &path, QObject \
*parent = nullptr);
~DBusMenuImporter() override;
diff --git a/libtaskmanager/activityinfo.h b/libtaskmanager/activityinfo.h
index a11f1f8e..a9c96442 100644
--- a/libtaskmanager/activityinfo.h
+++ b/libtaskmanager/activityinfo.h
@@ -50,7 +50,7 @@ class TASKMANAGER_EXPORT ActivityInfo : public QObject
Q_PROPERTY(int numberOfRunningActivities READ numberOfRunningActivities NOTIFY \
numberOfRunningActivitiesChanged)
public:
- explicit ActivityInfo(QObject *parent = 0);
+ explicit ActivityInfo(QObject *parent = nullptr);
virtual ~ActivityInfo();
/**
diff --git a/libtaskmanager/concatenatetasksproxymodel.h \
b/libtaskmanager/concatenatetasksproxymodel.h index e94f3cbc..81d09c16 100644
--- a/libtaskmanager/concatenatetasksproxymodel.h
+++ b/libtaskmanager/concatenatetasksproxymodel.h
@@ -45,7 +45,7 @@ class TASKMANAGER_EXPORT ConcatenateTasksProxyModel : public \
KConcatenateRowsPro Q_OBJECT
public:
- explicit ConcatenateTasksProxyModel(QObject *parent = 0);
+ explicit ConcatenateTasksProxyModel(QObject *parent = nullptr);
virtual ~ConcatenateTasksProxyModel();
protected:
QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
diff --git a/libtaskmanager/flattentaskgroupsproxymodel.h \
b/libtaskmanager/flattentaskgroupsproxymodel.h index 8fce155d..65f47dcc 100644
--- a/libtaskmanager/flattentaskgroupsproxymodel.h
+++ b/libtaskmanager/flattentaskgroupsproxymodel.h
@@ -46,7 +46,7 @@ class TASKMANAGER_EXPORT FlattenTaskGroupsProxyModel : public \
KDescendantsProxyM Q_OBJECT
public:
- explicit FlattenTaskGroupsProxyModel(QObject *parent = 0);
+ explicit FlattenTaskGroupsProxyModel(QObject *parent = nullptr);
virtual ~FlattenTaskGroupsProxyModel();
void setSourceModel(QAbstractItemModel *sourceModel) override;
diff --git a/libtaskmanager/launchertasksmodel.h \
b/libtaskmanager/launchertasksmodel.h index 53799e8c..d4920e5f 100644
--- a/libtaskmanager/launchertasksmodel.h
+++ b/libtaskmanager/launchertasksmodel.h
@@ -55,7 +55,7 @@ class TASKMANAGER_EXPORT LauncherTasksModel : public \
AbstractTasksModel
Q_PROPERTY(QStringList launcherList READ launcherList WRITE setLauncherList \
NOTIFY launcherListChanged)
public:
- explicit LauncherTasksModel(QObject *parent = 0);
+ explicit LauncherTasksModel(QObject *parent = nullptr);
virtual ~LauncherTasksModel();
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) \
const override;
diff --git a/libtaskmanager/startuptasksmodel.h b/libtaskmanager/startuptasksmodel.h
index 6f3e4fc6..081bdec8 100644
--- a/libtaskmanager/startuptasksmodel.h
+++ b/libtaskmanager/startuptasksmodel.h
@@ -46,7 +46,7 @@ class TASKMANAGER_EXPORT StartupTasksModel : public \
AbstractTasksModel Q_OBJECT
public:
- explicit StartupTasksModel(QObject *parent = 0);
+ explicit StartupTasksModel(QObject *parent = nullptr);
virtual ~StartupTasksModel();
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) \
const override;
diff --git a/libtaskmanager/taskfilterproxymodel.h \
b/libtaskmanager/taskfilterproxymodel.h index a869824d..72642731 100644
--- a/libtaskmanager/taskfilterproxymodel.h
+++ b/libtaskmanager/taskfilterproxymodel.h
@@ -59,7 +59,7 @@ class TASKMANAGER_EXPORT TaskFilterProxyModel : public \
QSortFilterProxyModel, pu Q_PROPERTY(bool demandingAttentionSkipsFilters READ \
demandingAttentionSkipsFilters WRITE setDemandingAttentionSkipsFilters NOTIFY \
demandingAttentionSkipsFiltersChanged)
public:
- explicit TaskFilterProxyModel(QObject *parent = 0);
+ explicit TaskFilterProxyModel(QObject *parent = nullptr);
virtual ~TaskFilterProxyModel();
void setSourceModel(QAbstractItemModel *sourceModel) override;
diff --git a/libtaskmanager/taskgroupingproxymodel.h \
b/libtaskmanager/taskgroupingproxymodel.h index c6d247f2..39b02788 100644
--- a/libtaskmanager/taskgroupingproxymodel.h
+++ b/libtaskmanager/taskgroupingproxymodel.h
@@ -54,7 +54,7 @@ class TASKMANAGER_EXPORT TaskGroupingProxyModel : public \
QAbstractProxyModel, pu NOTIFY blacklistedLauncherUrlsChanged)
public:
- explicit TaskGroupingProxyModel(QObject *parent = 0);
+ explicit TaskGroupingProxyModel(QObject *parent = nullptr);
virtual ~TaskGroupingProxyModel();
QModelIndex index(int row, int column, const QModelIndex &parent = \
QModelIndex()) const override;
diff --git a/libtaskmanager/tasksmodel.h b/libtaskmanager/tasksmodel.h
index 38319762..3353cf19 100644
--- a/libtaskmanager/tasksmodel.h
+++ b/libtaskmanager/tasksmodel.h
@@ -105,7 +105,7 @@ public:
};
Q_ENUM(GroupMode)
- explicit TasksModel(QObject *parent = 0);
+ explicit TasksModel(QObject *parent = nullptr);
virtual ~TasksModel();
QHash<int, QByteArray> roleNames() const override;
diff --git a/libtaskmanager/virtualdesktopinfo.h \
b/libtaskmanager/virtualdesktopinfo.h index aca6e768..e8321af5 100644
--- a/libtaskmanager/virtualdesktopinfo.h
+++ b/libtaskmanager/virtualdesktopinfo.h
@@ -55,7 +55,7 @@ class TASKMANAGER_EXPORT VirtualDesktopInfo : public QObject
Q_PROPERTY(int desktopLayoutRows READ desktopLayoutRows NOTIFY \
desktopLayoutRowsChanged)
public:
- explicit VirtualDesktopInfo(QObject *parent = 0);
+ explicit VirtualDesktopInfo(QObject *parent = nullptr);
virtual ~VirtualDesktopInfo();
/**
diff --git a/libtaskmanager/waylandtasksmodel.h b/libtaskmanager/waylandtasksmodel.h
index fa640e34..f3145c43 100644
--- a/libtaskmanager/waylandtasksmodel.h
+++ b/libtaskmanager/waylandtasksmodel.h
@@ -54,7 +54,7 @@ class TASKMANAGER_EXPORT WaylandTasksModel : public \
AbstractWindowTasksModel Q_OBJECT
public:
- explicit WaylandTasksModel(QObject *parent = 0);
+ explicit WaylandTasksModel(QObject *parent = nullptr);
virtual ~WaylandTasksModel();
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) \
const override;
diff --git a/libtaskmanager/windowtasksmodel.h b/libtaskmanager/windowtasksmodel.h
index 1037fbac..14568d45 100644
--- a/libtaskmanager/windowtasksmodel.h
+++ b/libtaskmanager/windowtasksmodel.h
@@ -45,7 +45,7 @@ class TASKMANAGER_EXPORT WindowTasksModel : public \
QIdentityProxyModel, public A Q_OBJECT
public:
- explicit WindowTasksModel(QObject *parent = 0);
+ explicit WindowTasksModel(QObject *parent = nullptr);
virtual ~WindowTasksModel();
QHash<int, QByteArray> roleNames() const override;
diff --git a/libtaskmanager/xwindowtasksmodel.h b/libtaskmanager/xwindowtasksmodel.h
index 713d982e..2b423204 100644
--- a/libtaskmanager/xwindowtasksmodel.h
+++ b/libtaskmanager/xwindowtasksmodel.h
@@ -52,7 +52,7 @@ class TASKMANAGER_EXPORT XWindowTasksModel : public \
AbstractWindowTasksModel Q_OBJECT
public:
- explicit XWindowTasksModel(QObject *parent = 0);
+ explicit XWindowTasksModel(QObject *parent = nullptr);
virtual ~XWindowTasksModel();
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) \
const override;
diff --git a/phonon/platform_kde/kiomediastream.h \
b/phonon/platform_kde/kiomediastream.h index 50ed2566..190ba77a 100644
--- a/phonon/platform_kde/kiomediastream.h
+++ b/phonon/platform_kde/kiomediastream.h
@@ -34,7 +34,7 @@ class KioMediaStream : public AbstractMediaStream
Q_OBJECT
Q_DECLARE_PRIVATE(KioMediaStream)
public:
- explicit KioMediaStream(const QUrl &url, QObject *parent = 0);
+ explicit KioMediaStream(const QUrl &url, QObject *parent = nullptr);
~KioMediaStream() override;
protected:
diff --git a/runners/bookmarks/browsers/opera.h b/runners/bookmarks/browsers/opera.h
index 10b1b203..e2572a22 100644
--- a/runners/bookmarks/browsers/opera.h
+++ b/runners/bookmarks/browsers/opera.h
@@ -32,7 +32,7 @@ class Opera : public QObject, public Browser
{
Q_OBJECT
public:
- Opera(QObject* parent = 0);
+ Opera(QObject* parent = nullptr);
QList<BookmarkMatch> match(const QString& term, bool addEverything) override;
public Q_SLOTS:
void prepare() override;
diff --git a/runners/bookmarks/faviconfromblob.cpp \
b/runners/bookmarks/faviconfromblob.cpp index 082a8b2e..2ead7e30 100644
--- a/runners/bookmarks/faviconfromblob.cpp
+++ b/runners/bookmarks/faviconfromblob.cpp
@@ -54,14 +54,16 @@ public:
ChromeQuery() {}
QString query(QSqlDatabase *database) const override {
//qDebug() << "tables: " << database->tables();
- if(database->tables().contains(QStringLiteral("favicon_bitmaps")))
- return QStringLiteral("SELECT * FROM favicons " \
- "inner join icon_mapping on icon_mapping.icon_id = favicons.id " \
- "inner join favicon_bitmaps on icon_mapping.icon_id = \
favicon_bitmaps.icon_id " \
- "WHERE page_url = :url ORDER BY height desc LIMIT 1;");
- return QStringLiteral("SELECT * FROM favicons inner join icon_mapping " \
- "on icon_mapping.icon_id = favicons.id " \
- "WHERE page_url = :url LIMIT 1;");
+ if(database->tables().contains(QStringLiteral("favicon_bitmaps"))) {
+ return QStringLiteral("SELECT * FROM favicons " \
+ "inner join icon_mapping on icon_mapping.icon_id = \
favicons.id " \ + "inner join favicon_bitmaps on \
icon_mapping.icon_id = favicon_bitmaps.icon_id " \ + \
"WHERE page_url = :url ORDER BY height desc LIMIT 1;"); + }
+
+ return QStringLiteral("SELECT * FROM favicons inner join icon_mapping " \
+ "on icon_mapping.icon_id = favicons.id " \
+ "WHERE page_url = :url LIMIT 1;");
}
};
diff --git a/runners/bookmarks/faviconfromblob.h \
b/runners/bookmarks/faviconfromblob.h index 48a47499..54a5d20c 100644
--- a/runners/bookmarks/faviconfromblob.h
+++ b/runners/bookmarks/faviconfromblob.h
@@ -29,8 +29,8 @@ class FaviconFromBlob : public Favicon
{
Q_OBJECT
public:
- static FaviconFromBlob *chrome(const QString &profileDirectory, QObject *parent \
= 0);
- static FaviconFromBlob *firefox(FetchSqlite *fetchSqlite, QObject *parent = 0);
+ static FaviconFromBlob *chrome(const QString &profileDirectory, QObject *parent \
= nullptr); + static FaviconFromBlob *firefox(FetchSqlite *fetchSqlite, QObject \
*parent = nullptr); ~FaviconFromBlob() override;
QIcon iconFor(const QString &url) override;
@@ -39,7 +39,7 @@ public Q_SLOTS:
void teardown() override;
private:
- FaviconFromBlob(const QString &profileName, BuildQuery *buildQuery, const \
QString &blobColumn, FetchSqlite *fetchSqlite, QObject *parent = 0); + \
FaviconFromBlob(const QString &profileName, BuildQuery *buildQuery, const QString \
&blobColumn, FetchSqlite *fetchSqlite, QObject *parent = nullptr); QString \
m_profileCacheDirectory; BuildQuery *m_buildQuery;
QString const m_blobcolumn;
diff --git a/runners/bookmarks/fetchsqlite.h b/runners/bookmarks/fetchsqlite.h
index c2ad7931..08ff05f7 100644
--- a/runners/bookmarks/fetchsqlite.h
+++ b/runners/bookmarks/fetchsqlite.h
@@ -40,7 +40,7 @@ class FetchSqlite : public QObject
{
Q_OBJECT
public:
- explicit FetchSqlite(const QString &originalFile, const QString ©To, QObject \
*parent = 0); + explicit FetchSqlite(const QString &originalFile, const QString \
©To, QObject *parent = nullptr); ~FetchSqlite() override;
void prepare();
void teardown();
diff --git a/runners/bookmarks/tests/testchromebookmarks.h \
b/runners/bookmarks/tests/testchromebookmarks.h index 1d1a6117..534ad1aa 100644
--- a/runners/bookmarks/tests/testchromebookmarks.h
+++ b/runners/bookmarks/tests/testchromebookmarks.h
@@ -37,7 +37,7 @@ class TestChromeBookmarks : public QObject
{
Q_OBJECT
public:
- explicit TestChromeBookmarks(QObject* parent = 0) : QObject(parent) {}
+ explicit TestChromeBookmarks(QObject* parent = nullptr) : QObject(parent) {}
private Q_SLOTS:
void initTestCase();
void bookmarkFinderShouldFindEachProfileDirectory();
diff --git a/runners/calculator/qalculate_engine.h \
b/runners/calculator/qalculate_engine.h index 5bdff27b..783f8e4f 100644
--- a/runners/calculator/qalculate_engine.h
+++ b/runners/calculator/qalculate_engine.h
@@ -29,7 +29,7 @@ class QalculateEngine : public QObject
{
Q_OBJECT
public:
- QalculateEngine(QObject* parent = 0);
+ QalculateEngine(QObject* parent = nullptr);
~QalculateEngine();
QString lastResult() const { return m_lastResult; }
diff --git a/shell/alternativeshelper.h b/shell/alternativeshelper.h
index a302bf01..1c2b9aa9 100644
--- a/shell/alternativeshelper.h
+++ b/shell/alternativeshelper.h
@@ -32,7 +32,7 @@ class AlternativesHelper : public QObject
Q_PROPERTY(QQuickItem *applet READ applet CONSTANT)
public:
- AlternativesHelper(Plasma::Applet *applet, QObject *parent = 0);
+ AlternativesHelper(Plasma::Applet *applet, QObject *parent = nullptr);
~AlternativesHelper() override;
QQuickItem *applet() const;
diff --git a/shell/currentcontainmentactionsmodel.h \
b/shell/currentcontainmentactionsmodel.h index ef6095c3..24637875 100644
--- a/shell/currentcontainmentactionsmodel.h
+++ b/shell/currentcontainmentactionsmodel.h
@@ -45,7 +45,7 @@ public:
HasConfigurationInterfaceRole
};
- CurrentContainmentActionsModel(Plasma::Containment *cotainment, QObject *parent \
= 0); + CurrentContainmentActionsModel(Plasma::Containment *cotainment, QObject \
*parent = nullptr); ~CurrentContainmentActionsModel() override;
QHash<int, QByteArray> roleNames() const override;
diff --git a/shell/scripting/applet.h b/shell/scripting/applet.h
index 08306561..95044851 100644
--- a/shell/scripting/applet.h
+++ b/shell/scripting/applet.h
@@ -40,7 +40,7 @@ class Applet : public QObject
Q_PROPERTY(QStringList currentConfigGroup WRITE setCurrentConfigGroup READ \
currentConfigGroup)
public:
- Applet(QObject *parent = 0);
+ Applet(QObject *parent = nullptr);
~Applet() override;
QStringList configKeys() const;
diff --git a/shell/scripting/containment.h b/shell/scripting/containment.h
index 2b76e158..981898c3 100644
--- a/shell/scripting/containment.h
+++ b/shell/scripting/containment.h
@@ -54,7 +54,7 @@ class Containment : public Applet
Q_PROPERTY(int id READ id)
public:
- Containment(Plasma::Containment *containment, QObject *parent = 0);
+ Containment(Plasma::Containment *containment, QObject *parent = nullptr);
~Containment() override;
uint id() const;
diff --git a/shell/scripting/panel.h b/shell/scripting/panel.h
index 0d707848..0fc48f21 100644
--- a/shell/scripting/panel.h
+++ b/shell/scripting/panel.h
@@ -61,7 +61,7 @@ class Panel : public Containment
Q_PROPERTY(QString hiding READ hiding WRITE setHiding)
public:
- Panel(Plasma::Containment *containment, QObject *parent = 0);
+ Panel(Plasma::Containment *containment, QObject *parent = nullptr);
~Panel() override;
QString location() const;
diff --git a/shell/scripting/scriptengine.h b/shell/scripting/scriptengine.h
index 30309bbf..8e7b0476 100644
--- a/shell/scripting/scriptengine.h
+++ b/shell/scripting/scriptengine.h
@@ -46,7 +46,7 @@ class ScriptEngine : public QScriptEngine
Q_OBJECT
public:
- ScriptEngine(Plasma::Corona *corona, QObject *parent = 0);
+ ScriptEngine(Plasma::Corona *corona, QObject *parent = nullptr);
~ScriptEngine() override;
static QStringList pendingUpdateScripts(Plasma::Corona *corona);
diff --git a/shell/scripting/widget.h b/shell/scripting/widget.h
index 6170a3d7..b9411d46 100644
--- a/shell/scripting/widget.h
+++ b/shell/scripting/widget.h
@@ -49,7 +49,7 @@ class Widget : public Applet
Q_PROPERTY(bool locked READ locked WRITE setLocked)
public:
- Widget(Plasma::Applet *applet, QObject *parent = 0);
+ Widget(Plasma::Applet *applet, QObject *parent = nullptr);
~Widget() override;
uint id() const;
diff --git a/shell/shellcorona.h b/shell/shellcorona.h
index 84c43915..843024cc 100644
--- a/shell/shellcorona.h
+++ b/shell/shellcorona.h
@@ -73,7 +73,7 @@ class ShellCorona : public Plasma::Corona, QDBusContext
Q_CLASSINFO("D-Bus Interface", "org.kde.PlasmaShell")
public:
- explicit ShellCorona(QObject *parent = 0);
+ explicit ShellCorona(QObject *parent = nullptr);
~ShellCorona() override;
KPackage::Package lookAndFeelPackage();
diff --git a/systemmonitor/ksystemactivitydialog.cpp \
b/systemmonitor/ksystemactivitydialog.cpp index c945a25e..b01d340f 100644
--- a/systemmonitor/ksystemactivitydialog.cpp
+++ b/systemmonitor/ksystemactivitydialog.cpp
@@ -47,8 +47,7 @@ KSystemActivityDialog::KSystemActivityDialog(QWidget *parent)
{
setWindowTitle(i18n("System Activity"));
setWindowIcon(QIcon::fromTheme(QStringLiteral( "utilities-system-monitor" )));
- QVBoxLayout *mainLayout = new QVBoxLayout;
- setLayout(mainLayout);
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->addWidget(&m_processList);
m_processList.setScriptingEnabled(true);
setSizeGripEnabled(true);
diff --git a/wallpapers/image/backgroundlistmodel.h \
b/wallpapers/image/backgroundlistmodel.h index 7c9b31fc..a1945166 100644
--- a/wallpapers/image/backgroundlistmodel.h
+++ b/wallpapers/image/backgroundlistmodel.h
@@ -44,7 +44,7 @@ class ImageSizeFinder : public QObject, public QRunnable
{
Q_OBJECT
public:
- ImageSizeFinder(const QString &path, QObject *parent = 0);
+ ImageSizeFinder(const QString &path, QObject *parent = nullptr);
void run() override;
Q_SIGNALS:
diff --git a/wallpapers/image/image.h b/wallpapers/image/image.h
index 40eb58e2..6306a5c2 100644
--- a/wallpapers/image/image.h
+++ b/wallpapers/image/image.h
@@ -71,7 +71,7 @@ class Image : public QObject, public QQmlParserStatus
};
Q_ENUM(RenderingMode)
- Image(QObject* parent = 0);
+ Image(QObject* parent = nullptr);
~Image() override;
QUrl wallpaperPath() const;
diff --git a/xembed-sni-proxy/sniproxy.h b/xembed-sni-proxy/sniproxy.h
index e897a920..d5f62237 100644
--- a/xembed-sni-proxy/sniproxy.h
+++ b/xembed-sni-proxy/sniproxy.h
@@ -44,7 +44,7 @@ class SNIProxy : public QObject
Q_PROPERTY(KDbusImageVector IconPixmap READ IconPixmap)
public:
- SNIProxy(xcb_window_t wid, QObject *parent=0);
+ SNIProxy(xcb_window_t wid, QObject *parent = nullptr);
~SNIProxy() override;
void update();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic