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

List:       kde-commits
Subject:    [konsole] src: Use 0 inplace of NULL
From:       Jekyll Wu <adaptee () gmail ! com>
Date:       2012-05-18 12:19:57
Message-ID: 20120518121957.6FADEA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit f77f78a71dc108abecfaee3e1a03a41bd16ac276 by Jekyll Wu.
Committed on 18/05/2012 at 14:18.
Pushed by jekyllwu into branch 'master'.

Use 0 inplace of NULL

M  +3    -3    src/History.cpp

http://commits.kde.org/konsole/f77f78a71dc108abecfaee3e1a03a41bd16ac276

diff --git a/src/History.cpp b/src/History.cpp
index c6d37c9..136344e 100644
--- a/src/History.cpp
+++ b/src/History.cpp
@@ -309,7 +309,7 @@ void* CompactHistoryBlock::allocate(size_t size)
 {
     Q_ASSERT(size > 0);
     if (tail - blockStart + size > blockLength)
-        return NULL;
+        return 0;
 
     void* block = tail;
     tail += size;
@@ -393,9 +393,9 @@ CompactHistoryLine::CompactHistoryLine(const TextLine& line, CompactHistoryBlock
 
         //kDebug() << "number of different formats in string: " << formatLength;
         formatArray = (CharacterFormat*) blockList.allocate(sizeof(CharacterFormat) * formatLength);
-        Q_ASSERT(formatArray != NULL);
+        Q_ASSERT(formatArray != 0);
         text = (quint16*) blockList.allocate(sizeof(quint16) * line.size());
-        Q_ASSERT(text != NULL);
+        Q_ASSERT(text != 0);
 
         length = line.size();
         wrapped = false;
[prev in list] [next in list] [prev in thread] [next in thread]