diff options
Diffstat (limited to 'src/kvilib/file/KviFile.cpp')
| -rw-r--r-- | src/kvilib/file/KviFile.cpp | 92 |
1 files changed, 56 insertions, 36 deletions
diff --git a/src/kvilib/file/KviFile.cpp b/src/kvilib/file/KviFile.cpp index 98213aedc..1d19cb653 100644 --- a/src/kvilib/file/KviFile.cpp +++ b/src/kvilib/file/KviFile.cpp @@ -29,12 +29,12 @@ #include <QByteArray> KviFile::KviFile() -: QFile() + : QFile() { } KviFile::KviFile(const QString & szName) -: QFile(szName) + : QFile(szName) { } @@ -44,7 +44,7 @@ KviFile::~KviFile() bool KviFile::save(kvi_u8_t t) { - return (write((const char *)(&t),sizeof(kvi_u8_t)) == sizeof(kvi_u8_t)); + return (write((const char *)(&t), sizeof(kvi_u8_t)) == sizeof(kvi_u8_t)); } bool KviFile::save(kvi_u16_t t) @@ -52,7 +52,7 @@ bool KviFile::save(kvi_u16_t t) #ifndef LOCAL_CPU_LITTLE_ENDIAN t = KviByteOrder::localCpuToLittleEndian16(t); #endif - return (write((const char *)(&t),sizeof(kvi_u16_t)) == sizeof(kvi_u16_t)); + return (write((const char *)(&t), sizeof(kvi_u16_t)) == sizeof(kvi_u16_t)); } bool KviFile::save(kvi_u32_t t) @@ -60,7 +60,7 @@ bool KviFile::save(kvi_u32_t t) #ifndef LOCAL_CPU_LITTLE_ENDIAN t = KviByteOrder::localCpuToLittleEndian32(t); #endif - return (write((const char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)); + return (write((const char *)(&t), sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)); } bool KviFile::save(kvi_u64_t t) @@ -68,64 +68,72 @@ bool KviFile::save(kvi_u64_t t) #ifndef LOCAL_CPU_LITTLE_ENDIAN t = KviByteOrder::localCpuToLittleEndian64(t); #endif - return (write((const char *)(&t),sizeof(kvi_u64_t)) == sizeof(kvi_u64_t)); + return (write((const char *)(&t), sizeof(kvi_u64_t)) == sizeof(kvi_u64_t)); } bool KviFile::save(const QByteArray & data) { - if(!save((kvi_u32_t)(data.size())))return false; - return (write(data.data(),data.size()) == ((unsigned int)(data.size()))); + if(!save((kvi_u32_t)(data.size()))) + return false; + return (write(data.data(), data.size()) == ((unsigned int)(data.size()))); } bool KviFile::save(const QString & szData) { QByteArray c = szData.toUtf8(); - if(!save((kvi_u32_t)(c.length())))return false; - return (write(c.data(),c.length()) == ((unsigned int)(c.length()))); + if(!save((kvi_u32_t)(c.length()))) + return false; + return (write(c.data(), c.length()) == ((unsigned int)(c.length()))); } bool KviFile::save(const KviCString & szData) { - if(!save((kvi_u32_t)(szData.len())))return false; - return (write(szData.ptr(),szData.len()) == (unsigned int) szData.len()); + if(!save((kvi_u32_t)(szData.len()))) + return false; + return (write(szData.ptr(), szData.len()) == (unsigned int)szData.len()); } bool KviFile::save(KviPointerList<KviCString> * pData) { - if(!save((int)(pData->count())))return false; - for(KviCString * s = pData->first();s;s = pData->next()) + if(!save((int)(pData->count()))) + return false; + for(KviCString * s = pData->first(); s; s = pData->next()) { - if(!save(*s))return false; + if(!save(*s)) + return false; } return true; } -bool KviFile::load(kvi_u8_t &t) +bool KviFile::load(kvi_u8_t & t) { - return (read((char *)(&t),sizeof(kvi_u8_t)) == sizeof(kvi_u8_t)); + return (read((char *)(&t), sizeof(kvi_u8_t)) == sizeof(kvi_u8_t)); } -bool KviFile::load(kvi_u16_t &t) +bool KviFile::load(kvi_u16_t & t) { - if(!(read((char *)(&t),sizeof(kvi_u16_t)) == sizeof(kvi_u16_t)))return false; + if(!(read((char *)(&t), sizeof(kvi_u16_t)) == sizeof(kvi_u16_t))) + return false; #ifndef LOCAL_CPU_LITTLE_ENDIAN t = KviByteOrder::littleEndianToLocalCpu16(t); #endif return true; } -bool KviFile::load(kvi_u32_t &t) +bool KviFile::load(kvi_u32_t & t) { - if(!(read((char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)))return false; + if(!(read((char *)(&t), sizeof(kvi_u32_t)) == sizeof(kvi_u32_t))) + return false; #ifndef LOCAL_CPU_LITTLE_ENDIAN t = KviByteOrder::littleEndianToLocalCpu32(t); #endif return true; } -bool KviFile::load(kvi_u64_t &t) +bool KviFile::load(kvi_u64_t & t) { - if(!(read((char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)))return false; + if(!(read((char *)(&t), sizeof(kvi_u32_t)) == sizeof(kvi_u32_t))) + return false; #ifndef LOCAL_CPU_LITTLE_ENDIAN t = KviByteOrder::littleEndianToLocalCpu32(t); #endif @@ -135,19 +143,23 @@ bool KviFile::load(kvi_u64_t &t) bool KviFile::load(QByteArray & data) { kvi_u32_t iLen; - if(!load(iLen))return false; + if(!load(iLen)) + return false; data.resize(iLen); // it is automatically null terminated in Qt 4.x... BLEAH :D - if(read((char *)(data.data()),iLen) != iLen)return false; + if(read((char *)(data.data()), iLen) != iLen) + return false; return true; } bool KviFile::load(QString & szData) { kvi_u32_t iLen; - if(!load(iLen))return false; + if(!load(iLen)) + return false; QByteArray tmp; tmp.resize(iLen + 1); - if(read((char *)(tmp.data()),iLen) != iLen)return false; + if(read((char *)(tmp.data()), iLen) != iLen) + return false; *(tmp.data() + iLen) = 0; szData = QString::fromUtf8(tmp.data()); return true; @@ -156,17 +168,19 @@ bool KviFile::load(QString & szData) bool KviFile::load(KviCString & szData) { kvi_u32_t iLen; - if(!load(iLen))return false; + if(!load(iLen)) + return false; szData.setLen(iLen); - return (read((char *)(szData.ptr()),iLen) == iLen); + return (read((char *)(szData.ptr()), iLen) == iLen); } bool KviFile::load(KviPointerList<KviCString> * pData) { pData->clear(); int iCount; - if(!load(iCount))return false; - for(int i=0;i<iCount;i++) + if(!load(iCount)) + return false; + for(int i = 0; i < iCount; i++) { KviCString * s = new KviCString(); if(!load(*s)) @@ -185,8 +199,10 @@ bool KviFile::skipFirst(char t, unsigned int uMaxDist) while(uMaxDist > 0) { char c; - if(!getChar(&c))return false; - if(((char)c) == t)return true; + if(!getChar(&c)) + return false; + if(((char)c) == t) + return true; uMaxDist--; } return false; @@ -198,12 +214,16 @@ bool KviFile::skipFirst(const KviCString & szT, unsigned int uMaxDist) while(uMaxDist > 0) { char c; - if(!getChar(&c))return false; + if(!getChar(&c)) + return false; if(c == *pcPtr) { pcPtr++; - if(!*pcPtr)return true; - } else { + if(!*pcPtr) + return true; + } + else + { pcPtr = szT.ptr(); } uMaxDist--; |