Diffstat (limited to 'noncore/apps/opie-reader/Bkmks.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/Bkmks.cpp | 182 |
1 files changed, 91 insertions, 91 deletions
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp index 92ed69f..0cb9ea9 100644 --- a/noncore/apps/opie-reader/Bkmks.cpp +++ b/noncore/apps/opie-reader/Bkmks.cpp @@ -20,4 +20,4 @@ Bkmk::Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p) : m_position(_ { - m_anno = new tchar[1]; - m_anno[0] = 0; + m_anno = new tchar[1]; + m_anno[0] = 0; } @@ -25,5 +25,5 @@ Bkmk::Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p) : m_position(_ { - len = ustrlen(_anno)+1; - m_anno = new tchar[len]; - for (int i = 0; i < len; i++) m_anno[i] = _anno[i]; + len = ustrlen(_anno)+1; + m_anno = new tchar[len]; + for (int i = 0; i < len; i++) m_anno[i] = _anno[i]; } @@ -43,4 +43,4 @@ Bkmk& Bkmk::operator=(const Bkmk& rhs) { - delete [] m_name; - m_name = NULL; + delete [] m_name; + m_name = NULL; } @@ -48,4 +48,4 @@ Bkmk& Bkmk::operator=(const Bkmk& rhs) { - delete [] m_anno; - m_anno = NULL; + delete [] m_anno; + m_anno = NULL; } @@ -53,16 +53,16 @@ Bkmk& Bkmk::operator=(const Bkmk& rhs) { - int len = ustrlen(rhs.m_name)+1; - m_name = new tchar[len]; - for (int i = 0; i < len; i++) m_name[i] = rhs.m_name[i]; + int len = ustrlen(rhs.m_name)+1; + m_name = new tchar[len]; + for (int i = 0; i < len; i++) m_name[i] = rhs.m_name[i]; } else - m_name = NULL; + m_name = NULL; if (rhs.m_anno != NULL) { - int len = ustrlen(rhs.m_anno)+1; - m_anno = new tchar[len]; - for (int i = 0; i < len; i++) m_anno[i] = rhs.m_anno[i]; + int len = ustrlen(rhs.m_anno)+1; + m_anno = new tchar[len]; + for (int i = 0; i < len; i++) m_anno[i] = rhs.m_anno[i]; } else - m_anno = NULL; + m_anno = NULL; m_position = rhs.m_position; @@ -80,4 +80,4 @@ void Bkmk::setAnno(tchar* t) { - delete [] m_anno; - m_anno = NULL; + delete [] m_anno; + m_anno = NULL; } @@ -85,8 +85,8 @@ void Bkmk::setAnno(tchar* t) { - int len = ustrlen(t)+1; - m_anno = new tchar[len]; - for (int i = 0; i < len; i++) m_anno[i] = t[i]; + int len = ustrlen(t)+1; + m_anno = new tchar[len]; + for (int i = 0; i < len; i++) m_anno[i] = t[i]; } else - m_anno = NULL; + m_anno = NULL; } @@ -99,3 +99,3 @@ BkmkFile::BkmkFile(const char *fnm, bool w = false) { - f = fopen(fnm, "wb"); + f = fopen(fnm, "wb"); } @@ -103,3 +103,3 @@ BkmkFile::BkmkFile(const char *fnm, bool w = false) { - f = fopen(fnm, "rb"); + f = fopen(fnm, "rb"); } @@ -116,9 +116,9 @@ void BkmkFile::write(tchar* nm, tchar* an, const unsigned int& pos) { - unsigned short ln = ustrlen(nm); - fwrite(&ln,sizeof(ln),1,f); - fwrite(nm,sizeof(tchar),ln,f); - ln = ustrlen(an); - fwrite(&ln,sizeof(ln),1,f); - if (ln > 0) fwrite(an,sizeof(tchar),ln,f); - fwrite(&pos,sizeof(pos),1,f); + unsigned short ln = ustrlen(nm); + fwrite(&ln,sizeof(ln),1,f); + fwrite(nm,sizeof(tchar),ln,f); + ln = ustrlen(an); + fwrite(&ln,sizeof(ln),1,f); + if (ln > 0) fwrite(an,sizeof(tchar),ln,f); + fwrite(&pos,sizeof(pos),1,f); } @@ -132,7 +132,7 @@ void BkmkFile::write(CList<Bkmk>& bl) { - fwrite(&magic, sizeof(magic), 1, f); - for (CList<Bkmk>::iterator i = bl.begin(); i != bl.end(); i++) - { - write(*i); - } + fwrite(&magic, sizeof(magic), 1, f); + for (CList<Bkmk>::iterator i = bl.begin(); i != bl.end(); i++) + { + write(*i); + } } @@ -145,16 +145,16 @@ Bkmk* BkmkFile::read() { - unsigned short ln; - if (fread(&ln,sizeof(ln),1,f) == 1) - { - b = new Bkmk; - b->m_name = new tchar[ln+1]; - fread(b->m_name,sizeof(tchar),ln,f); - b->m_name[ln] = 0; - - fread(&ln,sizeof(ln),1,f); - b->m_anno = new tchar[ln+1]; - if (ln > 0) fread(b->m_anno,sizeof(tchar),ln,f); - b->m_anno[ln] = 0; - fread(&b->m_position,sizeof(b->m_position),1,f); - } + unsigned short ln; + if (fread(&ln,sizeof(ln),1,f) == 1) + { + b = new Bkmk; + b->m_name = new tchar[ln+1]; + fread(b->m_name,sizeof(tchar),ln,f); + b->m_name[ln] = 0; + + fread(&ln,sizeof(ln),1,f); + b->m_anno = new tchar[ln+1]; + if (ln > 0) fread(b->m_anno,sizeof(tchar),ln,f); + b->m_anno[ln] = 0; + fread(&b->m_position,sizeof(b->m_position),1,f); + } } @@ -168,22 +168,22 @@ CList<Bkmk>* BkmkFile::readall() { - unsigned long newmagic; - fread(&newmagic, sizeof(newmagic), 1, f); - if (newmagic != magic) - { - if (QMessageBox::warning(NULL, "Old bookmark file!", "Which version of QTReader\ndid you upgrade from?", "0_4*", "Any other version") == 0) - { - fseek(f,0,SEEK_SET); - bl = readall04(); - } - else - { - fseek(f,0,SEEK_SET); - bl = readall03(); - } - isUpgraded = true; - } - else - { - bl = readall04(); - } + unsigned long newmagic; + fread(&newmagic, sizeof(newmagic), 1, f); + if (newmagic != magic) + { + if (QMessageBox::warning(NULL, "Old bookmark file!", "Which version of OpieReader\ndid you upgrade from?", "0_4*", "Any other version") == 0) + { + fseek(f,0,SEEK_SET); + bl = readall04(); + } + else + { + fseek(f,0,SEEK_SET); + bl = readall03(); + } + isUpgraded = true; + } + else + { + bl = readall04(); + } } @@ -197,6 +197,6 @@ CList<Bkmk>* BkmkFile::readall04() { - Bkmk* b = read(); - if (b == NULL) break; - bl->push_back(*b); - delete b; + Bkmk* b = read(); + if (b == NULL) break; + bl->push_back(*b); + delete b; } @@ -210,6 +210,6 @@ CList<Bkmk>* BkmkFile::readall03() { - Bkmk* b = read03(); - if (b == NULL) break; - bl->push_back(*b); - delete b; + Bkmk* b = read03(); + if (b == NULL) break; + bl->push_back(*b); + delete b; } @@ -223,16 +223,16 @@ Bkmk* BkmkFile::read03() { - unsigned short ln; - if (fread(&ln,sizeof(ln),1,f) == 1) - { - b = new Bkmk; - b->m_name = new tchar[ln+1]; - fread(b->m_name,sizeof(tchar),ln,f); - b->m_name[ln] = 0; + unsigned short ln; + if (fread(&ln,sizeof(ln),1,f) == 1) + { + b = new Bkmk; + b->m_name = new tchar[ln+1]; + fread(b->m_name,sizeof(tchar),ln,f); + b->m_name[ln] = 0; - ln = 0; - b->m_anno = new tchar[ln+1]; - b->m_anno[ln] = 0; + ln = 0; + b->m_anno = new tchar[ln+1]; + b->m_anno[ln] = 0; - fread(&b->m_position,sizeof(b->m_position),1,f); - } + fread(&b->m_position,sizeof(b->m_position),1,f); + } } |