summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-08-11 22:01:30 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-08-11 22:01:30 +0200
commit9ac3671bb3e1010ed13dbb3b32bd0bbdcd01f7e6 (patch)
tree3f5872c120b7d72a7ac10d29d8e28d6362d1183f
parent254d9f55ca60e070c11f2c3f7ca196b0a6c5aceb (diff)
Convert 0 to nullptr where it's used as a pointer value
To make the code easier to read, because this means the remaining zeros all mean numbers. Change-Id: I4c904506b56946d9f14ac64381995d2bdbdf1e50
-rw-r--r--src/conv/html/abw2html.cpp2
-rw-r--r--src/conv/raw/abw2raw.cpp2
-rw-r--r--src/conv/text/abw2text.cpp2
-rw-r--r--src/lib/ABWContentCollector.cpp2
-rw-r--r--src/lib/ABWOutputElements.cpp4
-rw-r--r--src/lib/ABWParser.cpp2
-rw-r--r--src/lib/ABWStylesCollector.cpp2
-rw-r--r--src/lib/ABWStylesCollector.h2
-rw-r--r--src/lib/ABWXMLHelper.cpp2
-rw-r--r--src/lib/ABWXMLHelper.h2
-rw-r--r--src/lib/ABWZlibStream.cpp6
-rw-r--r--src/lib/ABWZlibStream.h6
12 files changed, 17 insertions, 17 deletions
diff --git a/src/conv/html/abw2html.cpp b/src/conv/html/abw2html.cpp
index 457e795..4b8f67d 100644
--- a/src/conv/html/abw2html.cpp
+++ b/src/conv/html/abw2html.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
if (argc < 2)
return printUsage();
- char *file = 0;
+ char *file = nullptr;
for (int i = 1; i < argc; i++)
{
diff --git a/src/conv/raw/abw2raw.cpp b/src/conv/raw/abw2raw.cpp
index 3d71bd2..5c67e92 100644
--- a/src/conv/raw/abw2raw.cpp
+++ b/src/conv/raw/abw2raw.cpp
@@ -53,7 +53,7 @@ int printVersion()
int main(int argc, char *argv[])
{
bool printIndentLevel = false;
- char *file = 0;
+ char *file = nullptr;
if (argc < 2)
return printUsage();
diff --git a/src/conv/text/abw2text.cpp b/src/conv/text/abw2text.cpp
index aed75dc..37b57b9 100644
--- a/src/conv/text/abw2text.cpp
+++ b/src/conv/text/abw2text.cpp
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
if (argc < 2)
return printUsage();
- char *szInputFile = 0;
+ char *szInputFile = nullptr;
bool isInfo = false;
for (int i = 1; i < argc; i++)
diff --git a/src/lib/ABWContentCollector.cpp b/src/lib/ABWContentCollector.cpp
index 8d09a26..af9717e 100644
--- a/src/lib/ABWContentCollector.cpp
+++ b/src/lib/ABWContentCollector.cpp
@@ -2193,7 +2193,7 @@ void libabw::ABWContentCollector::openFrame(const char *props, const char *image
void libabw::ABWContentCollector::closeFrame(libabw::ABWOutputElements *(&elements), bool &pageFrame)
{
- elements=0;
+ elements=nullptr;
pageFrame=false;
if (m_ps->m_isNote)
{
diff --git a/src/lib/ABWOutputElements.cpp b/src/lib/ABWOutputElements.cpp
index b315533..35e8ae0 100644
--- a/src/lib/ABWOutputElements.cpp
+++ b/src/lib/ABWOutputElements.cpp
@@ -823,7 +823,7 @@ void libabw::ABWOpenPageSpanElement::_writeElements(librevenge::RVNGTextInterfac
for (OutputElements_t::const_iterator iterVec = iterMap->second.begin();
iterVec != iterMap->second.end(); ++iterVec)
- (*iterVec)->write(iface, 0, 0);
+ (*iterVec)->write(iface, nullptr, nullptr);
}
void libabw::ABWOpenParagraphElement::write(librevenge::RVNGTextInterface *iface,
@@ -893,7 +893,7 @@ void libabw::ABWOpenUnorderedListLevelElement::write(librevenge::RVNGTextInterfa
// ABWOutputElements
libabw::ABWOutputElements::ABWOutputElements()
- : m_bodyElements(), m_headerElements(), m_footerElements(), m_elements(0)
+ : m_bodyElements(), m_headerElements(), m_footerElements(), m_elements(nullptr)
{
m_elements = &m_bodyElements;
}
diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
index 5867855..7d251af 100644
--- a/src/lib/ABWParser.cpp
+++ b/src/lib/ABWParser.cpp
@@ -665,7 +665,7 @@ void libabw::ABWParser::readCloseFrame()
{
if (!m_collector)
return;
- ABWOutputElements *elements=0;
+ ABWOutputElements *elements=nullptr;
bool pageFrame=false;
m_collector->closeFrame(elements,pageFrame);
if (m_state->m_inStyleParsing)
diff --git a/src/lib/ABWStylesCollector.cpp b/src/lib/ABWStylesCollector.cpp
index 773a85b..b3215b9 100644
--- a/src/lib/ABWStylesCollector.cpp
+++ b/src/lib/ABWStylesCollector.cpp
@@ -102,7 +102,7 @@ static int abw_unichar_to_utf8(unsigned c, char *outbuf)
static void appendUCS4(librevenge::RVNGString &str, unsigned ucs4)
{
- int charLength = abw_unichar_to_utf8(ucs4, 0);
+ int charLength = abw_unichar_to_utf8(ucs4, nullptr);
std::vector<char> utf8(charLength+1);
utf8[charLength] = '\0';
abw_unichar_to_utf8(ucs4, utf8.data());
diff --git a/src/lib/ABWStylesCollector.h b/src/lib/ABWStylesCollector.h
index ea13f42..bc7ba42 100644
--- a/src/lib/ABWStylesCollector.h
+++ b/src/lib/ABWStylesCollector.h
@@ -91,7 +91,7 @@ public:
void openFrame(const char *, const char *, const char *, const char *) override {}
void closeFrame(ABWOutputElements *(&elements), bool &) override
{
- elements=0;
+ elements=nullptr;
}
void addFrameElements(ABWOutputElements &, bool) override {}
diff --git a/src/lib/ABWXMLHelper.cpp b/src/lib/ABWXMLHelper.cpp
index fe8638e..3f82938 100644
--- a/src/lib/ABWXMLHelper.cpp
+++ b/src/lib/ABWXMLHelper.cpp
@@ -131,7 +131,7 @@ void ABWXMLProgressWatcher::signalError()
std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)> xmlReaderForStream(librevenge::RVNGInputStream *input, ABWXMLProgressWatcher *watcher)
{
std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)> reader(
- xmlReaderForIO(abwxmlInputReadFunc, abwxmlInputCloseFunc, (void *)input, 0, 0,
+ xmlReaderForIO(abwxmlInputReadFunc, abwxmlInputCloseFunc, (void *)input, nullptr, nullptr,
XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER),
xmlFreeTextReader);
if (watcher)
diff --git a/src/lib/ABWXMLHelper.h b/src/lib/ABWXMLHelper.h
index b657b19..0c2c8fc 100644
--- a/src/lib/ABWXMLHelper.h
+++ b/src/lib/ABWXMLHelper.h
@@ -56,7 +56,7 @@ private:
};
// create an xmlTextReader pointer from a librevenge::RVNGInputStream pointer
-std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)> xmlReaderForStream(librevenge::RVNGInputStream *input, ABWXMLProgressWatcher *watcher = 0);
+std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)> xmlReaderForStream(librevenge::RVNGInputStream *input, ABWXMLProgressWatcher *watcher = nullptr);
} // namespace libabw
diff --git a/src/lib/ABWZlibStream.cpp b/src/lib/ABWZlibStream.cpp
index 9cffe78..0419448 100644
--- a/src/lib/ABWZlibStream.cpp
+++ b/src/lib/ABWZlibStream.cpp
@@ -80,7 +80,7 @@ static bool getInflatedBuffer(librevenge::RVNGInputStream *input, std::vector<un
ABWZlibStream::ABWZlibStream(librevenge::RVNGInputStream *input) :
librevenge::RVNGInputStream(),
- m_input(0),
+ m_input(nullptr),
m_offset(0),
m_buffer()
{
@@ -104,7 +104,7 @@ const unsigned char *ABWZlibStream::read(unsigned long numBytes, unsigned long &
numBytesRead = 0;
if (numBytes == 0)
- return 0;
+ return nullptr;
unsigned long numBytesToRead;
@@ -116,7 +116,7 @@ const unsigned char *ABWZlibStream::read(unsigned long numBytes, unsigned long &
numBytesRead = numBytesToRead; // about as paranoid as we can be..
if (numBytesToRead == 0)
- return 0;
+ return nullptr;
long oldOffset = m_offset;
m_offset += numBytesToRead;
diff --git a/src/lib/ABWZlibStream.h b/src/lib/ABWZlibStream.h
index faef028..e8ba4ee 100644
--- a/src/lib/ABWZlibStream.h
+++ b/src/lib/ABWZlibStream.h
@@ -32,7 +32,7 @@ public:
}
const char *subStreamName(unsigned) override
{
- return 0;
+ return nullptr;
}
bool existsSubStream(const char *) override
{
@@ -40,11 +40,11 @@ public:
}
librevenge::RVNGInputStream *getSubStreamByName(const char *) override
{
- return 0;
+ return nullptr;
}
librevenge::RVNGInputStream *getSubStreamById(unsigned) override
{
- return 0;
+ return nullptr;
}
const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) override;
int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override;