diff options
| author | David Tardon <dtardon@redhat.com> | 2016-02-21 09:47:29 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-02-21 15:39:28 +0100 |
| commit | f06c797ef9796e6a176f30528b21d1ea8fea56fe (patch) | |
| tree | ea8651ab938fce809b4b490135f62e6855cfd8d7 | |
| parent | 7f33506a73f655754f5ec35e1a1e290ac7c39356 (diff) | |
put function defs into namespace
| -rw-r--r-- | src/lib/libsw602_utils.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/libsw602_utils.cpp b/src/lib/libsw602_utils.cpp index 406aa2c..61ad291 100644 --- a/src/lib/libsw602_utils.cpp +++ b/src/lib/libsw602_utils.cpp @@ -11,7 +11,10 @@ #include "libsw602_utils.h" -uint8_t libsw602::readU8(librevenge::RVNGInputStream *input, bool /* bigEndian */) +namespace libsw602 +{ + +uint8_t readU8(librevenge::RVNGInputStream *input, bool /* bigEndian */) { if (!input || input->isEnd()) { @@ -27,7 +30,7 @@ uint8_t libsw602::readU8(librevenge::RVNGInputStream *input, bool /* bigEndian * throw EndOfStreamException(); } -uint16_t libsw602::readU16(librevenge::RVNGInputStream *input, bool bigEndian) +uint16_t readU16(librevenge::RVNGInputStream *input, bool bigEndian) { if (!input || input->isEnd()) { @@ -47,7 +50,7 @@ uint16_t libsw602::readU16(librevenge::RVNGInputStream *input, bool bigEndian) throw EndOfStreamException(); } -uint32_t libsw602::readU32(librevenge::RVNGInputStream *input, bool bigEndian) +uint32_t readU32(librevenge::RVNGInputStream *input, bool bigEndian) { if (!input || input->isEnd()) { @@ -67,7 +70,7 @@ uint32_t libsw602::readU32(librevenge::RVNGInputStream *input, bool bigEndian) throw EndOfStreamException(); } -uint64_t libsw602::readU64(librevenge::RVNGInputStream *input, bool bigEndian) +uint64_t readU64(librevenge::RVNGInputStream *input, bool bigEndian) { if (!input || input->isEnd()) { @@ -87,7 +90,7 @@ uint64_t libsw602::readU64(librevenge::RVNGInputStream *input, bool bigEndian) throw EndOfStreamException(); } -const unsigned char *libsw602::readNBytes(librevenge::RVNGInputStream *const input, const unsigned long numBytes) +const unsigned char *readNBytes(librevenge::RVNGInputStream *const input, const unsigned long numBytes) { if (!input || input->isEnd()) { @@ -107,7 +110,7 @@ const unsigned char *libsw602::readNBytes(librevenge::RVNGInputStream *const inp return s; } -void libsw602::skip(librevenge::RVNGInputStream *input, unsigned long numBytes) +void skip(librevenge::RVNGInputStream *input, unsigned long numBytes) { if (!input || input->isEnd()) { @@ -122,4 +125,6 @@ void libsw602::skip(librevenge::RVNGInputStream *input, unsigned long numBytes) } } +} + /* vim:set shiftwidth=2 softtabstop=2 expandtab: */ |