git.iko.soy/unity8
on xenial help sign in
cleanup, use nullptr
commitc98ab572741fd24ba8aac8a72adb48f6f5c4d705 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateSat 21 Nov 2015, 23:41 (11 years ago) parent6a88f00
6 files changed+8−9
compare with xenial
unifiedsplit
plugins/Unity/Indicators/actionrootstate.h+1−1 plugins/Unity/Indicators/indicator.h+1−1 plugins/Unity/Indicators/indicatorsmanager.cpp+3−4 plugins/Unity/Indicators/indicatorsmanager.h+1−1 plugins/Unity/Indicators/indicatorsmodel.h+1−1 plugins/Unity/Indicators/modelprinter.h+1−1
plugins/Unity/Indicators/actionrootstate.h+1−1
@@ -30,7 +30,7 @@ class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject
3030 Q_PROPERTY(QString actionName READ actionName WRITE setActionName NOTIFY actionNameChanged)
3131
3232public:
33− ActionRootState(QObject *parent = 0);
33+ ActionRootState(QObject *parent = nullptr);
3434
3535 QDBusActionGroup *actionGroup() const;
3636 void setActionGroup(QDBusActionGroup *actionGroup);
plugins/Unity/Indicators/indicator.h+1−1
@@ -32,7 +32,7 @@ class UNITYINDICATORS_EXPORT Indicator : public QObject
3232public:
3333 typedef QSharedPointer<Indicator> Ptr;
3434
35− Indicator(QObject *parent = 0);
35+ Indicator(QObject *parent = nullptr);
3636 virtual ~Indicator();
3737
3838 void init(const QString& busName, const QSettings& settings);
plugins/Unity/Indicators/indicatorsmanager.cpp+3−4
@@ -116,8 +116,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)
116116 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
117117 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
118118
119− qDebug() << "!!! Loading indicator" << name << ", profile" << m_profile;
120−
121119 if (m_platform.isPC() && name == "indicator-keyboard") {
122120 return; // convergence: skip this indicator until it works in Mir
123121 }
@@ -288,8 +286,9 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
288286 new_indicator->init(data->m_fileInfo.fileName(), settings);
289287
290288 // convergence:
291− // 1) enable session indicator conditionally, typically when running on desktop
292− // 2) switch the battery/power indicator to desktop mode, can't control brightness for now and phone-on-desktop broken (FIXME)
289+ // 1) enable session indicator conditionally, typically when running in a multisession/multiuser environment
290+ // 2) on a PC, switch the battery/power indicator to desktop mode,
291+ // can't control brightness for now and phone-on-desktop broken (FIXME)
293292 //
294293 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
295294 if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
plugins/Unity/Indicators/indicatorsmanager.h+1−1
@@ -35,7 +35,7 @@ class UNITYINDICATORS_EXPORT IndicatorsManager : public QObject
3535 Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)
3636 Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
3737public:
38− explicit IndicatorsManager(QObject* parent = 0);
38+ explicit IndicatorsManager(QObject* parent = nullptr);
3939 ~IndicatorsManager();
4040
4141 Q_INVOKABLE void load();
plugins/Unity/Indicators/indicatorsmodel.h+1−1
@@ -38,7 +38,7 @@ class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
3838
3939public:
4040
41− IndicatorsModel(QObject *parent=0);
41+ IndicatorsModel(QObject *parent=nullptr);
4242 ~IndicatorsModel();
4343
4444 Q_INVOKABLE void load();
plugins/Unity/Indicators/modelprinter.h+1−1
@@ -32,7 +32,7 @@ class ModelPrinter : public QObject
3232 Q_PROPERTY(UnityMenuModel* model READ sourceModel WRITE setSourceModel NOTIFY modelChanged)
3333 Q_PROPERTY(QString text READ text NOTIFY textChanged)
3434public:
35− ModelPrinter(QObject* parent=0);
35+ ModelPrinter(QObject* parent=nullptr);
3636
3737 void setSourceModel(UnityMenuModel* sourceModel);
3838 UnityMenuModel* sourceModel() const;