1 files changed, 0 insertions, 5 deletions

diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index 9047a45..caa945d 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,39 +1,36 @@
 #include "useqpe.h"
 #include <stdio.h>
 #include <string.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
 #ifdef USEQPE
 #include <qpe/qcopenvelope_qws.h>
 #endif /* USEQPE */
 #ifdef LOCALPICTURES
 #include <qscrollview.h>
 #endif
 #ifdef USEQPE
 #include <qpe/global.h>
 #endif /* USEQPE */
-#include <qclipboard.h>
 #ifndef USEQPE
 #include <qapplication.h>
 #else /* USEQPE */
 #include <qpe/qpeapplication.h>
 #endif /* USEQPE */
 
 #include "plucker_base.h"
 #include "Aportis.h"
 #include "Palm2QImage.h"
 
 CPlucker_base::CPlucker_base() :
 #ifdef LOCALPICTURES
     m_viewer(NULL),
     m_picture(NULL),
 #endif
     expandedtextbuffer(NULL),
     compressedtextbuffer(NULL)
 //,    urls(NULL)
  { /*printf("constructing:%x\n",fin);*/ }
 
 
 void CPlucker_base::Expand(UInt32 reclen, UInt8 type, UInt8* buffer, UInt32 buffersize)
 {
     if (type%2 == 0)
@@ -524,49 +521,48 @@ void CPlucker_base::home()
 CList<Bkmk>* CPlucker_base::getbkmklist()
 {
 /*
   UInt16 thishdr_uid, thishdr_nParagraphs;
   UInt32 thishdr_size;
   UInt8 thishdr_type, thishdr_reserved;
 
   for (int i = 1; i < ntohs(head.recordList.numRecords); i++)
   {
 	gotorecordnumber(i);
 	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);
 	}
 	//qDebug("Found:%d, %u", i , thishdr_type);
     }
 */
     return NULL;
 }
 
-#include <qnamespace.h>
 
 QImage* CPlucker_base::expandimg(UInt16 tgt, bool border)
 {
     QImage* qimage = getimg(tgt);
     QImage* ret;
     if (qimage == NULL) return NULL;
     if (border)
     {
 	QPixmap* image = new QPixmap(0,0);
 	image->convertFromImage(*qimage);
 	delete qimage;
 	QPixmap* pret = new QPixmap(image->width()+4, image->height()+4);
 	pret->fill(Qt::red);
 	bitBlt(pret, 2, 2, image, 0, 0, -1, -1);//, Qt::RasterOp::CopyROP);
 	delete image;
 	ret = new QImage(pret->convertToImage());
     }
     else
     {
 	ret = qimage;
     }
     return ret;
 }
 
@@ -659,49 +655,48 @@ 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);
     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);
     if (luid == urlid)
     {
 	return jmax;
     }
     //qDebug("Couldn't find %u", urlid);
     return 0; // Not found!
 }
 
-#include <qnamespace.h>
 
 void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen)
 {
     unsigned short sz = 0;
     for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
     {
 	sz++;
     }
     size_t newlen = srclen+sizeof(sz)+sz*sizeof(unsigned long);
     unsigned char* newdata = new unsigned char[newlen];
     unsigned char* pdata = newdata;
     memcpy(newdata, src, srclen);
     newdata += srclen;
     memcpy(newdata, &sz, sizeof(sz));
     newdata += sizeof(sz);
 #ifdef _WINDOWS
     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);
 	memcpy(newdata, &t, sizeof(t));