Diffstat (limited to 'noncore/apps/opie-reader/BuffDoc.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/BuffDoc.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp index 4fbab93..68391b8 100644 --- a/noncore/apps/opie-reader/BuffDoc.cpp +++ b/noncore/apps/opie-reader/BuffDoc.cpp | |||
@@ -29,23 +29,23 @@ linkType BuffDoc::hyperlink(unsigned int n, QString& wrd) | |||
29 | } | 29 | } |
30 | return bRet; | 30 | return bRet; |
31 | } | 31 | } |
32 | 32 | ||
33 | void BuffDoc::locate(unsigned int n) | 33 | void BuffDoc::locate(unsigned int n) |
34 | { | 34 | { |
35 | // //qDebug("BuffDoc:locating:%u",n); | 35 | // //odebug << "BuffDoc:locating:" << n << "" << oendl; |
36 | lastword.empty(); | 36 | lastword.empty(); |
37 | lastsizes[0] = laststartline = n; | 37 | lastsizes[0] = laststartline = n; |
38 | #ifdef NEWLINEBREAK | 38 | #ifdef NEWLINEBREAK |
39 | lastispara = true; | 39 | lastispara = true; |
40 | #else | 40 | #else |
41 | lastispara = false; | 41 | lastispara = false; |
42 | #endif | 42 | #endif |
43 | // tchar linebuf[1024]; | 43 | // tchar linebuf[1024]; |
44 | if (exp != NULL) exp->locate(n); | 44 | if (exp != NULL) exp->locate(n); |
45 | // //qDebug("BuffDoc:Located"); | 45 | // //odebug << "BuffDoc:Located" << oendl; |
46 | } | 46 | } |
47 | 47 | ||
48 | #ifdef NEWLINEBREAK | 48 | #ifdef NEWLINEBREAK |
49 | bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border) | 49 | bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border) |
50 | { | 50 | { |
51 | bool moreleft = true; | 51 | bool moreleft = true; |
@@ -185,13 +185,13 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border) | |||
185 | *buff = lastword; | 185 | *buff = lastword; |
186 | cs = lastword.laststyle(); | 186 | cs = lastword.laststyle(); |
187 | w -= buff->leftMargin() + buff->rightMargin(); | 187 | w -= buff->leftMargin() + buff->rightMargin(); |
188 | margindone = true; | 188 | margindone = true; |
189 | } | 189 | } |
190 | else buff->empty(); | 190 | else buff->empty(); |
191 | // //qDebug("Buff:%s Lastword:%s", (const char*)toQString(buff->data()), (const char*)toQString(lastword.data())); | 191 | // //odebug << "Buff:" << toQString(buff->data()) << " Lastword:" << toQString(lastword.data()) << "" << oendl; |
192 | lastcheck = len = buff->length(); | 192 | lastcheck = len = buff->length(); |
193 | unsigned int slen = buff->width(len); | 193 | unsigned int slen = buff->width(len); |
194 | if (slen > w) | 194 | if (slen > w) |
195 | { | 195 | { |
196 | for ( ; len > 1; len--) | 196 | for ( ; len > 1; len--) |
197 | { | 197 | { |
@@ -319,14 +319,14 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, int cw, unsigned char _border) | |||
319 | buff->resize(); | 319 | buff->resize(); |
320 | return (ch != UEOF); | 320 | return (ch != UEOF); |
321 | } | 321 | } |
322 | 322 | ||
323 | int BuffDoc::openfile(QWidget* _parent, const char *src) | 323 | int BuffDoc::openfile(QWidget* _parent, const char *src) |
324 | { | 324 | { |
325 | // //qDebug("BuffDoc:Openfile:%s", src); | 325 | // //odebug << "BuffDoc:Openfile:" << src << "" << oendl; |
326 | // //qDebug("Trying aportis %x",exp); | 326 | // //odebug << "Trying aportis " << exp << "" << oendl; |
327 | if (exp != NULL) delete exp; | 327 | if (exp != NULL) delete exp; |
328 | lastword.empty(); | 328 | lastword.empty(); |
329 | lastsizes[0] = laststartline = 0; | 329 | lastsizes[0] = laststartline = 0; |
330 | #ifdef NEWLINEBREAK | 330 | #ifdef NEWLINEBREAK |
331 | lastispara = true; | 331 | lastispara = true; |
332 | #else | 332 | #else |
@@ -375,38 +375,38 @@ int BuffDoc::openfile(QWidget* _parent, const char *src) | |||
375 | exp = new CPlucker; | 375 | exp = new CPlucker; |
376 | ret = exp->openfile(src); | 376 | ret = exp->openfile(src); |
377 | } | 377 | } |
378 | if (ret != 0) | 378 | if (ret != 0) |
379 | { | 379 | { |
380 | delete exp; | 380 | delete exp; |
381 | //qDebug("Trying ppms"); | 381 | //odebug << "Trying ppms" << oendl; |
382 | exp = new ppm_expander; | 382 | exp = new ppm_expander; |
383 | ret = exp->openfile(src); | 383 | ret = exp->openfile(src); |
384 | } | 384 | } |
385 | if (ret != 0) | 385 | if (ret != 0) |
386 | { | 386 | { |
387 | delete exp; | 387 | delete exp; |
388 | exp = new Text; | 388 | exp = new Text; |
389 | // //qDebug("Trying text"); | 389 | // //odebug << "Trying text" << oendl; |
390 | ret = exp->openfile(src); | 390 | ret = exp->openfile(src); |
391 | } | 391 | } |
392 | 392 | ||
393 | if (ret != 0) | 393 | if (ret != 0) |
394 | { | 394 | { |
395 | delete exp; | 395 | delete exp; |
396 | QMessageBox::information(_parent, PROGNAME, "Unknown file compression type","Try another file"); | 396 | QMessageBox::information(_parent, PROGNAME, "Unknown file compression type","Try another file"); |
397 | return ret; | 397 | return ret; |
398 | } | 398 | } |
399 | // //qDebug("Doing final open:%x:%x",exp,filt); | 399 | // //odebug << "Doing final open:" << exp << ":" << filt << "" << oendl; |
400 | 400 | ||
401 | lastword.empty(); | 401 | lastword.empty(); |
402 | lastsizes[0] = laststartline = 0; | 402 | lastsizes[0] = laststartline = 0; |
403 | #ifdef NEWLINEBREAK | 403 | #ifdef NEWLINEBREAK |
404 | lastispara = true; | 404 | lastispara = true; |
405 | #else | 405 | #else |
406 | lastispara = false; | 406 | lastispara = false; |
407 | #endif | 407 | #endif |
408 | exp->locate(0); | 408 | exp->locate(0); |
409 | filt->setsource(exp); | 409 | filt->setsource(exp); |
410 | // //qDebug("BuffDoc:file opened"); | 410 | // //odebug << "BuffDoc:file opened" << oendl; |
411 | return 0; | 411 | return 0; |
412 | } | 412 | } |