feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Projectexplorer: Modernize codebase

Browse Source 
Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-04-13 15:52:14 +02:00
parent 79da8a4586
commit 95ac4edfd4
207 changed files with 1047 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/projectexplorer/journaldwatcher.cpp
View File

@@ -34,18 +34,14 @@
namespace ProjectExplorer {
JournaldWatcher *JournaldWatcher::m_instance = 0;
JournaldWatcher *JournaldWatcher::m_instance = nullptr;
namespace Internal {
class JournaldWatcherPrivate
{
public:
JournaldWatcherPrivate() :
m_journalContext(0),
m_notifier(0)
{ }
JournaldWatcherPrivate() = default;
~JournaldWatcherPrivate()
{
teardown();
@@ -67,8 +63,8 @@ public:
};
QList<SubscriberInformation> m_subscriptions;
sd_journal *m_journalContext;
QSocketNotifier *m_notifier;
sd_journal *m_journalContext = nullptr;
QSocketNotifier *m_notifier = nullptr;
};
bool JournaldWatcherPrivate::setup()
@@ -96,11 +92,11 @@ bool JournaldWatcherPrivate::setup()
void JournaldWatcherPrivate::teardown()
{
delete m_notifier;
m_notifier = 0;
m_notifier = nullptr;
if (m_journalContext) {
sd_journal_close(m_journalContext);
m_journalContext = 0;
m_journalContext = nullptr;
}
}
@@ -130,16 +126,16 @@ JournaldWatcher::LogEntry JournaldWatcherPrivate::retrieveEntry()
using namespace Internal;
static JournaldWatcherPrivate *d = 0;
static JournaldWatcherPrivate *d = nullptr;
JournaldWatcher::~JournaldWatcher()
{
d->teardown();
m_instance = 0;
m_instance = nullptr;
delete d;
d = 0;
d = nullptr;
}
JournaldWatcher *JournaldWatcher::instance()