[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [muon] kded: Consistent usage of nullptr.
From:       Jonathan Thomas <echidnaman () gmail ! com>
Date:       2013-06-05 13:39:08
Message-ID: CAA7M3nVwuTXW5EhqwLyq7GhMwhjT-=Ug7HkBG6uTdJE-2h6qAA () mail ! gmail ! com
[Download RAW message or body]

Oh yeah, I had forgotten about the GSoC project... Busy week last week.

Yeah, with the GSoC project I suppose these changes are a bit unnecessary.
I was mainly trying to fix bug 320750 and saw a few other cleanups that
needed to be done. No biggie though, I didn't waste too much time on it. :P


On Wed, Jun 5, 2013 at 9:30 AM, Aleix Pol <aleixpol@kde.org> wrote:

> You two should talk more...
>
> Aleix
>
>
> On Wed, Jun 5, 2013 at 3:27 PM, Jonathan Thomas <echidnaman@kubuntu.org>wrote:
>
>> Git commit 27a1da4a03564a5bcb5fd617f467eb4a434d6721 by Jonathan Thomas.
>> Committed on 05/06/2013 at 15:27.
>> Pushed by jmthomas into branch 'master'.
>>
>> Consistent usage of nullptr.
>>
>> M  +3    -3    kded/event.cpp
>>
>> http://commits.kde.org/muon/27a1da4a03564a5bcb5fd617f467eb4a434d6721
>>
>> diff --git a/kded/event.cpp b/kded/event.cpp
>> index 7b9f2fc..58d9434 100644
>> --- a/kded/event.cpp
>> +++ b/kded/event.cpp
>> @@ -33,7 +33,7 @@ Event::Event(QObject* parent, const QString &name)
>>          : QObject(parent)
>>          , m_name(name)
>>          , m_hidden(false)
>> -        , m_notifierItem(0)
>> +        , m_notifierItem(nullptr)
>>          , m_active(false)
>>          , m_verbose(false)
>>  {
>> @@ -104,7 +104,7 @@ void Event::show(const QString &icon, const QString
>> &text, const QStringList &ac
>>          }
>>
>>          m_active = true;
>> -        KNotification *notify = new KNotification(m_name, 0, flag);
>> +        KNotification *notify = new KNotification(m_name, nullptr, flag);
>>          notify->setComponentData(KComponentData("muon-notifier"));
>>
>>          KIcon notifyIcon(icon);
>> @@ -164,7 +164,7 @@ void Event::show(const QString &icon, const QString
>> &text, const QStringList &ac
>>          contextMenu->addAction(hideAction);
>>
>>          m_notifierItem->setContextMenu(contextMenu);
>> -        m_notifierItem->setAssociatedWidget(NULL);
>> +        m_notifierItem->setAssociatedWidget(nullptr);
>>
>>          connect(m_notifierItem, SIGNAL(activateRequested(bool,QPoint)),
>> this, SLOT(run()));
>>      }
>>
>>
>

[Attachment #3 (text/html)]

<div dir="ltr">Oh yeah, I had forgotten about the GSoC project... Busy week last \
week.<div><br>Yeah, with the GSoC project I suppose these changes are a bit \
unnecessary. I was mainly trying to fix bug 320750 and saw a few other cleanups that \
needed to be done. No biggie though, I didn&#39;t waste too much time on it. :P</div> \
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Jun 5, 2013 \
at 9:30 AM, Aleix Pol <span dir="ltr">&lt;<a href="mailto:aleixpol@kde.org" \
target="_blank">aleixpol@kde.org</a>&gt;</span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> <div dir="ltr">You two should talk \
more...<div><br></div><div>Aleix</div></div><div class="gmail_extra"><br><br><div \
class="gmail_quote">On Wed, Jun 5, 2013 at 3:27 PM, Jonathan Thomas <span \
dir="ltr">&lt;<a href="mailto:echidnaman@kubuntu.org" \
target="_blank">echidnaman@kubuntu.org</a>&gt;</span> wrote:<br>


<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">Git commit 27a1da4a03564a5bcb5fd617f467eb4a434d6721 by \
Jonathan Thomas.<br> Committed on 05/06/2013 at 15:27.<br>
Pushed by jmthomas into branch &#39;master&#39;.<br>
<br>
Consistent usage of nullptr.<br>
<br>
M  +3    -3    kded/event.cpp<br>
<br>
<a href="http://commits.kde.org/muon/27a1da4a03564a5bcb5fd617f467eb4a434d6721" \
target="_blank">http://commits.kde.org/muon/27a1da4a03564a5bcb5fd617f467eb4a434d6721</a><br>
 <br>
diff --git a/kded/event.cpp b/kded/event.cpp<br>
index 7b9f2fc..58d9434 100644<br>
--- a/kded/event.cpp<br>
+++ b/kded/event.cpp<br>
@@ -33,7 +33,7 @@ Event::Event(QObject* parent, const QString &amp;name)<br>
         : QObject(parent)<br>
         , m_name(name)<br>
         , m_hidden(false)<br>
-        , m_notifierItem(0)<br>
+        , m_notifierItem(nullptr)<br>
         , m_active(false)<br>
         , m_verbose(false)<br>
 {<br>
@@ -104,7 +104,7 @@ void Event::show(const QString &amp;icon, const QString \
&amp;text, const QStringList &amp;ac<br>  }<br>
<br>
         m_active = true;<br>
-        KNotification *notify = new KNotification(m_name, 0, flag);<br>
+        KNotification *notify = new KNotification(m_name, nullptr, flag);<br>
         notify-&gt;setComponentData(KComponentData(&quot;muon-notifier&quot;));<br>
<br>
         KIcon notifyIcon(icon);<br>
@@ -164,7 +164,7 @@ void Event::show(const QString &amp;icon, const QString \
&amp;text, const QStringList &amp;ac<br>  contextMenu-&gt;addAction(hideAction);<br>
<br>
         m_notifierItem-&gt;setContextMenu(contextMenu);<br>
-        m_notifierItem-&gt;setAssociatedWidget(NULL);<br>
+        m_notifierItem-&gt;setAssociatedWidget(nullptr);<br>
<br>
         connect(m_notifierItem, SIGNAL(activateRequested(bool,QPoint)), this, \
SLOT(run()));<br>  }<br>
<br>
</blockquote></div><br></div>
</blockquote></div><br></div>



[prev in list] [next in list] [prev in thread] [next in thread]