summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-reader
Side-by-side diff
Diffstat (limited to 'noncore/apps/opie-reader') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-reader/Aportis.cpp8
-rw-r--r--noncore/apps/opie-reader/Bkmks.cpp6
-rw-r--r--noncore/apps/opie-reader/BuffDoc.cpp18
-rw-r--r--noncore/apps/opie-reader/CDrawBuffer.cpp22
-rw-r--r--noncore/apps/opie-reader/QTReader.cpp52
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp279
-rw-r--r--noncore/apps/opie-reader/StyleConsts.cpp2
-rw-r--r--noncore/apps/opie-reader/fileBrowser.cpp8
-rw-r--r--noncore/apps/opie-reader/opie-reader.pro2
-rw-r--r--noncore/apps/opie-reader/plucker.cpp10
-rw-r--r--noncore/apps/opie-reader/plucker_base.cpp148
11 files changed, 282 insertions, 273 deletions
diff --git a/noncore/apps/opie-reader/Aportis.cpp b/noncore/apps/opie-reader/Aportis.cpp
index 2f8cdc3..06f44a4 100644
--- a/noncore/apps/opie-reader/Aportis.cpp
+++ b/noncore/apps/opie-reader/Aportis.cpp
@@ -25,20 +25,20 @@ CList<Bkmk>* Aportis::getbkmklist()
{
CList<Bkmk>* t = new CList<Bkmk>;
for (int i = nRecs; i < nRecs2; i++)
{
char name[17];
name[16] = '\0';
-// qDebug("Record:%d, Length:%u",i,recordlength(i));
+// odebug << "Record:" << i << ", Length:" << recordlength(i) << "" << oendl;
gotorecordnumber(i);
fread(name,1,16,fin);
unsigned long lcn;
fread(&lcn,sizeof(lcn),1,fin);
lcn ^= 0xa5a5a5a5;
lcn = SwapLong(lcn);
-// qDebug("Bookmark:%s:%u", name,lcn);
+// odebug << "Bookmark:" << name << ":" << lcn << "" << oendl;
tchar tname[17];
memset(tname, 0, sizeof(tname));
for (int i = 0; name[i] != 0; i++)
{
tname[i] = name[i] ^ 0xa5;
}
@@ -118,13 +118,13 @@ int Aportis::OpenFile(const char *src)
if (peanutfile)
{
PeanutHeader hdr0;
gotorecordnumber(0);
fread(&hdr0, sizeof(hdr0), 1, fin);
-// qDebug("Version:%x", ntohs(hdr0.Version));
+// odebug << "Version:" << ntohs(hdr0.Version) << "" << oendl;
if (hdr0.Version && 0x0200)
{
bCompressed = 2;
}
else
{
@@ -179,13 +179,13 @@ int Aportis::OpenFile(const char *src)
// this is the main record buffer
// it knows how to stretch to accomodate the decompress
currentrec = 0;
cbptr = 0;
outptr = 0;
refreshbuffer();
-// qDebug("Number of records:[%u,%u]", nRecs, nRecs2);
+// odebug << "Number of records:[" << nRecs << "," << nRecs2 << "]" << oendl;
return ret;
}
int Aportis::getch()
{
if (bCompressed == 1)
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 16bc1f1..480c240 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -214,21 +214,21 @@ CList<Bkmk>* BkmkFile::readall()
{
switch(newmagic & 0xff)
{
case 6:
isUpgraded = false;
bl = readall00(read06);
-// qDebug("Correct version!");
+// odebug << "Correct version!" << oendl;
break;
case 5:
isUpgraded = true;
bl = readall00(read05);
-// qDebug("Known version!");
+// odebug << "Known version!" << oendl;
break;
default:
-// qDebug("Unknown version!");
+// odebug << "Unknown version!" << oendl;
isUpgraded = true;
bl = readall00(read05);
}
}
}
return bl;
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)
}
return bRet;
}
void BuffDoc::locate(unsigned int n)
{
- // //qDebug("BuffDoc:locating:%u",n);
+ // //odebug << "BuffDoc:locating:" << n << "" << oendl;
lastword.empty();
lastsizes[0] = laststartline = n;
#ifdef NEWLINEBREAK
lastispara = true;
#else
lastispara = false;
#endif
// tchar linebuf[1024];
if (exp != NULL) exp->locate(n);
- // //qDebug("BuffDoc:Located");
+ // //odebug << "BuffDoc:Located" << oendl;
}
#ifdef NEWLINEBREAK
bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border)
{
bool moreleft = true;
@@ -185,13 +185,13 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border)
*buff = lastword;
cs = lastword.laststyle();
w -= buff->leftMargin() + buff->rightMargin();
margindone = true;
}
else buff->empty();
-// //qDebug("Buff:%s Lastword:%s", (const char*)toQString(buff->data()), (const char*)toQString(lastword.data()));
+// //odebug << "Buff:" << toQString(buff->data()) << " Lastword:" << toQString(lastword.data()) << "" << oendl;
lastcheck = len = buff->length();
unsigned int slen = buff->width(len);
if (slen > w)
{
for ( ; len > 1; len--)
{
@@ -319,14 +319,14 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, int cw, unsigned char _border)
buff->resize();
return (ch != UEOF);
}
int BuffDoc::openfile(QWidget* _parent, const char *src)
{
- // //qDebug("BuffDoc:Openfile:%s", src);
- // //qDebug("Trying aportis %x",exp);
+ // //odebug << "BuffDoc:Openfile:" << src << "" << oendl;
+ // //odebug << "Trying aportis " << exp << "" << oendl;
if (exp != NULL) delete exp;
lastword.empty();
lastsizes[0] = laststartline = 0;
#ifdef NEWLINEBREAK
lastispara = true;
#else
@@ -375,38 +375,38 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
exp = new CPlucker;
ret = exp->openfile(src);
}
if (ret != 0)
{
delete exp;
- //qDebug("Trying ppms");
+ //odebug << "Trying ppms" << oendl;
exp = new ppm_expander;
ret = exp->openfile(src);
}
if (ret != 0)
{
delete exp;
exp = new Text;
-// //qDebug("Trying text");
+// //odebug << "Trying text" << oendl;
ret = exp->openfile(src);
}
if (ret != 0)
{
delete exp;
QMessageBox::information(_parent, PROGNAME, "Unknown file compression type","Try another file");
return ret;
}
- // //qDebug("Doing final open:%x:%x",exp,filt);
+ // //odebug << "Doing final open:" << exp << ":" << filt << "" << oendl;
lastword.empty();
lastsizes[0] = laststartline = 0;
#ifdef NEWLINEBREAK
lastispara = true;
#else
lastispara = false;
#endif
exp->locate(0);
filt->setsource(exp);
- // //qDebug("BuffDoc:file opened");
+ // //odebug << "BuffDoc:file opened" << oendl;
return 0;
}
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index ec36fb2..b137ac3 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -37,13 +37,13 @@ void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
len = i;
}
CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
{
int i;
-// //qDebug("Trying 2");
+// //odebug << "Trying 2" << oendl;
len = rhs.len;
m_maxstyle = rhs.m_maxstyle;
m_ascent = rhs.m_ascent;
m_descent = rhs.m_descent;
m_lineSpacing = rhs.m_lineSpacing;
m_lineExtraSpacing = rhs.m_lineExtraSpacing;
@@ -55,13 +55,13 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
{
segs.push_back(*iter);
}
for (i = 0; rhs[i] != '\0'; i++) (*this)[i] = rhs[i];
(*this)[i] = '\0';
len = i;
-// //qDebug("Tried 2");
+// //odebug << "Tried 2" << oendl;
return *this;
}
CDrawBuffer& CDrawBuffer::operator=(const tchar*sztmp)
{
int i;
@@ -205,13 +205,13 @@ int CDrawBuffer::width(int numchars, bool onscreen, int scwidth, unsigned char _
spacesofar += nexttoadd;
lastspace = nsp;
}
else
{
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
cx += lw;
lastspace = nsp;
}
}
QString nstr = str.right(str.length()-1-lastspace);
@@ -314,13 +314,13 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
{
textend++;
int end = (textend != segs.end()) ? textend->start : len;
CStyle currentstyle = textstart->style;
QFont f((currentstyle.isMono() && fc->hasCourier()) ? fc->fixedfontname() : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
// f.setUnderline(currentstyle.isUnderline());
-// if (currentstyle.isUnderline()) qDebug("UNDERLINE");
+// if (currentstyle.isUnderline()) odebug << "UNDERLINE" << oendl;
_p->setFont(f);
QString str = text.mid(textstart->start, end-textstart->start);
#if defined(OPIE) || !defined(USEQPE)
_p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/100));
#else
_p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/10));
@@ -405,23 +405,23 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
{
if (nsp+textstart->start >= nonspace)
{
spacenumber++;
int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar;
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
_p->drawText( cx, _y+voffset, nstr);
cx += lw+nexttoadd;
spacesofar += nexttoadd;
lastspace = nsp;
}
else
{
QString nstr = str.mid(lastspace+1, nsp-lastspace);
-// qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+// odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl;
int lw = fm.width(nstr);
_p->drawText( cx, _y+voffset, nstr);
cx += lw;
lastspace = nsp;
}
}
@@ -467,20 +467,20 @@ linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
do
{
textend++;
end = (textend != segs.end()) ? textend->start : len;
currentstyle = textstart->style;
/*
- if (currentstyle.isPicture()) qDebug("Passed thru picture");
- if (currentstyle.getLink()) qDebug("Passed thru link");
- //qDebug("islink:%d - %d", numchars, end);
+ if (currentstyle.isPicture()) odebug << "Passed thru picture" << oendl;
+ if (currentstyle.getLink()) odebug << "Passed thru link" << oendl;
+ //odebug << "islink:" << numchars << " - " << end << "" << oendl;
*/
textstart = textend;
}
while (textend != segs.end() && end <= numchars);
-// if (currentstyle.isPicture()) qDebug("Clicked on picture");
+// if (currentstyle.isPicture()) odebug << "Clicked on picture" << oendl;
if (currentstyle.getPictureLink())
{
tgt = currentstyle.getPictureLinkData();
return ePicture;
}
if (currentstyle.getLink())
@@ -536,11 +536,11 @@ void CDrawBuffer::resize()
m_descent += xt;
m_lineSpacing += xt;
}
if (m_bSop)
{
int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10;
-// qDebug("ExtraSpace:%d", xt);
+// odebug << "ExtraSpace:" << xt << "" << oendl;
m_ascent += xt;
m_lineSpacing += xt;
}
}
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index d64abb4..b356ba5 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -77,37 +77,37 @@ QTReader::QTReader( const QString& filename, QWidget *parent=0, const tchar *nam
bdblspce(false),
btight(false),
bindenter(0),
m_fm(NULL)
{
init();
-// // qDebug("Load_file(1)");
+// // odebug << "Load_file(1)" << oendl;
load_file((const tchar*)filename);
}
*/
/*
void QTReader::mouseMoveEvent(QMouseEvent* _e)
{
mouseUpOn = !(_e->pos().x() == -1);
- qDebug("MouseMove:[%d, %d]", _e->pos().x(), _e->pos().y());
+ odebug << "MouseMove:[" << _e->pos().x() << ", " << _e->pos().y() << "]" << oendl;
}
*/
long QTReader::real_delay()
{
return ( 8976 + m_delay ) / ( m_linespacing * m_linespacing );
}
void QTReader::mousePressEvent( QMouseEvent* _e )
{
buffdoc.unsuspend();
if (_e->button() == RightButton)
{
-// qDebug("MousePress");
+// odebug << "MousePress" << oendl;
mouseUpOn = false;
if (m_swapmouse)
{
int lineno = 0;
int ht = textarray[0]->lineSpacing();
while ((ht < _e->y()) && (lineno < numlines))
@@ -314,35 +314,35 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
{
int i = first+1;
while (QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
if (t->width(i, true, width(), m_border) > tgt)
{
wrd = toQString(t->data()+first, i - first);
-// qDebug("Got %s", (const char *)wrd);
+// odebug << "Got " << (const char *)wrd << "" << oendl;
break;
}
while (!QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
if ((*t)[i] == 0) break;
first = i;
}
}
if (!wrd.isEmpty())
{
-// qDebug("Selected:%s", (const char*)wrd);
+// odebug << "Selected:" << wrd << "" << oendl;
emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data()));
}
}
void QTReader::mouseReleaseEvent( QMouseEvent* _e )
{
buffdoc.unsuspend();
if (_e->button() == LeftButton)
{
if (mouseUpOn)
{
-// qDebug("MouseRelease");
+// odebug << "MouseRelease" << oendl;
if (_e->x() > width() - m_border)
{
locate(buffdoc.startSection()+((buffdoc.endSection()-buffdoc.startSection())*_e->y()+height()/2)/height());
return;
}
if (textarray[0] != NULL)
@@ -391,13 +391,13 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
locate(pagelocate());
}
return;
}
case ePicture:
{
-// qDebug("Picture:%x", tgt);
+// odebug << "Picture:" << tgt << "" << oendl;
QImage* pm = buffdoc.getPicture(tgt);
if (pm != NULL)
{
emit OnShowPicture(*pm);
delete pm;
}
@@ -407,13 +407,13 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
}
return;
}
case eNone:
break;
default:
-// qDebug("Unknown linktype");
+// odebug << "Unknown linktype" << oendl;
return;
}
if (m_swapmouse)
processmousepositionevent(_e);
else
processmousewordevent(startpos, startoffset, _e, lineno);
@@ -693,13 +693,13 @@ void QTReader::setautoscroll(bool _sc)
CDrawBuffer* reusebuffer = textarray[numlines];
if (reusebuffer == NULL || reusebuffer->eof()) return;
m_autoScroll = true;
#ifdef _SCROLLPIPE
if (!m_pipetarget.isEmpty())
{
-// qDebug("Opening pipe to %s", (const char*)m_pipetarget);
+// odebug << "Opening pipe to " << m_pipetarget << "" << oendl;
m_pipeout = popen((const char*)m_pipetarget, "w");
m_isPaused = false;
}
#endif
autoscroll();
#ifdef USEQPE
@@ -820,53 +820,53 @@ void QTReader::setfont()
}
void QTReader::drawFonts( QPainter *p )
{
if (bDoUpdates)
{
-// qDebug("How refreshing...");
+// odebug << "How refreshing..." << oendl;
if (buffdoc.empty()) return;
setfont();
if (m_lastwidth != width())
{
-// qDebug("Not Optimised %d", m_lastwidth);
+// odebug << "Not Optimised " << m_lastwidth << "" << oendl;
m_lastwidth = width();
m_lastheight = height();
buffdoc.setwidth(m_lastwidth-2*m_border);
locate(pagelocate());
-// qDebug("Not Optimised %d", m_lastwidth);
+// odebug << "Not Optimised " << m_lastwidth << "" << oendl;
}
else
{
int newht = height();
if (m_lastheight > newht)
{
-// qDebug("Optimised < %d %d %d", numlines, m_lastheight, newht);
+// odebug << "Optimised < " << numlines << " " << m_lastheight << " " << newht << "" << oendl;
int ypos = 0;
for (int i = 0; i < numlines; i++)
{
if ((ypos += textarray[i]->lineSpacing()) > newht)
{
numlines = i;
jumpto(mylastpos = locnarray[i+1]);
break;
}
}
-// qDebug("Optimised < %d", numlines);
+// odebug << "Optimised < " << numlines << "" << oendl;
m_lastheight = newht;
}
else if (m_lastheight < newht)
{
-// qDebug("Optimised > %d", numlines);
+// odebug << "Optimised > " << numlines << "" << oendl;
int ypos = 0;
for (int i = 0; i <= numlines; i++)
{
ypos += textarray[i]->lineSpacing();
}
fillbuffer(numlines+1, ypos, newht);
-// qDebug("Optimised > %d", numlines);
+// odebug << "Optimised > " << numlines << "" << oendl;
}
if (numlines > 0)
{
int ypos = textarray[0]->ascent();
textarray[0]->render( p, ypos, m_bMonoSpaced, m_charWidth, width(), m_border);
// int last = (m_showlast) ? numlines : numlines-1;
@@ -894,13 +894,13 @@ void QTReader::drawFonts( QPainter *p )
emit OnRedraw();
}
/*
else
{
- qDebug("Not so refreshing...");
+ odebug << "Not so refreshing..." << oendl;
}
*/
}
QString QTReader::firstword()
{
@@ -1025,13 +1025,13 @@ void QTReader::paintEvent( QPaintEvent * )
// Moves the button group to the upper right corner
// of the widget.
/*
void QTReader::resizeEvent( QResizeEvent * )
{
-// // qDebug("resize:(%u,%u)", width(), height());
+// // odebug << "resize:(" << width() << "," << height() << ")" << oendl;
// bgroup->move( width()-bgroup->width(), 0 );
}
*/
//
// Create and display our widget.
@@ -1050,17 +1050,17 @@ int main( int argc, tchar **argv )
bool QTReader::locate(unsigned long n) {
//printf("Locate\n");
buffdoc.unsuspend();
buffdoc.locate(n);
-// // qDebug("&buffdoc.located");
+// // odebug << "&buffdoc.located" << oendl;
fillbuffer();
-// // qDebug("&Buffer filled");
+// // odebug << "&Buffer filled" << oendl;
update();
-// // qDebug("&Located");
+// // odebug << "&Located" << oendl;
return true;
}
unsigned int QTReader::screenlines()
{
// int linespacing = (tight) ? m_ascent : m_ascent+m_descent;
@@ -1114,18 +1114,18 @@ bool QTReader::fillbuffer(int reuse, int ht, int newht)
return true;
}
void QTReader::dopagedn()
{
-// qDebug("HEIGHT(2):%d", m_lastheight);
+// odebug << "HEIGHT(2):" << m_lastheight << "" << oendl;
buffdoc.unsuspend();
int skip = 0, ypos = 0;
if (locate() != mylastpos)
{
-//// qDebug("Jumping to %u", mylastpos);
+//// odebug << "Jumping to " << mylastpos << "" << oendl;
jumpto(mylastpos);
}
CDrawBuffer* reusebuffer = textarray[numlines];
if (reusebuffer != NULL && reusebuffer->eof()) return;
if (reusebuffer != NULL)
{
@@ -1310,19 +1310,19 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
if (buffdoc.openfile(this,newfile) == 0)
{
m_lastfile = newfile;
buffdoc.setwidth(m_lastwidth-2*m_border);
bRC = true;
buffdoc.setContinuous(m_continuousDocument);
-// // qDebug("buffdoc.openfile done");
+// // odebug << "buffdoc.openfile done" << oendl;
locate(lcn);
-// // qDebug("buffdoc.locate done");
+// // odebug << "buffdoc.locate done" << oendl;
}
setfilter(getfilter());
update();
-// // qDebug("Updated");
+// // odebug << "Updated" << oendl;
return bRC;
}
void QTReader::lineDown()
{
int ypos = 0;
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index b072854..f18cb59 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -14,78 +14,79 @@
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
+
#include "useqpe.h"
-#include <qregexp.h>
-#include <qclipboard.h>
-#include <qwidgetstack.h>
+#include "QTReader.h"
+#include "GraphicWin.h"
+#include "Bkmks.h"
+#include "cbkmkselector.h"
+#include "infowin.h"
+#include "ToolbarPrefs.h"
+#include "Prefs.h"
+#include "CAnnoEdit.h"
+#include "QFloatBar.h"
+#include "FixedFont.h"
+#include "URLDialog.h"
+#include "QTReaderApp.h"
+#include "CDrawBuffer.h"
+#include "Filedata.h"
+#include "opie.h"
+#include "names.h"
+#include "CEncoding_tables.h"
+#include "CloseDialog.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#ifdef USEQPE
+#include <qpe/menubutton.h>
+#include <qpe/fontdatabase.h>
+#include <qpe/global.h>
+#include <qpe/applnk.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
+#endif
+
+/* QT */
#ifdef USEQPE
#include <qmenubar.h>
#include <qtoolbar.h>
#endif
+#include <qregexp.h>
+#include <qclipboard.h>
+#include <qwidgetstack.h>
#include <qmenubar.h>
#include <qtoolbar.h>
-#ifdef USEQPE
-#include <qpe/menubutton.h>
-#include <qpe/fontdatabase.h>
-#endif
#include <qcombobox.h>
#include <qpopupmenu.h>
#include <qaction.h>
#include <qapplication.h>
#include <qlineedit.h>
#include <qtoolbutton.h>
#include <qspinbox.h>
#include <qobjectlist.h>
-#ifdef USEQPE
-#include <qpe/global.h>
-#include <qpe/applnk.h>
-#endif
#include <qfileinfo.h>
-#include <stdlib.h> //getenv
#include <qprogressbar.h>
-#ifdef USEQPE
-#include <qpe/config.h>
-#endif
#include <qbuttongroup.h>
#include <qradiobutton.h>
-#ifdef USEQPE
-#include <qpe/qcopenvelope_qws.h>
-#endif
-#include "QTReader.h"
-#include "GraphicWin.h"
-#include "Bkmks.h"
-#include "cbkmkselector.h"
-#include "infowin.h"
-#include "ToolbarPrefs.h"
-#include "Prefs.h"
-#include "CAnnoEdit.h"
-#include "QFloatBar.h"
-#include "FixedFont.h"
-#include "URLDialog.h"
-//#include <qpe/fontdatabase.h>
+
+/* STD */
+#include <stdlib.h> //getenv
+
#ifdef USEQPE
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
#include "fileBrowser.h"
#else
#include "qfiledialog.h"
#endif
-#include "QTReaderApp.h"
-#include "CDrawBuffer.h"
-#include "Filedata.h"
-#include "opie.h"
-#include "names.h"
-#include "CEncoding_tables.h"
-#include "CloseDialog.h"
-
bool CheckVersion(int&, int&, char&);
#ifdef _WINDOWS
#define PICDIR "c:\\uqtreader\\pics\\"
#else
#ifdef USEQPE
@@ -122,13 +123,13 @@ void QTReaderApp::listBkmkFiles()
bkmkselector->setText("Cancel");
#ifndef USEQPE
int cnt = 0;
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
@@ -143,13 +144,13 @@ void QTReaderApp::listBkmkFiles()
while ( (fi=it.current()) ) { // for each file...
bkmkselector->insertItem(fi->fileName());
cnt++;
- //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+ //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
++it; // goto next list element
}
#else /* USEQPE */
int cnt = 0;
DIR *d;
@@ -211,14 +212,14 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL)
{
m_url_clipboard = false;
m_url_localfile = false;
m_url_globalfile = false;
ftime(&m_lastkeytime);
-//// qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir());
-//// qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml"));
+//// odebug << "Application directory = " << (const tchar *)QPEApplication::documentDir() << "" << oendl;
+//// odebug << "Application directory = " << (const tchar *)Global::applicationFileName("uqtreader" << "" << oendl;
m_bcloseDisabled = true;
m_disableesckey = false;
pBkmklist = NULL;
pOpenlist = NULL;
// doc = 0;
@@ -240,13 +241,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
}
else if (rot.contains("Rot270"))
{
m_rot = 270;
}
-// qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
+// odebug << "Initial Rotation(" << m_rot << "):" << rot << "" << oendl;
*/
m_autogenstr = "^ *[A-Z].*[a-z] *$";
#ifdef USEQPE
setIcon( Resource::loadPixmap( PICDIR "uqtreader") );
#else
@@ -257,19 +258,19 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
// menubar = new QToolBar( this );
#ifdef USEQPE
Config config( APPDIR );
#else
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
QFileInfo fi(d, INIFILE);
-// qDebug("Path:%s", (const char*)fi.absFilePath());
+// odebug << "Path:" << fi.absFilePath() << "" << oendl;
Config config(fi.absFilePath());
#endif
config.setGroup("Toolbar");
m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);
m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);
m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);
@@ -353,24 +354,24 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
editorStack->addWidget( importSelector, get_unique_id() );
// don't need the close visible, it is redundant...
importSelector->setCloseVisible( FALSE );
*/
-// qDebug("Reading file list");
+// odebug << "Reading file list" << oendl;
readfilelist();
reader = new QTReader( editorStack );
reader->bDoUpdates = false;
#ifdef USEQPE
((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
#endif
-// qDebug("Reading config");
+// odebug << "Reading config" << oendl;
// Config config( APPDIR );
config.setGroup( "View" );
m_debounce = config.readNumEntry("Debounce", 0);
#ifdef USEQPE
m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
#else
@@ -766,13 +767,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
regBar->hide();
m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );
m_fontBar->setHorizontalStretchable( TRUE );
-// qDebug("Font selector");
+// odebug << "Font selector" << oendl;
m_fontSelector = new QComboBox(false, m_fontBar);
m_fontBar->setStretchableWidget( m_fontSelector );
{
#ifndef USEQPE
QFontDatabase f;
#else
@@ -798,23 +799,23 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
m_fontBar->hide();
m_fontVisible = false;
#ifdef USEMSGS
connect(qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
this, SLOT( msgHandler(const QCString&,const QByteArray&) ) );
#endif
-// qDebug("Initing");
+// odebug << "Initing" << oendl;
reader->init();
-// qDebug("Inited");
+// odebug << "Inited" << oendl;
// m_buttonAction[m_spaceTarget]->setOn(true);
-// qDebug("fonting");
+// odebug << "fonting" << oendl;
do_setfont(reader->m_fontname);
if (!reader->m_lastfile.isEmpty())
{
-// qDebug("doclnk");
+// odebug << "doclnk" << oendl;
// doc = new DocLnk(reader->m_lastfile);
-// qDebug("doclnk done");
+// odebug << "doclnk done" << oendl;
if (pOpenlist != NULL)
{
/*
int ind = 0;
Bkmk* p = (*pOpenlist)[ind];
@@ -828,30 +829,30 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
{
p = iter.pContent();
if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
{
break;
}
-// qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));
+// odebug << "Item:" << toQString(CFiledata(p->anno()).name()) << "" << oendl;
p = NULL;
}
if (p != NULL)
{
-// qDebug("openfrombkmk");
+// odebug << "openfrombkmk" << oendl;
if (!openfrombkmk(p))
showEditTools();
}
else
{
-// qDebug("openfile");
+// odebug << "openfile" << oendl;
openFile( reader->m_lastfile );
}
}
else
{
-// qDebug("Openfile 2");
+// odebug << "Openfile 2" << oendl;
if (!reader->m_lastfile.isEmpty())
openFile( reader->m_lastfile );
}
}
else
{
@@ -867,13 +868,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
if (CheckVersion(major, bkmktype, minor))
{
config.writeEntry("Major", major);
config.writeEntry("BkmkType", bkmktype);
config.writeEntry("Minor", (int)minor);
}
-// qDebug("finished update");
+// odebug << "finished update" << oendl;
}
void QTReaderApp::addtoolbars(Config* config)
{
config->setGroup("Toolbar");
@@ -1025,20 +1026,20 @@ QToolBar* QTReaderApp::filebar()
{
if (fileBar == NULL)
{
switch (m_tbpol)
{
case cesSingle:
-// qDebug("Setting filebar to menubar");
+// odebug << "Setting filebar to menubar" << oendl;
fileBar = menubar;
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesMenuTool:
case cesMultiple:
-// qDebug("Creating new file bar");
+// odebug << "Creating new file bar" << oendl;
fileBar = new QToolBar("File", this, m_tbposition);
break;
}
// fileBar->setHorizontalStretchable( true );
}
return fileBar;
@@ -1050,13 +1051,13 @@ QToolBar* QTReaderApp::viewbar()
switch (m_tbpol)
{
case cesMultiple:
viewBar = new QToolBar("View", this, m_tbposition);
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesSingle:
case cesMenuTool:
viewBar = fileBar;
break;
}
}
@@ -1066,21 +1067,21 @@ QToolBar* QTReaderApp::navbar()
{
if (navBar == NULL)
{
switch (m_tbpol)
{
case cesMultiple:
-// qDebug("Creating new nav bar");
+// odebug << "Creating new nav bar" << oendl;
navBar = new QToolBar("Navigation", this, m_tbposition);
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesSingle:
case cesMenuTool:
navBar = fileBar;
-// qDebug("Setting navbar to filebar");
+// odebug << "Setting navbar to filebar" << oendl;
break;
}
}
return navBar;
}
QToolBar* QTReaderApp::markbar()
@@ -1090,13 +1091,13 @@ QToolBar* QTReaderApp::markbar()
switch (m_tbpol)
{
case cesMultiple:
markBar = new QToolBar("Marks", this, m_tbposition);
break;
default:
- qDebug("Incorrect toolbar policy set");
+ odebug << "Incorrect toolbar policy set" << oendl;
case cesSingle:
case cesMenuTool:
markBar = fileBar;
break;
}
}
@@ -1124,13 +1125,13 @@ void QTReaderApp::suspend() { reader->suspend(); }
#ifdef USEMSGS
void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
{
QString msg = QString::fromUtf8(_msg);
-//// qDebug("Received:%s", (const char*)msg);
+//// odebug << "Received:" << msg << "" << oendl;
QDataStream stream( _data, IO_ReadOnly );
if ( msg == "info(QString)" )
{
QString info;
stream >> info;
@@ -1478,13 +1479,13 @@ void QTReaderApp::setfullscreen(bool sfs)
reader->bDoUpdates = true;
reader->update();
}
void QTReaderApp::buttonActionSelected(QAction* _a)
{
-//// qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));
+//// odebug << "es:" << _a << " : " << (const char *)(_a->text()) << " (" << ActNameToInt(_a->text()) << ")" << oendl;
m_spaceTarget = ActNameToInt(_a->text());
}
QTReaderApp::~QTReaderApp()
{
}
@@ -1560,13 +1561,13 @@ void QTReaderApp::fileClose()
void QTReaderApp::updatefileinfo()
{
if (reader->m_string.isEmpty()) return;
if (reader->m_lastfile.isEmpty()) return;
tchar* nm = fromQString(reader->m_string);
tchar* fl = fromQString(reader->m_lastfile);
-// qDebug("Lastfile:%x", fl);
+// odebug << "Lastfile:" << fl << "" << oendl;
bool notadded = true;
if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;
else
{
for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
{
@@ -1574,32 +1575,32 @@ void QTReaderApp::updatefileinfo()
{
iter->value(reader->pagelocate());
unsigned short dlen;
unsigned char* data;
CFiledata fd(iter->anno());
reader->setSaveData(data, dlen, fd.content(), fd.length());
-// qDebug("Filedata(1):%u, %u", fd.length(), dlen);
+// odebug << "Filedata(1):" << fd.length() << ", " << dlen << "" << oendl;
// getstate(data, dlen);
iter->setAnno(data, dlen);
notadded = false;
delete [] data;
break;
}
}
}
-// qDebug("Added?:%x", notadded);
+// odebug << "Added?:" << notadded << "" << oendl;
if (notadded)
{
struct stat fnstat;
stat((const char *)reader->m_lastfile, &fnstat);
CFiledata fd(fnstat.st_mtime, fl);
unsigned short dlen;
unsigned char* data;
reader->setSaveData(data, dlen, fd.content(), fd.length());
pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate()));
-// qDebug("Filedata(2):%u, %u", fd.length(), dlen);
+// odebug << "Filedata(2):" << fd.length() << ", " << dlen << "" << oendl;
delete [] data;
}
delete [] nm;
delete [] fl;
}
@@ -1608,13 +1609,13 @@ void QTReaderApp::fileOpen()
/*
menu->hide();
fileBar->hide();
if (regVisible) regBar->hide();
if (searchVisible) searchBar->hide();
*/
-// qDebug("fileOpen");
+// odebug << "fileOpen" << oendl;
// if (!reader->m_lastfile.isEmpty())
updatefileinfo();
fileOpen2();
}
void QTReaderApp::fileOpen2()
@@ -1649,13 +1650,13 @@ void QTReaderApp::fileOpen2()
{
openFile(fn);
}
reader->setFocus();
}
// reader->refresh();
-// qDebug("HEIGHT:%d", reader->m_lastheight);
+// odebug << "HEIGHT:" << reader->m_lastheight << "" << oendl;
}
QString QTReaderApp::usefilebrowser()
{
#ifndef USEQPE
QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) );
@@ -1669,13 +1670,13 @@ QString QTReaderApp::usefilebrowser()
QString fn;
if (fb->exec())
{
fn = fb->getCurrentFile();
}
-// qDebug("Selected %s", (const char*)fn);
+// odebug << "Selected " << fn << "" << oendl;
delete fb;
showEditTools();
return fn;
#endif
}
@@ -1800,13 +1801,13 @@ void QTReaderApp::showprefs()
reader->bstriphtml = true;
break;
case 4:
reader->bpeanut = true;
break;
default:
- qDebug("Format out of range");
+ odebug << "Format out of range" << oendl;
}
reader->bdepluck = prefwin->Depluck();
reader->bdejpluck = prefwin->Dejpluck();
reader->setContinuous(prefwin->Continuous());
m_spaceTarget = (ActionTypes)prefwin->spaceAction();
@@ -1860,13 +1861,13 @@ void QTReaderApp::showtoolbarprefs()
CBarPrefs* prefwin = new CBarPrefs(APPDIR, !m_bFloatingDialog, this);
#else
QFileInfo fi;
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+ owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
fi.setFile(d, INIFILE);
CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);
@@ -1897,13 +1898,13 @@ void QTReaderApp::showtoolbarprefs()
Config config( APPDIR );
#else
QFileInfo fi;
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+ owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
fi.setFile(d, INIFILE);
Config config( fi.absFilePath() );
@@ -2172,13 +2173,13 @@ void QTReaderApp::editFind()
searchStack->push(new searchrecord("",reader->pagelocate()));
#endif
}
void QTReaderApp::findNext()
{
-// // qDebug("findNext called\n");
+// // odebug << "findNext called\n" << oendl;
#ifdef __ISEARCH
QString arg = searchEdit->text();
#else
QRegExp arg = searchEdit->text();
#endif
CDrawBuffer test(&(reader->m_fontControl));
@@ -2268,18 +2269,18 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
findClose();
pbar->hide();
reader->locate(pos);
return false;
}
}
-// qDebug("Found it at %u:%u", pos, offset);
+// odebug << "Found it at " << pos << ":" << offset << "" << oendl;
pbar->hide();
-// qDebug("Hid");
+// odebug << "Hid" << oendl;
reader->locate(pos+offset);
-// qDebug("Loacted");
-// qDebug("page up");
+// odebug << "Loacted" << oendl;
+// odebug << "page up" << oendl;
ret = true;
}
else
{
if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
pos = searchStart;
@@ -2330,13 +2331,13 @@ void QTReaderApp::search()
findNext();
}
#endif
void QTReaderApp::openFile( const QString &f )
{
-// qDebug("File:%s", (const char*)f);
+// odebug << "File:" << f << "" << oendl;
// openFile(DocLnk(f));
//}
//
//void QTReaderApp::openFile( const DocLnk &f )
//{
clear();
@@ -2377,25 +2378,25 @@ void QTReaderApp::resizeEvent(QResizeEvent* e)
showFullScreen();
}
}
*/
void QTReaderApp::handlekey(QKeyEvent* e)
{
-// qDebug("Keypress event");
+// odebug << "Keypress event" << oendl;
timeb now;
ftime(&now);
unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;
if (etime < m_debounce)
{
return;
}
m_lastkeytime = now;
switch(e->key())
{
case Key_Escape:
-// qDebug("escape event");
+// odebug << "escape event" << oendl;
if (m_disableesckey)
{
m_disableesckey = false;
}
else
{
@@ -2404,13 +2405,13 @@ void QTReaderApp::handlekey(QKeyEvent* e)
{
m_actFullscreen->setOn(false);
e->accept();
}
else
{
-// qDebug("escape action");
+// odebug << "escape action" << oendl;
doAction(m_escapeTarget, e);
}
}
break;
case Key_Space:
{
@@ -2503,17 +2504,17 @@ void QTReaderApp::showEditTools()
m_fontBar->hide();
// showNormal();
showFullScreen();
}
else
{
-// qDebug("him");
+// odebug << "him" << oendl;
#ifdef USEQPE
Global::hideInputMethod();
#endif
-// qDebug("eb");
+// odebug << "eb" << oendl;
menubar->show();
if (fileBar != NULL) fileBar->show();
if (viewBar != NULL) viewBar->show();
if (navBar != NULL) navBar->show();
if (markBar != NULL) markBar->show();
mb->show();
@@ -2529,26 +2530,26 @@ void QTReaderApp::showEditTools()
#ifdef USEQPE
Global::showInputMethod();
#endif
regBar->show();
}
if (m_fontVisible) m_fontBar->show();
-// qDebug("sn");
+// odebug << "sn" << oendl;
showNormal();
-// qDebug("sm");
+// odebug << "sm" << oendl;
#ifdef USEQPE
showMaximized();
#endif
// setCentralWidget(reader);
}
-// qDebug("uc");
+// odebug << "uc" << oendl;
updateCaption();
-// qDebug("rw");
+// odebug << "rw" << oendl;
editorStack->raiseWidget( reader );
-// qDebug("sf");
+// odebug << "sf" << oendl;
reader->setFocus();
reader->refresh();
}
/*
void QTReaderApp::save()
{
@@ -2611,13 +2612,13 @@ void QTReaderApp::setDocument(const QString& fileref)
openFile(fileref);
// showEditTools();
}
void QTReaderApp::closeEvent( QCloseEvent *e )
{
-// qDebug("Close event");
+// odebug << "Close event" << oendl;
if (m_fullscreen)
{
m_fullscreen = false;
showEditTools();
e->accept();
}
@@ -2628,13 +2629,13 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
else
{
if (editorStack->visibleWidget() == reader)
{
if ((m_escapeTarget != cesNone) && m_bcloseDisabled)
{
-// qDebug("Close disabled");
+// odebug << "Close disabled" << oendl;
m_bcloseDisabled = false;
e->ignore();
}
else
{
if (m_fontVisible)
@@ -2706,13 +2707,13 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
int cnt = 0;
if (plist != NULL)
{
for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
{
#ifdef _UNICODE
-// qDebug("Item:%s", (const char*)toQString(i->name()));
+// odebug << "Item:" << toQString(i->name()) << "" << oendl;
bkmkselector->insertItem(toQString(i->name()));
#else
bkmkselector->insertItem(i->name());
#endif
cnt++;
}
@@ -2735,15 +2736,15 @@ void QTReaderApp::do_autogen()
}
void QTReaderApp::do_regedit()
{
// fileBar->hide();
reader->bDoUpdates = false;
-// qDebug("Showing regbar");
+// odebug << "Showing regbar" << oendl;
regBar->show();
-// qDebug("Showing kbd");
+// odebug << "Showing kbd" << oendl;
#ifdef USEQPE
Global::showInputMethod();
#endif
regVisible = true;
regEdit->setFocus();
// qApp->processEvents();
@@ -2753,16 +2754,16 @@ void QTReaderApp::do_regedit()
bool QTReaderApp::openfrombkmk(Bkmk* bk)
{
QString fn = toQString(
CFiledata(bk->anno()).name()
);
-// qDebug("fileinfo");
+// odebug << "fileinfo" << oendl;
if (!fn.isEmpty() && QFileInfo(fn).isFile())
{
-// qDebug("Opening");
+// odebug << "Opening" << oendl;
openFile(fn);
struct stat fnstat;
stat((const char *)reader->m_lastfile, &fnstat);
if (CFiledata(bk->anno()).date()
!= fnstat.st_mtime)
@@ -2778,13 +2779,13 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
reader->putSaveData(svdata, svlen);
// setstate(svdata, svlen);
if (svlen != 0)
{
QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
}
-// qDebug("updating");
+// odebug << "updating" << oendl;
// showEditTools();
reader->locate(bk->value());
}
return true;
}
else
@@ -2809,13 +2810,13 @@ void QTReaderApp::gotobkmk(int ind)
}
break;
case cGotoBkmk:
reader->locate((*pBkmklist)[ind]->value());
break;
case cDelBkmk:
-//// qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
+//// odebug << "Deleting:" << (*pBkmklist)[ind]->name() << "\n" << oendl;
pBkmklist->erase(ind);
m_fBkmksChanged = true;
// pBkmklist->sort();
break;
case cRmBkmkFile:
{
@@ -2909,13 +2910,13 @@ void QTReaderApp::gotobkmk(int ind)
QMessageBox::information(this, PROGNAME, "Couldn't open input");
}
/*
CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );
int ret = f->exec();
- qDebug("Return:%d", ret);
+ odebug << "Return:" << ret << "" << oendl;
DocLnk* doc = f->getDoc();
if (doc != NULL)
{
FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
QString rt;
rt = "<html><body>\n";
@@ -2929,17 +2930,17 @@ void QTReaderApp::gotobkmk(int ind)
if ( doc->name().isEmpty() )
{
doc->setName(bkmkselector->text(ind));
}
FileManager fm;
fm.saveFile( *doc, rt );
- qDebug("YES");
+ odebug << "YES" << oendl;
}
else
{
- qDebug("NO");
+ odebug << "NO" << oendl;
}
delete f;
*/
#endif /* USEQPE */
}
@@ -3006,13 +3007,13 @@ void QTReaderApp::do_regaction()
#ifdef _SCROLLPIPE
case cSetPipeTarget:
do_setpipetarget(regEdit->text());
break;
#endif
case cSetConfigName:
-// qDebug("Saving config");
+// odebug << "Saving config" << oendl;
do_saveconfig(regEdit->text(), false);
break;
}
// reader->restore();
// fileBar->show();
reader->setFocus();
@@ -3098,45 +3099,45 @@ void QTReaderApp::setfontHelper(const QString& lcn, int size)
reader->ChangeFont(size);
}
}
void QTReaderApp::do_setencoding(int i)
{
-// qDebug("setencoding:%d", i);
+// odebug << "setencoding:" << i << "" << oendl;
if (m_fontAction == cChooseEncoding)
{
reader->setencoding(i);
}
reader->refresh();
m_fontBar->hide();
m_fontVisible = false;
-// qDebug("showedit");
+// odebug << "showedit" << oendl;
if (reader->isVisible()) showEditTools();
-// qDebug("showeditdone");
+// odebug << "showeditdone" << oendl;
}
void QTReaderApp::do_setfont(const QString& lcn)
{
if (m_fontAction == cChooseFont)
{
setfontHelper(lcn);
}
reader->refresh();
m_fontBar->hide();
m_fontVisible = false;
-// qDebug("showedit");
+// odebug << "showedit" << oendl;
//if (reader->isVisible())
showEditTools();
-// qDebug("showeditdone");
+// odebug << "showeditdone" << oendl;
}
void QTReaderApp::do_autogen(const QString& regText)
{
unsigned long fs, ts;
reader->sizes(fs,ts);
-// // qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));
+// // odebug << "Reg:" << (const tchar*)(regEdit->text()) << "\n" << oendl;
m_autogenstr = regText;
QRegExp re(regText);
CBuffer buff;
if (pBkmklist != NULL) delete pBkmklist;
pBkmklist = new CList<Bkmk>;
m_fBkmksChanged = true;
@@ -3177,13 +3178,13 @@ void QTReaderApp::do_autogen(const QString& regText)
pbar->hide();
reader->refresh();
}
void QTReaderApp::saveprefs()
{
-// qDebug("saveprefs");
+// odebug << "saveprefs" << oendl;
// reader->saveprefs("uqtreader");
// if (!m_loadedconfig)
do_saveconfig( APPDIR, true );
/*
Config config( APPDIR );
@@ -3258,17 +3259,17 @@ void QTReaderApp::saveprefs()
savefilelist();
}
/*
void QTReaderApp::oldFile()
{
-// qDebug("oldFile called");
+// odebug << "oldFile called" << oendl;
reader->setText(true);
-// qDebug("settext called");
+// odebug << "settext called" << oendl;
showEditTools();
-// qDebug("showedit called");
+// odebug << "showedit called" << oendl;
}
*/
/*
void info_cb(Fl_Widget* o, void* _data)
{
@@ -3338,16 +3339,16 @@ void QTReaderApp::readfilelist()
d.cd(APPDIR);
QFileInfo fi(d, ".openfiles");
BkmkFile bf((const char *)fi.absFilePath());
#else /* USEQPE */
BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"));
#endif /* USEQPE */
-// qDebug("Reading open files");
+// odebug << "Reading open files" << oendl;
pOpenlist = bf.readall();
-// if (pOpenlist != NULL) qDebug("...with success");
-// else qDebug("...without success!");
+// if (pOpenlist != NULL) odebug << "...with success" << oendl;
+// else odebug << "...without success!" << oendl;
}
void QTReaderApp::savefilelist()
{
if (pOpenlist != NULL)
{
@@ -3356,13 +3357,13 @@ void QTReaderApp::savefilelist()
d.cd(APPDIR);
QFileInfo fi(d, ".openfiles");
BkmkFile bf((const char *)fi.absFilePath(), true);
#else /* USEQPE */
BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true);
#endif /* USEQPE */
-// qDebug("Writing open files");
+// odebug << "Writing open files" << oendl;
bf.write(*pOpenlist);
}
}
void QTReaderApp::readbkmks()
{
@@ -3466,13 +3467,13 @@ void QTReaderApp::showAnnotation()
editorStack->raiseWidget( m_annoWin );
m_annoWin->setFocus();
}
void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& line)
{
-//// qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
+//// odebug << "OnWordSelected(" << posn << "):" << wrd << "" << oendl;
if (m_doClipboard)
{
QClipboard* cb = QApplication::clipboard();
cb->setText(wrd);
#ifdef USEQPE
@@ -3516,13 +3517,13 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
{
e->ignore();
}
else
{
e->accept();
-// qDebug("Accepted");
+// odebug << "Accepted" << oendl;
switch (a)
{
case cesOpenFile:
{
fileOpen();
}
@@ -3579,13 +3580,13 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
gotoStart();
break;
case cesEndDoc:
gotoEnd();
break;
default:
- qDebug("Unknown ActionType:%u", a);
+ odebug << "Unknown ActionType:" << a << "" << oendl;
break;
}
}
}
void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }
@@ -3597,13 +3598,13 @@ void QTReaderApp::SaveConfig()
regEdit->setText(reader->m_string);
do_regedit();
}
void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
{
-// qDebug("do_saveconfig:%s", (const char*)_txt);
+// odebug << "do_saveconfig:" << _txt << "" << oendl;
#ifdef USEQPE
QString configname;
Config::Domain dom;
if (full)
{
@@ -3620,44 +3621,44 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
config.setGroup( "View" );
#else
QFileInfo fi;
if (full)
{
-// qDebug("full:%s", (const char*)_txt);
+// odebug << "full:" << _txt << "" << oendl;
QDir d = QDir::home(); // "/"
if ( !d.cd(_txt) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+ owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
d = QDir::home();
d.mkdir(_txt);
d.cd(_txt);
}
fi.setFile(d, INIFILE);
}
else
{
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd("configs") )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
d = QDir::home();
d.cd(APPDIR);
d.mkdir("configs");
d.cd("configs");
}
fi.setFile(d, _txt);
}
-// qDebug("Path:%s", (const char*)fi.absFilePath());
+// odebug << "Path:" << fi.absFilePath() << "" << oendl;
Config config(fi.absFilePath());
#endif
config.writeEntry( "StripCr", reader->bstripcr );
config.writeEntry( "AutoFmt", reader->bautofmt );
@@ -3931,32 +3932,32 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
QFileInfo fi;
if (full)
{
QDir d = QDir::home(); // "/"
if ( !d.cd(_txt) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+ owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
d = QDir::home();
d.mkdir(_txt);
d.cd(_txt);
}
fi.setFile(d, INIFILE);
}
else
{
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd("configs") )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
d = QDir::home();
d.mkdir("configs");
d.cd("configs");
}
fi.setFile(d, _txt);
}
@@ -4058,19 +4059,19 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
bkmkselector->setText("Cancel");
#ifndef USEQPE
int cnt = 0;
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd(tgtdir) ) { // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );
+ owarn << "Cannot find the \"~/" APPDIR "/" << tgtdir << "\" directory" << oendl;
d = QDir::home();
d.mkdir(tgtdir);
d.cd(tgtdir);
}
d.setFilter( QDir::Files | QDir::NoSymLinks );
// d.setSorting( QDir::Size | QDir::Reversed );
@@ -4081,13 +4082,13 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
while ( (fi=it.current()) ) { // for each file...
bkmkselector->insertItem(fi->fileName());
cnt++;
- //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+ //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
++it; // goto next list element
}
#else /* USEQPE */
int cnt = 0;
DIR *d;
@@ -4165,13 +4166,13 @@ void QTReaderApp::OnURLSelected(const QString& href)
m_url_localfile = urld->localfile();
m_url_globalfile = urld->globalfile();
if (m_url_clipboard)
{
QClipboard* cb = QApplication::clipboard();
cb->setText(href);
- qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href);
+ odebug << "<a href=\"" << href << "\">" << href << "</a>" << oendl;
}
if (m_url_localfile)
{
writeUrl(reader->m_string, href);
}
if (m_url_globalfile)
@@ -4189,20 +4190,20 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
filename = Global::applicationFileName(APPDIR "/urls", file);
#else
QFileInfo fi;
QDir d = QDir::home(); // "/"
if ( !d.cd(APPDIR) )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
d = QDir::home();
d.mkdir(APPDIR);
d.cd(APPDIR);
}
if ( !d.cd("urls") )
{ // "/tmp"
- qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );
+ owarn << "Cannot find the \"~/" APPDIR "/urls\" directory" << oendl;
d = QDir::home();
d.cd(APPDIR);
d.mkdir("urls");
d.cd("urls");
}
fi.setFile(d, file);
diff --git a/noncore/apps/opie-reader/StyleConsts.cpp b/noncore/apps/opie-reader/StyleConsts.cpp
index 9fb56b7..f47acee 100644
--- a/noncore/apps/opie-reader/StyleConsts.cpp
+++ b/noncore/apps/opie-reader/StyleConsts.cpp
@@ -3,13 +3,13 @@
#include "StyleConsts.h"
GraphicLink::~GraphicLink() { delete graphic; }
pmstore::~pmstore()
{
-//// qDebug("Deleting image");
+//// odebug << "Deleting image" << oendl;
delete graphic;
}
CStyle::~CStyle()
{
if (graphic != NULL)
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index e1cde6c..72a1222 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -129,13 +129,13 @@ fileBrowser::~fileBrowser()
}
void fileBrowser::populateList()
{
ListView->clear();
-////qDebug(currentDir.canonicalPath());
+////odebug << currentDir.canonicalPath() << oendl;
// currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks );
currentDir.setFilter( filterspec );
currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
currentDir.setMatchAllDirs(TRUE);
currentDir.setNameFilter(filterStr);
@@ -153,34 +153,34 @@ void fileBrowser::populateList()
if( fi->isDir() )
{
fileL+="/";
}
else
{
-//// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+//// odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl;
}
new QListViewItem( ListView,fileL,fileS );
}
++it;
}
ListView->setSorting( 2, FALSE);
dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
ListView->setFocus();
}
void fileBrowser::upDir()
{
-//// qDebug(currentDir.canonicalPath());
+//// odebug << currentDir.canonicalPath() << oendl;
}
void fileBrowser::listClicked(QListViewItem *selectedItem)
{
if (selectedItem == NULL) return;
QString strItem=selectedItem->text(0);
-//// qDebug("%s", (const char*)strItem);
+//// odebug << "" << strItem << "" << oendl;
QString strSize=selectedItem->text(1);
strSize.stripWhiteSpace();
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index e42204a..dbf6964 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -82,11 +82,11 @@ SOURCES = Aportis.cpp \
DESTDIR = $(OPIEDIR)/bin
TARGET = reader
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp
index e52fd6a..a8e688f 100644
--- a/noncore/apps/opie-reader/plucker.cpp
+++ b/noncore/apps/opie-reader/plucker.cpp
@@ -54,47 +54,47 @@ int CPlucker::bgetch()
{
int ch = EOF;
if (bufferpos >= buffercontent)
{
if (!m_continuous) return EOF;
if (bufferrec >= ntohs(head.recordList.numRecords) - 1) return EOF;
-//// qDebug("Passing through %u", currentpos);
+//// odebug << "Passing through " << currentpos << "" << oendl;
if (!expand(bufferrec+1)) return EOF;
mystyle.unset();
if (m_ParaOffsets[m_nextParaIndex] == 0)
{
while (m_ParaOffsets[m_nextParaIndex+1] == 0)
{
-// qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
m_nextParaIndex++;
}
}
mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-// qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
ch = 10;
EOPPhase = 4;
}
else if (bufferpos == m_nextPara)
{
while (bufferpos == m_nextPara)
{
UInt16 attr = m_ParaAttrs[m_nextParaIndex];
m_nextParaIndex++;
-// qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
if (m_nextParaIndex == m_nParas)
{
m_nextPara = -1;
}
else
{
m_nextPara += m_ParaOffsets[m_nextParaIndex];
}
}
mystyle.unset();
mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-// qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+// odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl;
if (m_lastBreak == locate())
{
currentpos++;
ch = expandedtextbuffer[bufferpos++];
}
else
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index caa945d..b523a54 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,27 +1,35 @@
+
+
#include "useqpe.h"
-#include <stdio.h>
-#include <string.h>
+#include "plucker_base.h"
+#include "Aportis.h"
+#include "Palm2QImage.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
#ifdef USEQPE
#include <qpe/qcopenvelope_qws.h>
-#endif /* USEQPE */
-#ifdef LOCALPICTURES
-#include <qscrollview.h>
-#endif
-#ifdef USEQPE
#include <qpe/global.h>
#endif /* USEQPE */
+
#ifndef USEQPE
#include <qapplication.h>
#else /* USEQPE */
#include <qpe/qpeapplication.h>
#endif /* USEQPE */
-#include "plucker_base.h"
-#include "Aportis.h"
-#include "Palm2QImage.h"
+/* QT */
+#ifdef LOCALPICTURES
+#include <qscrollview.h>
+#endif
+
+/* STD */
+#include <stdio.h>
+#include <string.h>
+
CPlucker_base::CPlucker_base() :
#ifdef LOCALPICTURES
m_viewer(NULL),
m_picture(NULL),
#endif
@@ -90,30 +98,30 @@ void CPlucker_base::sizes(unsigned long& _file, unsigned long& _text)
char* CPlucker_base::geturl(UInt16 tgt)
{
char * pRet = NULL;
gotorecordnumber(0);
fread(&hdr0, 1, 6, fin);
unsigned int nrecs = ntohs(hdr0.nRecords);
- //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+ //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
UInt16 urlid = 0;
bool urlsfound = false;
char* urls = NULL;
size_t urlsize = 0;
for (unsigned int i = 0; i < nrecs; i++)
{
UInt16 id, name;
fread(&name, 1, sizeof(name), fin);
fread(&id, 1, sizeof(id), fin);
- //qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
+ //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
if (ntohs(name) == 2)
{
urlsfound = true;
urlid = id;
- //qDebug("Found url index:%d", ntohs(urlid));
+ //odebug << "Found url index:" << ntohs(urlid) << "" << oendl;
}
-// //qDebug("%x", id);
+// //odebug << "" << id << "" << oendl;
}
if (urlsfound)
{
unsigned short recptr = finduid(ntohs(urlid));
if (recptr != 0)
{
@@ -126,37 +134,37 @@ char* CPlucker_base::geturl(UInt16 tgt)
while (1)
{
UInt16 tctr;
fread(&tctr, 1, sizeof(tctr), fin);
fread(&urlid, 1, sizeof(urlid), fin);
tctr = ntohs(tctr);
- //qDebug("tgt:%u urlctr:%u tctr:%u", tgt, urlctr, tctr);
+ //odebug << "tgt:" << tgt << " urlctr:" << urlctr << " tctr:" << tctr << "" << oendl;
if (tctr >= tgt)
{
break;
}
urlctr = tctr;
}
- //qDebug("urls are in %d", ntohs(urlid));
+ //odebug << "urls are in " << ntohs(urlid) << "" << oendl;
recptr = finduid(ntohs(urlid));
if (recptr != 0)
{
UInt32 reclen = recordlength(recptr) - HeaderSize();
gotorecordnumber(recptr);
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- //qDebug("Found urls:%x",thishdr_type);
+ //odebug << "Found urls:" << thishdr_type << "" << oendl;
urlsize = thishdr_size;
urls = new char[urlsize];
Expand(reclen, thishdr_type, (UInt8*)urls, urlsize);
char* ptr = urls;
int rn = urlctr+1;
while (ptr - urls < urlsize)
{
if (rn == tgt)
{
- //qDebug("URL:%s", ptr);
+ //odebug << "URL:" << ptr << "" << oendl;
int len = strlen(ptr)+1;
pRet = new char[len];
memcpy(pRet, ptr, len);
break;
}
ptr += strlen(ptr)+1;
@@ -247,13 +255,13 @@ void CPlucker_base::locate(unsigned int n)
UInt32 thishdr_size;
UInt8 thishdr_type, thishdr_reserved;
while (n < textlength && recptr > 1)
{
recptr--;
gotorecordnumber(recptr);
- //qDebug("recptr:%u", recptr);
+ //odebug << "recptr:" << recptr << "" << oendl;
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
if (thishdr_type < 2)
{
textlength -= thishdr_size;
}
}
@@ -272,13 +280,13 @@ void CPlucker_base::locate(unsigned int n)
if (!(thishdr_type < 2))
{
thishdr_size = 0;
}
}
}
-// qDebug("Time(1): %u", clock()-start);
+// odebug << "Time(1): " << clock()-start << "" << oendl;
/*
expand(recptr);
mystyle.unset();
bufferpos = n-textlength;
currentpos = n;
while (bufferpos >= m_nextPara && m_nextPara >= 0)
@@ -318,24 +326,24 @@ void CPlucker_base::locate(unsigned int n)
else
{
bs = 0;
}
} while (locpos + bs <= n);
-// qDebug("Time(2): %u", clock()-start);
+// odebug << "Time(2): " << clock()-start << "" << oendl;
if (recptr != thisrec)
{
- qDebug("Disaster:recptr:%u thisrec:%u", recptr, thisrec);
+ odebug << "Disaster:recptr:" << recptr << " thisrec:" << thisrec << "" << oendl;
UInt16 thishdr_uid, thishdr_nParagraphs;
UInt32 thishdr_size = buffercontent;
UInt8 thishdr_type, thishdr_reserved;
for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
{
gotorecordnumber(recptr);
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
-// qDebug("UID:%u Paras:%u Size:%u Type:%u Reserved:%u", thishdr_uid, thishdr_nParagraphs, thishdr_size, (unsigned int)thishdr_type, (unsigned int)thishdr_reserved);
+// odebug << "UID:" << thishdr_uid << " Paras:" << thishdr_nParagraphs << " Size:" << thishdr_size << " Type:" << (unsigned int)thishdr_type << " Reserved:" << (unsigned int)thishdr_reserved << "" << oendl;
}
// QApplication::exit ( 100 );
}
currentpos = locpos;
expand(thisrec);
@@ -368,38 +376,38 @@ bool CPlucker_base::expand(int thisrec)
UInt16 thishdr_uid, thishdr_nParagraphs;
UInt32 thishdr_size;
UInt8 thishdr_type, thishdr_reserved;
while (1)
{
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
- //qDebug("This (%d) type is %d, uid is %u", thisrec, thishdr_type, thishdr_uid);
+ //odebug << "This (" << thisrec << ") type is " << thishdr_type << ", uid is " << thishdr_uid << "" << oendl;
if (thishdr_type < 2) break;
- //qDebug("Skipping paragraph of type %d", thishdr_type);
+ //odebug << "Skipping paragraph of type " << thishdr_type << "" << oendl;
if (++thisrec >= ntohs(head.recordList.numRecords) - 1) return false;
reclen = recordlength(thisrec);
gotorecordnumber(thisrec);
}
m_nParas = thishdr_nParagraphs;
m_bufferisreserved = (thishdr_reserved != 0);
- //qDebug("It has %u paragraphs and is %u bytes", thishdr_nParagraphs, thishdr_size);
+ //odebug << "It has " << thishdr_nParagraphs << " paragraphs and is " << thishdr_size << " bytes" << oendl;
uid = thishdr_uid;
// gotorecordnumber(thisrec);
// fread(expandedtextbuffer,1,10,fin);
for (int i = 0; i < m_nParas; i++)
{
UInt16 ubytes, attrs;
fread(&ubytes, 1, sizeof(ubytes), fin);
fread(&attrs, 1, sizeof(attrs), fin);
m_ParaOffsets[i] = ntohs(ubytes);
m_ParaAttrs[i] = ntohs(attrs);
-// //qDebug("Bytes %u, Attr %x", ntohs(ubytes), ntohs(attrs));
+// //odebug << "Bytes " << ntohs(ubytes) << ", Attr " << ntohs(attrs) << "" << oendl;
}
if (m_nParas > 0)
{
m_nextPara = m_ParaOffsets[0];
- //qDebug("First offset = %u", m_nextPara);
+ //odebug << "First offset = " << m_nextPara << "" << oendl;
m_nextParaIndex = 0;
}
else
{
m_nextPara = -1;
}
@@ -415,13 +423,13 @@ bool CPlucker_base::expand(int thisrec)
expandedtextbuffer = new UInt8[buffersize];
}
Expand(reclen, thishdr_type, expandedtextbuffer, buffercontent);
bufferpos = 0;
bufferrec = thisrec;
- //qDebug("BC:%u, HS:%u", buffercontent, thishdr_size);
+ //odebug << "BC:" << buffercontent << ", HS:" << thishdr_size << "" << oendl;
return true;
}
void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bsize)
{
z_stream zstream;
@@ -449,13 +457,13 @@ void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuff
}
zstream.next_out = tgtbuffer;
zstream.avail_out = bsize;
err = inflate( &zstream, Z_SYNC_FLUSH );
-// //qDebug("err:%d - %u", err, zstream.avail_in);
+// //odebug << "err:" << err << " - " << zstream.avail_in << "" << oendl;
} while ( err == Z_OK );
inflateEnd(&zstream);
}
@@ -531,15 +539,15 @@ CList<Bkmk>* CPlucker_base::getbkmklist()
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
if (thishdr_type == 8)
{
UInt16 n;
fread(&n, 1, sizeof(n), fin);
n = ntohs(n);
- //qDebug("Found %u bookmarks", n);
+ //odebug << "Found " << n << " bookmarks" << oendl;
}
- //qDebug("Found:%d, %u", i , thishdr_type);
+ //odebug << "Found:" << i << ", " << thishdr_type << "" << oendl;
}
*/
return NULL;
}
@@ -589,31 +597,31 @@ QImage* CPlucker_base::getPicture(unsigned long tgt)
#ifdef LOCALPICTURES
#include <unistd.h>
#include <qpe/global.h>
void CPlucker_base::showimg(UInt16 tgt)
{
- //qDebug("Crassssssh!");
+ //odebug << "Crassssssh!" << oendl;
QPixmap* qimage = expandimg(tgt);
m_picture->setFixedSize(qimage->size());
m_picture->setBackgroundPixmap(*qimage);
delete qimage;
m_viewer->show();
/*
char tmp[] = "uqtreader.XXXXXX";
QImage* qimage = getimg(tgt);
QPixmap* image = new QPixmap(0,0);
-// //qDebug("New image");
+// //odebug << "New image" << oendl;
image->convertFromImage(*qimage);
delete qimage;
char tmpfile[sizeof(tmp)+1];
strcpy(tmpfile,tmp);
int f = mkstemp(tmpfile);
close(f);
- //qDebug("TMPFILE:%s", tmpfile);
+ //odebug << "TMPFILE:" << tmpfile << "" << oendl;
if (image->save(tmpfile,"PNG"))
{
QCopEnvelope e("QPE/Application/showimg", "setDocument(QString)");
e << QString(tmpfile);
}
Global::statusMessage("Opening image");
@@ -624,24 +632,24 @@ void CPlucker_base::showimg(UInt16 tgt)
}
#endif
unsigned short CPlucker_base::finduid(unsigned short urlid)
{
-// //qDebug("Finding %u", urlid);
+// //odebug << "Finding " << urlid << "" << oendl;
unsigned short jmin = 1, jmax = ntohs(head.recordList.numRecords);
unsigned short jmid = (jmin+jmax) >> 1;
while (jmax - jmin > 1)
{
gotorecordnumber(jmid);
UInt16 thishdr_uid, thishdr_nParagraphs;
UInt32 thishdr_size;
UInt8 thishdr_type, thishdr_reserved;
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
unsigned short luid = thishdr_uid;
-// //qDebug("%u %u %u : %u", jmin, jmid, jmax, urlid);
+// //odebug << "" << jmin << " " << jmid << " " << jmax << " : " << urlid << "" << oendl;
if (luid == urlid)
{
return jmid;
}
if (luid < urlid)
{
@@ -656,26 +664,26 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
gotorecordnumber(jmin);
UInt16 thishdr_uid, thishdr_nParagraphs;
UInt32 thishdr_size;
UInt8 thishdr_type, thishdr_reserved;
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
unsigned short luid = thishdr_uid;
- //qDebug("jmin at end:%u,%u", jmin, luid);
+ //odebug << "jmin at end:" << jmin << "," << luid << "" << oendl;
if (luid == urlid)
{
return jmin;
}
gotorecordnumber(jmax);
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
luid = thishdr_uid;
- //qDebug("jmax at end:%u,%u", jmax, luid);
+ //odebug << "jmax at end:" << jmax << "," << luid << "" << oendl;
if (luid == urlid)
{
return jmax;
}
- //qDebug("Couldn't find %u", urlid);
+ //odebug << "Couldn't find " << urlid << "" << oendl;
return 0; // Not found!
}
void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen)
{
@@ -695,13 +703,13 @@ void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsig
for (it = visited.begin(); it != visited.end(); it++)
#else
for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
#endif
{
unsigned long t = *it;
-// qDebug("[%u]", t);
+// odebug << "[" << t << "]" << oendl;
memcpy(newdata, &t, sizeof(t));
newdata += sizeof(t);
}
m_nav.setSaveData(data, len, pdata, newlen);
delete [] pdata;
}
@@ -718,13 +726,13 @@ void CPlucker_base::putSaveData(unsigned char*& src, unsigned short& srclen)
for (int i = 0; i < sz; i++)
{
unsigned long t;
if (srclen >= sizeof(t))
{
memcpy(&t, src, sizeof(t));
-// qDebug("[%u]", t);
+// odebug << "[" << t << "]" << oendl;
visited.push_front(t);
src += sizeof(t);
srclen -= sizeof(t);
}
else
{
@@ -748,23 +756,23 @@ int CPlucker_base::OpenFile(const char *src)
gotorecordnumber(0);
fread(&hdr0, 1, 6, fin);
setbuffersize();
compressedtextbuffer = new UInt8[compressedbuffersize];
expandedtextbuffer = new UInt8[buffersize];
- //qDebug("Total number of records:%u", ntohs(head.recordList.numRecords));
+ //odebug << "Total number of records:" << ntohs(head.recordList.numRecords) << "" << oendl;
unsigned int nrecs = ntohs(hdr0.nRecords);
- //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+ //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
UInt16 homerecid = 1;
for (unsigned int i = 0; i < nrecs; i++)
{
UInt16 id, name;
fread(&name, 1, sizeof(name), fin);
fread(&id, 1, sizeof(id), fin);
- //qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
+ //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
if (ntohs(name) == 0) homerecid = ntohs(id);
}
textlength = 0;
for (int recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
{
@@ -816,25 +824,25 @@ QImage* CPlucker_base::getimg(UInt16 tgt)
linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
{
visited.push_front(n);
UInt16 tuid = (n >> 16);
n &= 0xffff;
-// //qDebug("Hyper:<%u,%u>", tuid, n);
+// //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
UInt16 thisrec = 1;
currentpos = 0;
gotorecordnumber(thisrec);
UInt16 thishdr_uid, thishdr_nParagraphs;
UInt32 thishdr_size;
UInt8 thishdr_type, thishdr_reserved;
while (1)
{
GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
if (tuid == thishdr_uid) break;
if (thishdr_type < 2) currentpos += thishdr_size;
-// //qDebug("hyper-cp:%u", currentpos);
+// //odebug << "hyper-cp:" << currentpos << "" << oendl;
thisrec++;
if (thisrec >= ntohs(head.recordList.numRecords))
{
char *turl = geturl(tuid);
if (turl == NULL)
{
@@ -854,13 +862,13 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
else
{
Global::statusMessage(wrd);
}
#else
#endif /* USEQPE */
- //qDebug("Link:%s", (const char*)wrd);
+ //odebug << "Link:" << wrd << "" << oendl;
// setlink(fn, wrd);
delete [] turl;
}
return eNone;
}
gotorecordnumber(thisrec);
@@ -923,13 +931,13 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
QMessageBox::information(NULL,
QString(PROGNAME),
QString("Error in link\nOffset too big")
);
return eNone;
}
- //qDebug("Hyper:<%u,%u>", tuid, n);
+ //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
while (bufferpos < n && bufferpos < buffercontent) getch_base(true);
/* // This is faster but the alignment doesn't get set
mystyle.unset();
bufferpos = n;
currentpos += n;
while (bufferpos >= m_nextPara && m_nextPara >= 0)
@@ -953,17 +961,17 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
tchar CPlucker_base::getch_base(bool fast)
{
int ch = bgetch();
while (ch == 0)
{
ch = bgetch();
-// //qDebug("Function:%x", ch);
+// //odebug << "Function:" << ch << "" << oendl;
switch (ch)
{
case 0x38:
-// //qDebug("Break:%u", locate());
+// //odebug << "Break:" << locate() << "" << oendl;
if (m_lastBreak == locate())
{
ch = bgetch();
}
else
{
@@ -977,28 +985,28 @@ tchar CPlucker_base::getch_base(bool fast)
unsigned long ln = 0;
int skip = ch & 7;
for (int i = 0; i < 2; i++)
{
int ch = bgetch();
ln = (ln << 8) + ch;
-// //qDebug("ch:%d, ln:%u", ch, ln);
+// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
}
if (skip == 2)
{
ln <<= 16;
}
else
{
for (int i = 0; i < 2; i++)
{
int ch = bgetch();
ln = (ln << 8) + ch;
-// //qDebug("ch:%d, ln:%u", ch, ln);
+// //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
}
}
-// //qDebug("ln:%u", ln);
+// //odebug << "ln:" << ln << "" << oendl;
mystyle.setLink(true);
mystyle.setData(ln);
// mystyle.setColour(255, 0, 0);
bool hasseen = false;
for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
{
@@ -1035,13 +1043,13 @@ tchar CPlucker_base::getch_base(bool fast)
mystyle.unsetItalic();
ch = bgetch();
break;
case 0x11:
{
ch = bgetch();
-// //qDebug("Font:%d",ch);
+// //odebug << "Font:" << ch << "" << oendl;
mystyle.setVOffset(0);
mystyle.unsetMono();
mystyle.unsetBold();
mystyle.setFontSize(0);
switch (ch)
{
@@ -1069,13 +1077,13 @@ tchar CPlucker_base::getch_base(bool fast)
mystyle.setBold();
break;
case 7:
mystyle.setBold();
break;
case 8: // should be fixed width
- //qDebug("Trying fixed width");
+ //odebug << "Trying fixed width" << oendl;
mystyle.setMono();
break;
case 9:
mystyle.setFontSize(-1);
break;
case 10:
@@ -1084,37 +1092,37 @@ tchar CPlucker_base::getch_base(bool fast)
break;
case 11:
mystyle.setFontSize(-2);
mystyle.setVOffset(-1);
break;
default:
- qDebug("Unrecognised font");
+ odebug << "Unrecognised font" << oendl;
break;
}
ch = bgetch();
}
break;
case 0x29:
ch = bgetch();
switch (ch)
{
case 0:
mystyle.setLeftJustify();
-// //qDebug("left");
+// //odebug << "left" << oendl;
break;
case 1:
mystyle.setRightJustify();
-// //qDebug("right");
+// //odebug << "right" << oendl;
break;
case 2:
mystyle.setCentreJustify();
-// //qDebug("centre");
+// //odebug << "centre" << oendl;
break;
case 3:
mystyle.setFullJustify();
-// //qDebug("full");
+// //odebug << "full" << oendl;
break;
}
ch = bgetch();
break;
case 0x53:
@@ -1131,13 +1139,13 @@ tchar CPlucker_base::getch_base(bool fast)
{
bool hasalternate = (ch == 0x5c);
UInt16 ir = bgetch();
ir = (ir << 8) + bgetch();
if (hasalternate)
{
- //qDebug("Alternate image:%x", ir);
+ //odebug << "Alternate image:" << ir << "" << oendl;
UInt16 ir2 = bgetch();
ir2 = (ir2 << 8) + bgetch();
if (!fast) mystyle.setPicture(true, expandimg(ir2, true), true, ir << 16);
#ifdef LOCALPICTURES
UInt32 ln = ir;
ln <<= 16;
@@ -1146,31 +1154,31 @@ tchar CPlucker_base::getch_base(bool fast)
#endif
}
else
{
if (!fast) mystyle.setPicture(true, expandimg(ir));
}
-// if (mystyle.getLink()) qDebug("Picture link!");
+// if (mystyle.getLink()) odebug << "Picture link!" << oendl;
ch = '#';
}
// ch = bgetch();
break;
case 0x33:
{
UInt8 h = bgetch();
UInt8 wc = bgetch();
UInt8 pc = bgetch();
UInt16 w = wc;
-// //qDebug("h,w,pc [%u, %u, %u]", h, w, pc);
+// //odebug << "h,w,pc [" << h << ", " << w << ", " << pc << "]" << oendl;
if (w == 0)
{
w = (m_scrWidth*(unsigned long)pc)/100;
}
if (w == 0) w = m_scrWidth;
mystyle.setPicture(false, hRule(w,h,mystyle.Red(),mystyle.Green(),mystyle.Blue()));
-// if (mystyle.getLink()) //qDebug("hRule link!");
+// if (mystyle.getLink()) //odebug << "hRule link!" << oendl;
ch = '#';
}
break;
case 0x60:
mystyle.setUnderline();
ch = bgetch();
@@ -1179,16 +1187,16 @@ tchar CPlucker_base::getch_base(bool fast)
mystyle.unsetUnderline();
ch = bgetch();
break;
case 0x22:
ch = bgetch();
mystyle.setLeftMargin(ch);
-// //qDebug("Left margin:%d", ch);
+// //odebug << "Left margin:" << ch << "" << oendl;
ch = bgetch();
mystyle.setRightMargin(ch);
-// //qDebug("Right margin:%d", ch);
+// //odebug << "Right margin:" << ch << "" << oendl;
ch = bgetch();
break;
case 0x70:
mystyle.setStrikethru();
ch = bgetch();
break;
@@ -1200,24 +1208,24 @@ tchar CPlucker_base::getch_base(bool fast)
{
int tlen = bgetch();
ch = bgetch();
ch <<= 8;
ch |= (tchar)bgetch();
for (int i = 0; i < tlen; i++) bgetch();
- //qDebug("Function 83");
+ //odebug << "Function 83" << oendl;
}
break;
case 0x85:
default:
- qDebug("Function:%x NOT IMPLEMENTED", ch);
+ odebug << "Function:" << ch << " NOT IMPLEMENTED" << oendl;
{
int skip = ch & 7;
for (int i = 0; i < skip; i++)
{
ch = bgetch();
- //qDebug("Arg %d, %d", i, ch);
+ //odebug << "Arg " << i << ", " << ch << "" << oendl;
}
ch = bgetch();
}
}
}