1 files changed, 11 insertions, 11 deletions

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
@@ -19,67 +19,67 @@ void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
       segs.erase(0);
   }
   for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); )
   {
       CList<textsegment>::iterator next = iter;
       iter++;
       if (iter == rhs.segs.end() || iter->start > f)
       {
 	  int st = next->start-f;
 	  if (st < 0) st = 0;
 
 	  CStyle _style = next->style;
 
 	  segs.push_back(textsegment(st,next->style));
       }
   }
   for (i = f; rhs[i] != '\0'; i++) (*this)[i-f] = rhs[i];
   (*this)[i-f] = '\0';
   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;
   while (!segs.isEmpty())
   {
       segs.erase(0);
   }
   for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); iter++)
   {
       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;
   while (!segs.isEmpty())
   {
       segs.erase(0);
   }
   segs.push_back(textsegment(0, CStyle()));
   for (i = 0; sztmp[i] != '\0'; i++) (*this)[i] = sztmp[i];
   (*this)[i] = '\0';
   len = i;
   return *this;
 }
 
 void CDrawBuffer::empty()
 {
     m_bSop = false;
     m_bEop = false;
     len = 0;
     (*this)[0] = 0;
     while (!segs.isEmpty())
@@ -187,49 +187,49 @@ int CDrawBuffer::width(int numchars, bool onscreen, int scwidth, unsigned char _
 		QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
 //	    f.setUnderline(currentstyle.isUnderline());
 		QString str = text.mid(textstart->start, end-textstart->start);
 		QFontMetrics fm(f);
 		if (just)
 		{
 		    int lastspace = -1;
 		    int nsp = 0;
 		    int cx = currentx;
 		    while ((nsp = str.find(" ", lastspace+1)) >= 0)
 		    {
 			if (nsp > nonspace)
 			{
 			    spacenumber++;
 			    int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar;
 			    QString nstr = str.mid(lastspace+1, nsp-lastspace);
 			    int lw = fm.width(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);
 			    cx += lw;
 			    lastspace = nsp;
 			}
 		    }
 		    QString nstr = str.right(str.length()-1-lastspace);
 		    cx += fm.width(nstr);
 		    currentx = cx;
 		}
 		else
 		{
 		    currentx += fm.width(str);
 		}
 	    }
 	}
 	textstart = textend;
     }
     while (textend != segs.end() && end != numchars && textstart->start < len);
     return currentx;
 }
 
 int CDrawBuffer::leftMargin()
 {
     return (segs.begin()->style.getLeftMargin()*fc->getsize(segs.begin()->style)+3)/6;
@@ -296,49 +296,49 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
 	{
 	    if ((*this)[i] == ' ')
 	    {
 		spaces++;
 	    }
 	}
 	if (spaces == 0)
 	{
 	    just = false;
 	}
 	else
 	{
 	    extraspace = (scwidth - 2*_border - rightMargin() - leftMargin() - width());
 	    if (extraspace == 0) just = false;
 	}
     }
     CList<textsegment>::iterator textend = textstart;
     do
     {
 	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));
 #endif
 	int voffset = currentstyle.getVOffset()*fc->getsize(currentstyle)/2;
 	if (_bMono)
 	{
 	    if (currentstyle.isUnderline())
 	    {
 		_p->drawLine( currentx, _y+voffset, currentx + str.length()*_charWidth, _y+voffset);
 	    }
 	    if (currentstyle.isStrikethru())
 	    {
 		int ascent = fc->ascent(currentstyle)/3;
 		_p->drawLine( currentx, _y-ascent+voffset, currentx + str.length()*_charWidth, _y-ascent+voffset);
 	    }
 	    for (int i = 0; i < str.length(); i++)
 	    {
 		_p->drawText( currentx + i*_charWidth, _y+voffset, QString(str[i]));
 	    }
 	    currentx += str.length()*_charWidth;
@@ -387,59 +387,59 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
 #ifdef _WINDOWS
 			_p->drawText( currentx, _y+voffset, QString(str.at(i)));
 #else
 			_p->drawText( currentx, _y+voffset, QString(str[i]));
 #endif
 			currentx += cw;
 		    }
 		}
 		else
 		{
 		    QFontMetrics fm(f);
 		    int w;
 		    if (just)
 		    {
 			int lastspace = -1;
 			int nsp = 0;
 			int cx = currentx;
 			while ((nsp = str.find(" ", lastspace+1)) >= 0)
 			{
 			    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;
 			    }
 			}
 			QString nstr = str.right(str.length()-1-lastspace);
 			_p->drawText( cx, _y+voffset, nstr);
 			cx += fm.width(nstr);
 			w = cx - currentx;
 		    }
 		    else
 		    {
 			_p->drawText( currentx, _y+voffset, str);
 			w = fm.width(str);
 		    }
 		    if (currentstyle.isUnderline())
 		    {
 			_p->drawLine( currentx, _y+voffset, currentx + w, _y+voffset);
 		    }
 		    if (currentstyle.isStrikethru())
 		    {
 			int ascent = fc->ascent(currentstyle)/3;
 			_p->drawLine( currentx, _y-ascent+voffset, currentx + w, _y-ascent+voffset);
@@ -449,56 +449,56 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
 	    }
 	}
 	textstart = textend;
     }
     while (textend != segs.end() && textstart->start < len);
 }
 
 CStyle CDrawBuffer::laststyle()
 {
     return segs.last().style;
 }
 
 linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
 {
     int end = 0;
     CStyle currentstyle;
     CList<textsegment>::iterator textstart = segs.begin();
     CList<textsegment>::iterator textend = textstart;
     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())
     {
 	tgt = currentstyle.getData();
 	return eLink;
     }
     return eNone;
 }
 
 void CDrawBuffer::resize()
 {
     int gzoom = fc->gzoom();
     m_maxstyle = m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
     for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end() && iter->start <= len; )
     {
 	CList<textsegment>::iterator next = iter;
 	iter++;
 	int st = next->start;
 	if (st < 0) st = 0;
 
@@ -518,29 +518,29 @@ void CDrawBuffer::resize()
 /*
 	else if (fc != NULL)
 	{
 	    ascent = fc->ascent(_style);
 	    descent = fc->descent(_style);
 	    linespacing = fc->lineSpacing(_style);
 	    extra = linespacing - ascent - descent;
 	}
 */
 	if (ascent > m_ascent) m_ascent = ascent;
 	if (descent > m_descent) m_descent = descent;
 	if (extra > m_lineExtraSpacing) m_lineExtraSpacing = extra;
 	m_lineSpacing = m_ascent+m_descent+m_lineExtraSpacing;
     }
     int lead = fc->getlead();
     if (lead != 0)
     {
 	int xt = (lead*m_lineSpacing+5)/10;
 	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;
     }
 }