- remove bogus mak and pro files

- fix build order
- fix binary name
- add bogus include files

73 files changed, 4970 insertions, 15190 deletions

diff --git a/noncore/apps/opie-reader/AportisCodec.mak b/noncore/apps/opie-reader/AportisCodec.mak
deleted file mode 100644
index 89bf57d..0000000
--- a/noncore/apps/opie-reader/AportisCodec.mak
+++ b/dev/null
@@ -1,166 +0,0 @@
-#############################################################################
-# Makefile for building: libAportis.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:36:46 2004
-# Project:  AportisCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o AportisCodec.mak AportisCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libAportis.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h
-SOURCES = Aportis.cpp
-OBJECTS = QREADEROBJS/Aportis.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = AportisCodec.pro
-QMAKE_TARGET = Aportis
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libAportis.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libAportis.a
-TARGETD	= libAportis.so.1.0.0
-TARGET0	= libAportis.so
-TARGET1	= libAportis.so.1
-TARGET2	= libAportis.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: AportisCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-AportisCodec.mak: AportisCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o AportisCodec.mak AportisCodec.pro
-qmake: 
-	@$(QMAKE) -o AportisCodec.mak AportisCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/Aportis && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Aportis/ && ( cd `dirname QREADEROBJS/Aportis` && $(TAR) Aportis.tar Aportis && $(GZIP) Aportis.tar ) && $(MOVE) `dirname QREADEROBJS/Aportis`/Aportis.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Aportis
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/Aportis.o: Aportis.cpp Aportis.h \
-		my_list.h \
-		Bkmks.h \
-		QREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Aportis.o Aportis.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/AportisCodec.omak b/noncore/apps/opie-reader/AportisCodec.omak
deleted file mode 100644
index 2de7cd6..0000000
--- a/noncore/apps/opie-reader/AportisCodec.omak
+++ b/dev/null
@@ -1,139 +0,0 @@
-#############################################################################
-# Makefile for building libAportis.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: AportisCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libAportis.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h
-SOURCES =	Aportis.cpp
-OBJECTS =	OREADEROBJS/Aportis.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libAportis.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libAportis.a
-TARGETD	=	libAportis.so.1.0.0
-TARGET0	=	libAportis.so
-TARGET1	=	libAportis.so.1
-TARGET2	=	libAportis.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: AportisCodec.omak
-
-AportisCodec.omak: AportisCodec.opro
-	tmake AportisCodec.opro -o AportisCodec.omak
-
-dist:
-	$(TAR) AportisCodec.opro.tar AportisCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) AportisCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Aportis.o Aportis.cpp
-
diff --git a/noncore/apps/opie-reader/AportisCodec.wmak b/noncore/apps/opie-reader/AportisCodec.wmak
deleted file mode 100644
index 02c9ef0..0000000
--- a/noncore/apps/opie-reader/AportisCodec.wmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libAportis.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: AportisCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libAportis.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	Aportis.cpp
-OBJECTS =	WSREADEROBJS/Aportis.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libAportis.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libAportis.a
-TARGETD	=	libAportis.so.1.0.0
-TARGET0	=	libAportis.so
-TARGET1	=	libAportis.so.1
-TARGET2	=	libAportis.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: AportisCodec.wmak
-
-AportisCodec.wmak: AportisCodec.wpro
-	tmake AportisCodec.wpro -o AportisCodec.wmak
-
-dist:
-	$(TAR) AportisCodec.wpro.tar AportisCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) AportisCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		WSREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Aportis.o Aportis.cpp
-
diff --git a/noncore/apps/opie-reader/AportisCodec.wpro b/noncore/apps/opie-reader/AportisCodec.wpro
deleted file mode 100644
index b21f2cb..0000000
--- a/noncore/apps/opie-reader/AportisCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= Aportis.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Aportis
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/AportisCodec.zmak b/noncore/apps/opie-reader/AportisCodec.zmak
deleted file mode 100644
index 6fb0444..0000000
--- a/noncore/apps/opie-reader/AportisCodec.zmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libAportis.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: AportisCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libAportis.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	Aportis.cpp
-OBJECTS =	ZREADEROBJS/Aportis.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libAportis.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libAportis.a
-TARGETD	=	libAportis.so.1.0.0
-TARGET0	=	libAportis.so
-TARGET1	=	libAportis.so.1
-TARGET2	=	libAportis.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: AportisCodec.zmak
-
-AportisCodec.zmak: AportisCodec.zpro
-	tmake AportisCodec.zpro -o AportisCodec.zmak
-
-dist:
-	$(TAR) AportisCodec.zpro.tar AportisCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) AportisCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Aportis.o Aportis.cpp
-
diff --git a/noncore/apps/opie-reader/AportisCodec.zpro b/noncore/apps/opie-reader/AportisCodec.zpro
deleted file mode 100644
index 8e4b26c..0000000
--- a/noncore/apps/opie-reader/AportisCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= Aportis.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Aportis
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index cd79fec..caccf1b 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -1,520 +1,519 @@
 #include "CDrawBuffer.h"
 #include "FontControl.h"
 #include <qfontmetrics.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qimage.h>
 #include "useqpe.h"
-#include "opie.h"
 
 CDrawBuffer::~CDrawBuffer()
 {
     while (!segs.isEmpty()) segs.erase(0);
 }
 
 void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
 {
   int i;
   len = rhs.len;
   fc = rhs.fc;
   m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
   while (!segs.isEmpty())
   {
       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");
   len = rhs.len;
   m_ascent = rhs.m_ascent;
   m_descent = rhs.m_descent;
   m_lineSpacing = rhs.m_lineSpacing;
   m_lineExtraSpacing = rhs.m_lineExtraSpacing;
   m_showPartial = rhs.m_showPartial;
   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");
   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;
     m_bBop = false;
     len = 0;
     (*this)[0] = 0;
     while (!segs.isEmpty())
     {
 	segs.erase(0);
     }
     segs.push_back(textsegment(0,CStyle()));
     m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
     m_bEof = false;
 }
 
 void CDrawBuffer::setendpara(const CStyle& _style/* = ucFontBase*/)
 {
    m_bEop = true;
    if (len == 0)
     {
 	segs.first().start = 0;
 	segs.first().style = _style;
     }
 }
 
 void CDrawBuffer::addch(tchar ch, CStyle _style/* = ucFontBase*/)
 {
     if (len == 0)
     {
 	segs.first().start = 0;
 	segs.first().style = _style;
     }
     else if (_style != segs.last().style)
     {
 	segs.push_back(textsegment(len, _style));
     }
     (*this)[len++] = ch;
 }
 
 void CDrawBuffer::truncate(int n)
 {
     len = n;
     (*this)[n] = 0;
 }
 
 int CDrawBuffer::width(int availht, int numchars, bool onscreen, int scwidth, unsigned short _lborder, unsigned short _rborder)
 {
     int gzoom = fc->gzoom();
     int currentx = 0, end = 0;
     QString text = (numchars < 0) ? toQString(data()) : toQString(data(), numchars);
     CList<textsegment>::iterator textstart = segs.begin();
     int extraspace = 0;
     bool just = (onscreen && !m_bEop && textstart->style.getJustify() == m_AlignJustify);
     int spaces = 0;
     int spacesofar = 0;
     int spacenumber = 0;
     int nonspace = 0;
     if (just)
     {
 	for (int i = 0; i < len; i++)
 	{
 	    if ((*this)[i] != ' ')
 	    {
 		nonspace = i;
 		break;
 	    }
 	}
 #ifdef _WINDOWS
 	for (i = nonspace; i < len; i++)
 #else
 	for (int i = nonspace; i < len; i++)
 #endif
 	{
 	    if ((*this)[i] == ' ')
 	    {
 		spaces++;
 	    }
 	}
 	if (spaces == 0)
 	{
 	    just = false;
 	}
 	else
 	{
 	    extraspace = (scwidth - (_lborder+_rborder) - rightMargin() - leftMargin() - width(availht));
 	    if (extraspace == 0) just = false;
 	}
     }
     CList<textsegment>::iterator textend = textstart;
     do
     {
 	textend++;
 	end = (textend != segs.end()) ? textend->start : len;
 	if (numchars >= 0 && end > numchars)
 	{
 	    end = numchars;
 	}
 	CStyle currentstyle = textstart->style;
 	if (currentstyle.isPicture())
 	{
 	    if (currentstyle.canScale())
 	    {
 	      int ht = (gzoom*currentstyle.getPicture()->height())/100;
 	      int wt = (gzoom*currentstyle.getPicture()->width())/100;
 	      if (ht > availht)
 		{
 		  wt = (wt*availht)/ht;
 		}
 	      currentx += wt;
 	    }
 	    else
 	    {
 		currentx += currentstyle.getPicture()->width();
 	    }
 	}
 	else
 	{
 	    if (currentstyle.isMono() && !fc->hasCourier())
 	    {
 		int cw = (7*fc->getsize(currentstyle))/10;
 		currentx += cw*(end-textstart->start);
 	    }
 	    else
 	    {
 		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);
 			    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::charwidth(int numchars, CStyle& currentstyle)
 {
     if (currentstyle.isPicture())
       {
 	int gzoom = fc->gzoom();
 	if (currentstyle.canScale())
 	  {
 	    return (gzoom*currentstyle.getPicture()->width())/100;
 	  }
 	else
 	  {
 	    return currentstyle.getPicture()->width();
 	  }
       }
     else
       {
 	if (currentstyle.isMono() && !fc->hasCourier())
 	  {
 	    return (7*fc->getsize(currentstyle))/10;
 	  }
 	else
 	  {
 	    QString text = QChar((data())[numchars]);
 	    QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
 	    //	    f.setUnderline(currentstyle.isUnderline());
 	    QFontMetrics fm(f);
 	    return fm.width(text);
 	  }
       }
     return 0;
 }
 
 int CDrawBuffer::charwidth(int numchars)
 {
     int gzoom = fc->gzoom();
     int end = 0;
     QString text = QChar((data())[numchars]);
     CList<textsegment>::iterator textstart = segs.begin();
     CList<textsegment>::iterator textend = textstart;
     do
     {
 	textend++;
 	end = (textend != segs.end()) ? textend->start : len;
 	if (end <= numchars)
 	{
 	    textstart = textend;
 	    continue;
 	}
 	if (numchars >= 0 && end > numchars)
 	{
 	    end = numchars;
 	}
 	CStyle currentstyle = textstart->style;
 	if (currentstyle.isPicture())
 	{
 	    if (currentstyle.canScale())
 	    {
 		return (gzoom*currentstyle.getPicture()->width())/100;
 	    }
 	    else
 	    {
 		return currentstyle.getPicture()->width();
 	    }
 	}
 	else
 	{
 	    if (currentstyle.isMono() && !fc->hasCourier())
 	    {
 		return (7*fc->getsize(currentstyle))/10;
 	    }
 	    else
 	    {
 		QFont f(currentstyle.isMono() ? QString(fc->fixedfontname()) : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
 //	    f.setUnderline(currentstyle.isUnderline());
 		QFontMetrics fm(f);
 		return fm.width(text);
 	    }
 	}
 	textstart = textend;
     }
     while (textend != segs.end() /* && end != numchars*/ && textstart->start < len);
     return 0;
 }
 
 
 
 int CDrawBuffer::leftMargin()
 {
     return (segs.begin()->style.getLeftMargin()*fc->getsize(segs.begin()->style)+3)/6;
 }
 
 int CDrawBuffer::rightMargin()
 {
     return (segs.begin()->style.getRightMargin()*fc->getsize(segs.begin()->style)+3)/6;
 }
 
 int CDrawBuffer::offset(int scwidth, unsigned short _lborder, unsigned short _rborder, int availht)
 {
     int currentx = _lborder;
     switch(segs.begin()->style.getJustify())
     {
 	case m_AlignRight:
 	{
 	    currentx = scwidth - _rborder - rightMargin() - width(availht);
 	}
 	break;
 	case m_AlignCentre:
 	{
 	    currentx = (
 		scwidth - _lborder -_rborder +
 		leftMargin() - rightMargin()
 		- width(availht))/2 + _lborder;
 	}
 	break;
 	case m_AlignJustify:
 	case m_AlignLeft:
 	    currentx = _lborder + leftMargin();
 	    break;
     }
     return currentx;
 }
 
 void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int scwidth, unsigned short _lborder, unsigned short _rborder, const QColor& _bg, int availht)
 {
     CList<textsegment>::iterator textstart = segs.begin();
    QColor paperColour = QColor(qRgb(textstart->style.pRed(),
 				    textstart->style.pGreen(),
 				    textstart->style.pBlue()));
 
    Highlight(_p, !(paperColour == _bg), _lborder, _y, scwidth-(_lborder+_rborder), paperColour);
    //   Highlight(_p, true, _lborder, _y, scwidth-(_lborder+_rborder), paperColour);
     int gzoom = fc->gzoom();
     int currentx = offset(scwidth, _lborder, _rborder, availht);
    if (!m_hastext)
      {
 	for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end(); iter++)
 	  {
 	     CStyle currentstyle = iter->style;
 	     if (currentstyle.isPicture())
 	       {
 		  CStyle currentstyle = segs.begin()->style;
 		  int ht = (gzoom*currentstyle.getPicture()->height())/100;
 		  int wt = (gzoom*currentstyle.getPicture()->width())/100;
 		  bool willscale = false;
 		  if (ht > availht)
 		    {
 		      wt = (wt*availht)/ht;
 		      ht = availht;
 		      willscale = true;
 		    }
 
 		  QPixmap pc;
 		  if ((willscale || gzoom != 100) && currentstyle.canScale())
 		    {
 		       QImage im = currentstyle.getPicture()->smoothScale(wt,ht);
 		       pc.convertFromImage(im);
 		    }
 		  else
 		    {
 		       pc.convertFromImage(*currentstyle.getPicture());
 		    }
 		  int yoffset = pc.height()/2;
 		  _p->drawPixmap( currentx, _y-yoffset, pc );
 		  currentx += pc.width();
 	       }
 	  }	  
 	return;
      }
     QString text = toQString(data());
     int extraspace = 0;
     bool just = (!m_bEop && textstart->style.getJustify() == m_AlignJustify);
     int spaces = 0;
     int spacesofar = 0;
     int spacenumber = 0;
     int nonspace = 0;
     if (just)
     {
 	for (int i = 0; i < len; i++)
 	{
 	    if ((*this)[i] != ' ')
 	    {
 		nonspace = i;
 		break;
 	    }
 	}
 #ifdef _WINDOWS
 	for (i = nonspace; i < len; i++)
 #else
 	for (int i = nonspace; i < len; i++)
 #endif
 	{
 	    if ((*this)[i] == ' ')
 	    {
 		spaces++;
 	    }
 	}
 	if (spaces == 0)
 	{
 	    just = false;
 	}
 	else
 	{
 	    extraspace = (scwidth - (_lborder+_rborder) - rightMargin() - leftMargin() - width(availht));
 	    if (extraspace == 0) just = false;
 	}
     }
     CList<textsegment>::iterator textend = textstart;
 
    bool drawBackground = false;
     do
     {
 	textend++;
 	int end = (textend != segs.end()) ? textend->start : len;
 	CStyle currentstyle = textstart->style;
 	/*
 	bool drawBackground = (
 			       currentstyle.bRed() != 255
 			       ||
 			       currentstyle.bGreen() != 255
 			       ||
 			       currentstyle.bBlue() != 255
 			       );
 	*/
 	QColor bgColour = QColor(qRgb(currentstyle.bRed(),
 					      currentstyle.bGreen(),
 					      currentstyle.bBlue()));
 	drawBackground = !(bgColour == _bg);
 
 //       if (drawBackground) qDebug("Drawing background");
        
 	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");
 	_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)
 	{
 
 	  Highlight(_p, drawBackground, currentx, _y, str.length()*_charWidth, bgColour);
 	    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;
 	}
 	else
 	{
 	    if (currentstyle.isPicture())
 	    {
 		int ht = (gzoom*currentstyle.getPicture()->height())/100;
 		int wt = (gzoom*currentstyle.getPicture()->width())/100;
 		  bool willscale = false;
diff --git a/noncore/apps/opie-reader/CHM.mak b/noncore/apps/opie-reader/CHM.mak
deleted file mode 100644
index e14db5b..0000000
--- a/noncore/apps/opie-reader/CHM.mak
+++ b/dev/null
@@ -1,177 +0,0 @@
-#############################################################################
-# Makefile for building: libCHM.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:37:00 2004
-# Project:  CHM.pro
-# Template: lib
-# Command: $(QMAKE) -o CHM.mak CHM.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -w -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -w -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libCHM.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = CHM.h \
-		chm_lib.h \
-		lzx.h
-SOURCES = CHM.cpp \
-		chm_lib.c \
-		lzx.c
-OBJECTS = QREADEROBJS/CHM.o \
-		QREADEROBJS/chm_lib.o \
-		QREADEROBJS/lzx.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = CHM.pro
-QMAKE_TARGET = CHM
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libCHM.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libCHM.a
-TARGETD	= libCHM.so.1.0.0
-TARGET0	= libCHM.so
-TARGET1	= libCHM.so.1
-TARGET2	= libCHM.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: CHM.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-CHM.mak: CHM.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o CHM.mak CHM.pro
-qmake: 
-	@$(QMAKE) -o CHM.mak CHM.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/CHM && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/CHM/ && ( cd `dirname QREADEROBJS/CHM` && $(TAR) CHM.tar CHM && $(GZIP) CHM.tar ) && $(MOVE) `dirname QREADEROBJS/CHM`/CHM.tar.gz . && $(DEL_FILE) -r QREADEROBJS/CHM
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/CHM.o: CHM.cpp CHM.h \
-		chm_lib.h \
-		QREADERINC/static.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		my_list.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CHM.o CHM.cpp
-
-QREADEROBJS/chm_lib.o: chm_lib.c chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QREADEROBJS/chm_lib.o chm_lib.c
-
-QREADEROBJS/lzx.o: lzx.c lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QREADEROBJS/lzx.o lzx.c
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/CHM.omak b/noncore/apps/opie-reader/CHM.omak
deleted file mode 100644
index 4cdfbe2..0000000
--- a/noncore/apps/opie-reader/CHM.omak
+++ b/dev/null
@@ -1,140 +0,0 @@
-#############################################################################
-# Makefile for building libCHM.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: CHM.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libCHM.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CHM.h \
-		chm_lib.h \
-		lzx.h
-SOURCES =	CHM.cpp \
-		chm_lib.c \
-		lzx.c
-OBJECTS =	OREADEROBJS/CHM.o \
-		OREADEROBJS/chm_lib.o \
-		OREADEROBJS/lzx.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libCHM.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libCHM.a
-TARGETD	=	libCHM.so.1.0.0
-TARGET0	=	libCHM.so
-TARGET1	=	libCHM.so.1
-TARGET2	=	libCHM.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: CHM.omak
-
-CHM.omak: CHM.opro
-	tmake CHM.opro -o CHM.omak
-
-dist:
-	$(TAR) CHM.opro.tar CHM.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) CHM.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/CHM.o: CHM.cpp \
-		CHM.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		chm_lib.h \
-		my_list.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CHM.o CHM.cpp
-
-OREADEROBJS/chm_lib.o: chm_lib.c \
-		chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o OREADEROBJS/chm_lib.o chm_lib.c
-
-OREADEROBJS/lzx.o: lzx.c \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o OREADEROBJS/lzx.o lzx.c
-
diff --git a/noncore/apps/opie-reader/CHM.zmak b/noncore/apps/opie-reader/CHM.zmak
deleted file mode 100644
index 6cde457..0000000
--- a/noncore/apps/opie-reader/CHM.zmak
+++ b/dev/null
@@ -1,140 +0,0 @@
-#############################################################################
-# Makefile for building libCHM.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: CHM.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libCHM.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CHM.h \
-		chm_lib.h \
-		lzx.h
-SOURCES =	CHM.cpp \
-		chm_lib.c \
-		lzx.c
-OBJECTS =	ZREADEROBJS/CHM.o \
-		ZREADEROBJS/chm_lib.o \
-		ZREADEROBJS/lzx.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libCHM.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libCHM.a
-TARGETD	=	libCHM.so.1.0.0
-TARGET0	=	libCHM.so
-TARGET1	=	libCHM.so.1
-TARGET2	=	libCHM.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: CHM.zmak
-
-CHM.zmak: CHM.zpro
-	tmake CHM.zpro -o CHM.zmak
-
-dist:
-	$(TAR) CHM.zpro.tar CHM.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) CHM.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/CHM.o: CHM.cpp \
-		CHM.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		chm_lib.h \
-		my_list.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CHM.o CHM.cpp
-
-ZREADEROBJS/chm_lib.o: chm_lib.c \
-		chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZREADEROBJS/chm_lib.o chm_lib.c
-
-ZREADEROBJS/lzx.o: lzx.c \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZREADEROBJS/lzx.o lzx.c
-
diff --git a/noncore/apps/opie-reader/CHM.zpro b/noncore/apps/opie-reader/CHM.zpro
deleted file mode 100644
index 1f2464a..0000000
--- a/noncore/apps/opie-reader/CHM.zpro
+++ b/dev/null
@@ -1,16 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= CHM.h chm_lib.h lzx.h
-
-SOURCES		= CHM.cpp chm_lib.c lzx.c
-
-
-INTERFACES	=
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= CHM
-LIBS            += -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH += ZREADERINC
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp
index d082898..bbd9fe0 100644
--- a/noncore/apps/opie-reader/FontControl.cpp
+++ b/noncore/apps/opie-reader/FontControl.cpp
@@ -1,68 +1,67 @@
 #include <qfontdatabase.h>
-#include "opie.h"
 #include "useqpe.h"
 #include "FontControl.h"
 
 int FontControl::gzoom()
 {
   if (m_fixgraphics)
     {
       return 100;
     }
   else
     {
       int ret;
       if (m_size == g_size)
 	{
 	  ret = m_fontsizes[m_size]*m_basesize;
 	}
       else if (g_size < 0)
 	{
 	  int f = -g_size;
 	  ret = (m_fontsizes[0]*m_basesize) >> (f/2);
 	  if (f%2) ret = (2*ret/3);
 	}
       else
 	{
 	  int f = g_size - m_maxsize + 1;
 	  ret = (m_fontsizes[m_maxsize-1]*m_basesize) << (f/2);
 	  if (f%2) ret = (3*ret/2);
 	}
       return ret;
     }
 }
 
 bool FontControl::ChangeFont(QString& n, int tgt)
 {
     QValueList<int>::Iterator it;
     QFontDatabase fdb;
     QValueList<int> sizes = fdb.pointSizes(n);
     if (sizes.count() == 0)
     {
 	return false;
     }
     else
     {
 	m_fontname = n;
 	m_maxsize = sizes.count();
 	if (m_fontsizes != NULL) delete [] m_fontsizes;
 	m_fontsizes = new int[m_maxsize];
 	uint i = 0;
 	uint best = 0;
 	for (it = sizes.begin(); it != sizes.end(); it++)
 	{
 #if defined(OPIE) || !defined(USEQPE)
 	    m_fontsizes[i] = (*it);
 #else
 	    m_fontsizes[i] = (*it)/10;
 #endif
 	    if (abs(tgt-m_fontsizes[i]) < abs(tgt-m_fontsizes[best]))
 	    {
 		best = i;
 	    }
 	    i++;
 	}
 	g_size = m_size = best;
     }
     return true;
 }
diff --git a/noncore/apps/opie-reader/HTMLFilter.mak b/noncore/apps/opie-reader/HTMLFilter.mak
deleted file mode 100644
index e1a2125..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.mak
+++ b/dev/null
@@ -1,170 +0,0 @@
-#############################################################################
-# Makefile for building: libHTMLfilter.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:38:47 2004
-# Project:  HTMLFilter.pro
-# Template: lib
-# Command: $(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libHTMLfilter.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = CFilter.h
-SOURCES = striphtml.cpp
-OBJECTS = QREADEROBJS/striphtml.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = HTMLFilter.pro
-QMAKE_TARGET = HTMLfilter
-DESTDIR  = $(READERDIR)/filters/
-TARGET   = libHTMLfilter.so.1.0.0
-TARGETA	= $(READERDIR)/filters/libHTMLfilter.a
-TARGETD	= libHTMLfilter.so.1.0.0
-TARGET0	= libHTMLfilter.so
-TARGET1	= libHTMLfilter.so.1
-TARGET2	= libHTMLfilter.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: HTMLFilter.mak  $(READERDIR)/filters/$(TARGET)
-
-$(READERDIR)/filters/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/filters/ || mkdir -p $(READERDIR)/filters/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/filters/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-HTMLFilter.mak: HTMLFilter.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
-qmake: 
-	@$(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/HTMLfilter && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/HTMLfilter/ && ( cd `dirname QREADEROBJS/HTMLfilter` && $(TAR) HTMLfilter.tar HTMLfilter && $(GZIP) HTMLfilter.tar ) && $(MOVE) `dirname QREADEROBJS/HTMLfilter`/HTMLfilter.tar.gz . && $(DEL_FILE) -r QREADEROBJS/HTMLfilter
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET0) $(READERDIR)/filters/$(TARGET1) $(READERDIR)/filters/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/striphtml.o: striphtml.cpp QREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		striphtml.h \
-		hrule.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CFilter.h \
-		Navigation.h \
-		CExpander.h \
-		CEncoding.h \
-		QREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/striphtml.o striphtml.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.omak b/noncore/apps/opie-reader/HTMLFilter.omak
deleted file mode 100644
index 1ab671f..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.omak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libHTMLfilter.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: HTMLFilter.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libHTMLfilter.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CFilter.h
-SOURCES =	striphtml.cpp
-OBJECTS =	OREADEROBJS/striphtml.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libHTMLfilter.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
-TARGETD	=	libHTMLfilter.so.1.0.0
-TARGET0	=	libHTMLfilter.so
-TARGET1	=	libHTMLfilter.so.1
-TARGET2	=	libHTMLfilter.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
-
-$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: HTMLFilter.omak
-
-HTMLFilter.omak: HTMLFilter.opro
-	tmake HTMLFilter.opro -o HTMLFilter.omak
-
-dist:
-	$(TAR) HTMLFilter.opro.tar HTMLFilter.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) HTMLFilter.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/striphtml.o: striphtml.cpp \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		OREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/striphtml.o striphtml.cpp
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.wmak b/noncore/apps/opie-reader/HTMLFilter.wmak
deleted file mode 100644
index 485bb21..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.wmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libHTMLfilter.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: HTMLFilter.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libHTMLfilter.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CFilter.h
-SOURCES =	striphtml.cpp
-OBJECTS =	WSREADEROBJS/striphtml.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libHTMLfilter.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
-TARGETD	=	libHTMLfilter.so.1.0.0
-TARGET0	=	libHTMLfilter.so
-TARGET1	=	libHTMLfilter.so.1
-TARGET2	=	libHTMLfilter.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
-
-$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: HTMLFilter.wmak
-
-HTMLFilter.wmak: HTMLFilter.wpro
-	tmake HTMLFilter.wpro -o HTMLFilter.wmak
-
-dist:
-	$(TAR) HTMLFilter.wpro.tar HTMLFilter.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) HTMLFilter.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/striphtml.o: striphtml.cpp \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		WSREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/striphtml.o striphtml.cpp
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.wpro b/noncore/apps/opie-reader/HTMLFilter.wpro
deleted file mode 100644
index e0425b4..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= CFilter.h
-
-SOURCES		= striphtml.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/filters
-TARGET		= HTMLfilter
-
-
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/HTMLFilter.zmak b/noncore/apps/opie-reader/HTMLFilter.zmak
deleted file mode 100644
index d1af765..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.zmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libHTMLfilter.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: HTMLFilter.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libHTMLfilter.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CFilter.h
-SOURCES =	striphtml.cpp
-OBJECTS =	ZREADEROBJS/striphtml.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libHTMLfilter.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
-TARGETD	=	libHTMLfilter.so.1.0.0
-TARGET0	=	libHTMLfilter.so
-TARGET1	=	libHTMLfilter.so.1
-TARGET2	=	libHTMLfilter.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
-
-$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: HTMLFilter.zmak
-
-HTMLFilter.zmak: HTMLFilter.zpro
-	tmake HTMLFilter.zpro -o HTMLFilter.zmak
-
-dist:
-	$(TAR) HTMLFilter.zpro.tar HTMLFilter.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) HTMLFilter.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/striphtml.o: striphtml.cpp \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/striphtml.o striphtml.cpp
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.zpro b/noncore/apps/opie-reader/HTMLFilter.zpro
deleted file mode 100644
index ba570b1..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= CFilter.h
-
-SOURCES		= striphtml.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/filters
-TARGET		= HTMLfilter
-
-
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/PluckerCodec.mak b/noncore/apps/opie-reader/PluckerCodec.mak
deleted file mode 100644
index ffd6ba8..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.mak
+++ b/dev/null
@@ -1,176 +0,0 @@
-#############################################################################
-# Makefile for building: libPlucker.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:40:46 2004
-# Project:  PluckerCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libPlucker.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = plucker.h
-SOURCES = plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS = QREADEROBJS/plucker.o \
-		QREADEROBJS/Palm2QImage.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = PluckerCodec.pro
-QMAKE_TARGET = Plucker
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libPlucker.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libPlucker.a
-TARGETD	= libPlucker.so.1.0.0
-TARGET0	= libPlucker.so
-TARGET1	= libPlucker.so.1
-TARGET2	= libPlucker.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: PluckerCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-PluckerCodec.mak: PluckerCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
-qmake: 
-	@$(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/Plucker && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Plucker/ && ( cd `dirname QREADEROBJS/Plucker` && $(TAR) Plucker.tar Plucker && $(GZIP) Plucker.tar ) && $(MOVE) `dirname QREADEROBJS/Plucker`/Plucker.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Plucker
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/plucker.o: plucker.cpp QREADERINC/useqpe.h \
-		plucker.h \
-		Aportis.h \
-		Palm2QImage.h \
-		QREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/plucker.o plucker.cpp
-
-QREADEROBJS/Palm2QImage.o: Palm2QImage.cpp QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.omak b/noncore/apps/opie-reader/PluckerCodec.omak
deleted file mode 100644
index 27a5c93..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.omak
+++ b/dev/null
@@ -1,138 +0,0 @@
-#############################################################################
-# Makefile for building libPlucker.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: PluckerCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libPlucker.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	plucker.h
-SOURCES =	plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS =	OREADEROBJS/plucker.o \
-		OREADEROBJS/Palm2QImage.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libPlucker.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libPlucker.a
-TARGETD	=	libPlucker.so.1.0.0
-TARGET0	=	libPlucker.so
-TARGET1	=	libPlucker.so.1
-TARGET2	=	libPlucker.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: PluckerCodec.omak
-
-PluckerCodec.omak: PluckerCodec.opro
-	tmake PluckerCodec.opro -o PluckerCodec.omak
-
-dist:
-	$(TAR) PluckerCodec.opro.tar PluckerCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) PluckerCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/plucker.o: plucker.cpp \
-		OREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/plucker.o plucker.cpp
-
-OREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.wmak b/noncore/apps/opie-reader/PluckerCodec.wmak
deleted file mode 100644
index 6c1f37a..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.wmak
+++ b/dev/null
@@ -1,138 +0,0 @@
-#############################################################################
-# Makefile for building libPlucker.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: PluckerCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libPlucker.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	plucker.h
-SOURCES =	plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS =	WSREADEROBJS/plucker.o \
-		WSREADEROBJS/Palm2QImage.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libPlucker.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libPlucker.a
-TARGETD	=	libPlucker.so.1.0.0
-TARGET0	=	libPlucker.so
-TARGET1	=	libPlucker.so.1
-TARGET2	=	libPlucker.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: PluckerCodec.wmak
-
-PluckerCodec.wmak: PluckerCodec.wpro
-	tmake PluckerCodec.wpro -o PluckerCodec.wmak
-
-dist:
-	$(TAR) PluckerCodec.wpro.tar PluckerCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) PluckerCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/plucker.o: plucker.cpp \
-		WSREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		WSREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/plucker.o plucker.cpp
-
-WSREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.wpro b/noncore/apps/opie-reader/PluckerCodec.wpro
deleted file mode 100644
index 8f80a8b..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.wpro
+++ b/dev/null
@@ -1,16 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= plucker.h
-
-SOURCES		= plucker.cpp \
-                  Palm2QImage.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Plucker
-LIBS            += -lreader_pdb -lreader_pluckerbase -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/PluckerCodec.zmak b/noncore/apps/opie-reader/PluckerCodec.zmak
deleted file mode 100644
index 9aa5e39..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.zmak
+++ b/dev/null
@@ -1,138 +0,0 @@
-#############################################################################
-# Makefile for building libPlucker.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: PluckerCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libPlucker.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	plucker.h
-SOURCES =	plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS =	ZREADEROBJS/plucker.o \
-		ZREADEROBJS/Palm2QImage.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libPlucker.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libPlucker.a
-TARGETD	=	libPlucker.so.1.0.0
-TARGET0	=	libPlucker.so
-TARGET1	=	libPlucker.so.1
-TARGET2	=	libPlucker.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: PluckerCodec.zmak
-
-PluckerCodec.zmak: PluckerCodec.zpro
-	tmake PluckerCodec.zpro -o PluckerCodec.zmak
-
-dist:
-	$(TAR) PluckerCodec.zpro.tar PluckerCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) PluckerCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/plucker.o: plucker.cpp \
-		ZREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/plucker.o plucker.cpp
-
-ZREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.zpro b/noncore/apps/opie-reader/PluckerCodec.zpro
deleted file mode 100644
index e462d96..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.zpro
+++ b/dev/null
@@ -1,16 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= plucker.h
-
-SOURCES		= plucker.cpp \
-                  Palm2QImage.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Plucker
-LIBS            += -lreader_pdb -lreader_pluckerbase -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 63d1fb0..ec7a29c 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -1,4966 +1,4965 @@
-/**********************************************************************

-** Copyright (C) 2000 Trolltech AS.  Allrights reserved.

-**

-** This file is part of Qt Palmtop Environment.

-**

-** This file may be distributed and/or modified under the terms of the

-** GNU General Public License version 2 as published by the Free Software

-** Foundation and appearing in the file LICENSE.GPL included in the

-** packaging of this file.

-**

-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

-**

-** 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>

-#ifdef USEQPE

-#include <qpe/qpemenubar.h>

-#include <qpe/qpetoolbar.h>

-#endif

-#include <qmenubar.h>

-#include <qtoolbar.h>

-#ifdef USEQPE

-#include <qpe/menubutton.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>

-#include <qstatusbar.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 "util.h"

-#include <qfontdatabase.h>

-#include "opie.h"

-#ifdef USEQPE

-#include <qpe/resource.h>

-#ifdef OPIE

-//#include <qpe/applnk.h>

-#include <opie2/ofiledialog.h>

-using namespace Opie::Ui;

-#else

-#include "fileBrowser.h"

-#endif

-#else

-#include "qfiledialog.h"

-#endif

-

-#include "QTReaderApp.h"

-#include "CDrawBuffer.h"

-#include "Filedata.h"

-#include "useqpe.h"

-#include "names.h"

-#include "CEncoding_tables.h"

-#include "CloseDialog.h"

-

-#include "ButtonPrefs.h"

-

-bool CheckVersion(int&, int&, char&);

-

-#ifdef _WINDOWS

-#define PICDIR "c:\\uqtreader\\pics\\"

-#else

-#ifdef USEQPE

-#define USEMSGS

-#define PICDIR "opie-reader/"

-#else

-//#define PICDIR "/home/tim/uqtreader/pics/"

-QString picdir()

-{

-  QString hd(getenv("READERDIR"));

-  return hd + "/pics";

-}

-#define PICDIR picdir()

-#endif

-#endif

-

-unsigned long QTReaderApp::m_uid = 0;

-

-void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); }

-

-#ifdef USEQPE

-#define geticon(iconname) Resource::loadPixmap( iconname )

-#define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname )

-#else

-//#define geticon(iconname) QPixmap(PICDIR iconname ".png")

-#define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png")

-#define getmyicon(iconname) geticon(iconname)

-//#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) )

-#endif

-

-#ifndef _WINDOWS

-#include <unistd.h>

-#endif

-#include <stddef.h>

-#ifndef _WINDOWS

-#include <dirent.h>

-#endif

-

-void QTReaderApp::listBkmkFiles()

-{

-    bkmkselector->clear();

-    bkmkselector->setText("Cancel");

-#ifndef USEQPE

-    int cnt = 0;

-

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-		d = QDir::home();

-		d.mkdir(APPDIR);

-		d.cd(APPDIR);

-    }

-

-

-  

-		

-        d.setFilter( QDir::Files | QDir::NoSymLinks );

-//        d.setSorting( QDir::Size | QDir::Reversed );

-

-        const QFileInfoList *list = d.entryInfoList();

-        QFileInfoListIterator it( *list );      // create list iterator

-        QFileInfo *fi;                          // pointer for traversing

-

-        while ( (fi=it.current()) ) {           // for each file...

-  

-		    bkmkselector->insertItem(fi->fileName());

-		    cnt++;

-			

-			//qDebug( "%10li %s", fi->size(), fi->fileName().data() );

-            ++it;                               // goto next list element

-        }

- 

-#else /* USEQPE */

-    int cnt = 0;

-    DIR *d;

-    d = opendir((const char *)Global::applicationFileName(APPDIR,""));

-

-    while(1)

-    {

-	struct dirent* de;

-	struct stat buf;

-	de = readdir(d);

-	if (de == NULL) break;

-

-	if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))

-	{

-	    bkmkselector->insertItem(de->d_name);

-	    cnt++;

-	}

-    }

-

-    closedir(d);

-#endif

-    if (cnt > 0)

-      {

-//tjw        menu->hide();

-

-

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-	m_nBkmkAction = cRmBkmkFile;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No bookmark files");

-}

-

-void QTReaderApp::hidetoolbars()

-{

-  if (m_scrollbar != NULL) m_scrollbar->hide();

-  if (m_prog != NULL) m_prog->hide();

-

-#ifdef USEQPE

-    menubar->hide();

-#endif

-

-    if (m_scrollbar != NULL) m_scrollbar->hide();

-

-    if (fileBar != NULL) fileBar->hide();

-    if (viewBar != NULL) viewBar->hide();

-    if (navBar != NULL) navBar->hide();

-    if (markBar != NULL) markBar->hide();

-    if (m_fontVisible) m_fontBar->hide();

-    if (regVisible)

-    {

-#ifdef USEQPE

-		Global::hideInputMethod();

-#endif

-	regBar->hide();

-    }

-    if (searchVisible)

-    {

-#ifdef USEQPE

-		Global::hideInputMethod();

-#endif

-	searchBar->hide();

-    }

-}

-

-QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )

-    : QMainWindow( parent, name, f ), m_dontSave(false),

-      fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL), m_scrollbar(NULL), m_localscroll(2), m_hidebars(false), m_kmapchanged(false)

-{

-  {

-    setKeyCompression ( true );

-#ifndef USEQPE

-  QDir d = QDir::home();                      // "/"

-  d.cd(APPDIR);

-  QFileInfo fi(d, ".keymap");

-  FILE* f = fopen((const char *)fi.absFilePath(), "r");

-#else /* USEQPE */

-  FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "r");

-#endif /* USEQPE */

-  if (f != NULL)

-    {

-      uint cnt;

-      if ((fread(&cnt, sizeof(cnt), 1, f) != 0) && (cnt == KEYMAPVERSION))

-	{

-	  if (fread(&cnt, sizeof(cnt), 1, f) == 0) cnt = 0;

-	  for (uint i = 0; i != cnt; i++)

-	    {

-	      orKey key;

-	      int data;

-	      fread(&key, sizeof(key), 1, f);

-	      fread(&data, sizeof(data), 1, f);

-	      kmap[key] = data;

-	    }

-	}

-      fclose(f);

-    }

-  }

-

-	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"));

-

-    m_bcloseDisabled = true;

-    m_disableesckey = false;

-    pBkmklist = NULL;

-    pOpenlist = NULL;

-//    doc = 0;

-

-	m_fBkmksChanged = false;

-    

-  QString lang = getenv( "LANG" );

-  QString rot = getenv( "QWS_DISPLAY" );

-

-/*

-  int m_rot = 0;

-  if (rot.contains("Rot90"))

-  {

-      m_rot = 90;

-  }

-  else if (rot.contains("Rot180"))

-  {

-      m_rot = 180;

-  }

-  else if (rot.contains("Rot270"))

-  {

-      m_rot = 270;

-  }

-

-//  qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);

-*/

-  m_autogenstr = "^ *[A-Z].*[a-z] *$";

-

-#ifdef USEQPE

-    setIcon( Resource::loadPixmap( PICDIR  "uqtreader") );

-#else

-    setIcon( QPixmap (PICDIR  + "/uqtreader.png") );

-#endif /* USEQPE */

-

-//    QPEToolBar *bar = new QPEToolBar( this );

-//    menubar = new QPEToolBar( this );

-#ifdef USEQPE

-  Config config( APPDIR );

-#else

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-		d = QDir::home();

-		d.mkdir(APPDIR);

-		d.cd(APPDIR);

-    }

-    QFileInfo fi(d, INIFILE);

-//    qDebug("Path:%s", (const char*)fi.absFilePath());

-    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);

-    m_qtscroll = config.readNumEntry("QTScrollBar", false);

-    m_localscroll = config.readNumEntry("LocalScrollBar", false);

-

-//    fileBar = new QToolBar("File", this);

-//    QToolBar* viewBar = new QToolBar("File", this);

-//    QToolBar* navBar = new QToolBar("File", this);

-//    QToolBar* markBar = new QToolBar("File", this);

-

-#ifdef USEQPE

-    menubar = new QToolBar("Menus", this, m_tbposition);

-    mb = new QPEMenuBar( menubar );

-#else

-    mb = new QMenuBar( this );

-#endif

-

-#ifdef USEQPE

-    QPopupMenu* tmp = new QPopupMenu(mb);

-    mb->insertItem( geticon( "AppsIcon" ), tmp );

-#else

-    QMenuBar* tmp = mb;

-#endif

-

-    QPopupMenu *file = new QPopupMenu( mb );

-    tmp->insertItem( tr( "File" ), file );

-

-    QPopupMenu *navigation = new QPopupMenu(mb);

-    tmp->insertItem( tr( "Navigation" ), navigation );

-

-    QPopupMenu *view = new QPopupMenu( mb );

-    tmp->insertItem( tr( "View" ), view );

-

-    QPopupMenu *marks = new QPopupMenu( this );

-    tmp->insertItem( tr( "Marks" ), marks );

-

-    QPopupMenu *settings = new QPopupMenu( this );

-    tmp->insertItem( tr( "Settings" ), settings );

-

-//    addToolBar(menubar, "Menus",QMainWindow::Top);

-//    addToolBar(fileBar, "Toolbar",QMainWindow::Top);

-

-    //    QPopupMenu *edit = new QPopupMenu( this );

-

-    /*

-    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );

-    a->addTo( bar );

-    a->addTo( file );

-    */

-    QWidget* widge = new QWidget(this);

-    setCentralWidget( widge );

-    QVBoxLayout* vlayout = new QVBoxLayout(widge);

-    m_layout = new QBoxLayout(QBoxLayout::LeftToRight);

-    m_prog = new QLabel(widge);

-    vlayout->addLayout(m_layout, 1);

-    vlayout->addWidget(m_prog);

-

-    editorStack = new QWidgetStack( widge );

-    //    setCentralWidget( editorStack );

-

-    searchVisible = FALSE;

-    regVisible = FALSE;

-    m_fontVisible = false;

-

-    m_buttonprefs = new CButtonPrefs(&kmap, this);

-    editorStack->addWidget(m_buttonprefs, get_unique_id());

-    connect( m_buttonprefs, SIGNAL( Closed() ), this, SLOT( infoClose() ) );

-

-

-    m_annoWin = new CAnnoEdit(editorStack);

-    editorStack->addWidget(m_annoWin, get_unique_id());

-    connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) );

-    connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) );

-

-    m_infoWin = new infowin(editorStack);

-    editorStack->addWidget(m_infoWin, get_unique_id());

-    connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) );

-

-    m_graphicwin = new GraphicWin(editorStack);

-    editorStack->addWidget(m_graphicwin, get_unique_id());

-    connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) );

-

-//    bkmkselector = new QListBox(editorStack, "Bookmarks");

-    bkmkselector = new CBkmkSelector(editorStack, "Bookmarks");

-    //    connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) );

-    connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) );

-    connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) );

-    editorStack->addWidget( bkmkselector, get_unique_id() );

-

-/*

-    importSelector = new FileSelector( "*", editorStack, "importselector", false );

-    connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) );

-

-    editorStack->addWidget( importSelector, get_unique_id() );

-

-    // don't need the close visible, it is redundant...

-    importSelector->setCloseVisible( FALSE );

-*/    

-//    qDebug("Reading file list");

-    readfilelist();

-

-    reader = new QTReader( editorStack );

-

-    reader->setDoUpdates(false);

-

-#ifdef USEQPE

-    ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);

-#endif

-

-//    qDebug("Reading config");

-//  Config config( APPDIR );

-  config.setGroup( "View" );

-  m_debounce = config.readNumEntry("Debounce", 0);

-  m_buttonprefs->Debounce(m_debounce);

-#ifdef USEQPE

-  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);

-#else

-  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", true);

-#endif

-  reader->setStripCR(config.readBoolEntry( "StripCr", true ));

-  reader->bfulljust = config.readBoolEntry( "FullJust", false );

-  /*

-  bool btmp = config.readBoolEntry("Negative", false);

-  if (btmp) reader->setNegative();

-  */

-  reader->bInverse = config.readBoolEntry("Inverse", false);

-  reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", false ));

-  reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 ));

-  reader->setlead(config.readNumEntry( "ExtraLead", 0 ));

-  reader->btextfmt = config.readBoolEntry( "TextFmt", false );

-  reader->bautofmt = config.readBoolEntry( "AutoFmt", true );

-  reader->bstriphtml = config.readBoolEntry( "StripHtml", false );

-  reader->bpeanut = config.readBoolEntry( "Peanut", false );

-  reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );

-  reader->bdepluck = config.readBoolEntry( "Depluck", false );

-  reader->bdejpluck = config.readBoolEntry( "Dejpluck", false );

-  reader->bonespace = config.readBoolEntry( "OneSpace", false );

-  reader->bunindent = config.readBoolEntry( "Unindent", false );

-  reader->brepara = config.readBoolEntry( "Repara", false );

-  reader->m_reparastring = config.readEntry( "ReparaString", "\\n{[\\n \\t]}");

-  m_bgtype = (bground)config.readNumEntry( "BackgroundType" , 0 );

-  m_themename = config.readEntry("Theme", QString::null );

-  reader->bdblspce = config.readBoolEntry( "DoubleSpace", false );

-  reader->bindenter = config.readNumEntry( "Indent", 0 );

-  reader->m_textsize = config.readNumEntry( "FontSize", 12 );

-  reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);

-  reader->m_scrollstep = config.readNumEntry( "ScrollStep", 1);

-

-  reader->m_lastfile = config.readEntry( "LastFile", QString::null );

-  reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );

-  reader->m_bpagemode = config.readBoolEntry( "PageMode", true );

-  reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false);

-  reader->m_rotated = config.readBoolEntry( "IsRotated", false );

-  reader->m_scrolltype = config.readNumEntry( "ScrollType", 0 );

-  m_statusstring = config.readEntry("StatusContent", "%P%% Doc:%d/%D %p%% %z%%");

-  m_statusishidden = config.readBoolEntry("StatusHidden", false);

-  m_background = config.readNumEntry( "Background", 0 );

-  reader->setBackground(getcolour(m_background));

-  m_foreground = config.readNumEntry( "Foreground", 1 );

-  reader->setForeground(getcolour(m_foreground));

-  m_scrollcolor = config.readNumEntry( "ScrollColour", 5 );

-  setscrollcolour();

-  m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", 5 );

-  setscrollbarcolour();

-  reader->hyphenate = config.readBoolEntry( "Hyphenate", false );

-  reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false);

-  reader->m_fontname = config.readEntry( "Fontname", "helvetica" );

-  reader->m_encd = config.readNumEntry( "Encoding", 0 );

-  reader->m_charpc = config.readNumEntry( "CharSpacing", 100 );

-  reader->m_overlap = config.readNumEntry( "Overlap", 0 );

-  reader->m_abstopmargin = config.readNumEntry( "Top Margin", 100 );

-  reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", 100 );

-  reader->m_absleft_border = config.readNumEntry( "Left Margin", 100 );

-  reader->m_absright_border = config.readNumEntry( "Right Margin", 100 );

-

-  m_scrollishidden = config.readBoolEntry( "HideScrollBar", false );

-

-  reader->brepalm = config.readBoolEntry( "Repalm", false );

-  reader->bkern = config.readBoolEntry( "Kern", false );

-  reader->bremap = config.readBoolEntry( "Remap", true );

-  reader->bmakebold = config.readBoolEntry( "MakeBold", false );

-  reader->setContinuous(config.readBoolEntry( "Continuous", true ));

-  m_targetapp = config.readEntry( "TargetApp", QString::null );

-  m_targetmsg = config.readEntry( "TargetMsg", QString::null );

-#ifdef _SCROLLPIPE

-  reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null );

-  reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true );

-#endif

-  m_twoTouch = config.readBoolEntry( "TwoTouch", false);

-  m_doAnnotation = config.readBoolEntry( "Annotation", false);

-  m_doDictionary = config.readBoolEntry( "Dictionary", false);

-  m_doClipboard = config.readBoolEntry( "Clipboard", false);

-  /*

-  m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);

-  m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone);

-  m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen);

-  m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut);

-  m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn);

-  m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp);

-  m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown);

-

-  m_leftScroll = config.readBoolEntry("LeftScroll", false);

-  m_rightScroll = config.readBoolEntry("RightScroll", false);

-  m_upScroll = config.readBoolEntry("UpScroll", true);

-  m_downScroll = config.readBoolEntry("DownScroll", true);

-  */

-  m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);

-  reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));

-  reader->setHyphenThreshold(config.readNumEntry( "HyphenThreshold", 50 ));

-  //  reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false ));

-#ifndef USEQPE

-	config.setGroup( "Geometry" );

-	setGeometry(0,0,

-	config.readNumEntry( "width", QApplication::desktop()->width()/2 ),

-	config.readNumEntry( "height", QApplication::desktop()->height()/2 ));

-	move(

-	config.readNumEntry( "x", 20 ),

-	config.readNumEntry( "y", 20 ));

-#else

-	m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", false);

-#endif

-

-

-

-  setTwoTouch(m_twoTouch);

-

-    connect( reader, SIGNAL( OnShowPicture(QImage&) ), this, SLOT( showgraphic(QImage&) ) );

-

-    connect( reader, SIGNAL( OnRedraw() ), this, SLOT( OnRedraw() ) );

-    connect( reader, SIGNAL( OnWordSelected(const QString&, size_t, size_t, const QString&) ), this, SLOT( OnWordSelected(const QString&, size_t, size_t, const QString&) ) );

-    connect( reader, SIGNAL( OnURLSelected(const QString&, const size_t) ), this, SLOT( OnURLSelected(const QString&, const size_t) ) );

-    connect( reader, SIGNAL( NewFileRequest(const QString&) ), this, SLOT( forceopen(const QString&) ) );

-    connect( reader, SIGNAL( HandleKeyRequest(QKeyEvent*) ), this, SLOT( handlekey(QKeyEvent*) ) );

-    connect( reader, SIGNAL( SetScrollState(bool) ), this, SLOT( setScrollState(bool) ) );

-    connect( reader, SIGNAL(RefreshBitmap()), this, SLOT(setBackgroundBitmap()));

-    editorStack->addWidget( reader, get_unique_id() );

-

-    m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL);

-    connect( m_preferences_action, SIGNAL( activated() ), this, SLOT( showprefs() ) );

-    m_preferences_action->addTo( settings );

-

-    m_saveconfig_action = new QAction( tr( "Save Config" ), QString::null, 0, this, NULL);

-    connect( m_saveconfig_action, SIGNAL( activated() ), this, SLOT( SaveConfig() ) );

-    m_saveconfig_action->addTo( settings );

-

-    m_loadconfig_action = new QAction( tr( "Load Config" ), QString::null, 0, this, NULL);

-    connect( m_loadconfig_action, SIGNAL( activated() ), this, SLOT( LoadConfig() ) );

-    m_loadconfig_action->addTo( settings );

-

-    m_tidyconfig_action = new QAction( tr( "Delete Config" ), QString::null, 0, this, NULL);

-    connect( m_tidyconfig_action, SIGNAL( activated() ), this, SLOT( TidyConfig() ) );

-    m_tidyconfig_action->addTo( settings );

-

-    settings->insertSeparator();

-    m_toolbarprefs_action = new QAction( tr( "Toolbars" ), QString::null, 0, this, NULL);

-    connect( m_toolbarprefs_action, SIGNAL( activated() ), this, SLOT( showtoolbarprefs() ) );

-    m_toolbarprefs_action->addTo( settings );

-

-    m_buttonprefs_action = new QAction( tr( "Buttons" ), QString::null, 0, this, NULL);

-    connect( m_buttonprefs_action, SIGNAL( activated() ), this, SLOT( showbuttonprefs() ) );

-    m_buttonprefs_action->addTo( settings );

-

-    m_loadtheme_action = new QAction( tr( "Load Theme" ), QString::null, 0, this, NULL);

-    connect( m_loadtheme_action, SIGNAL( activated() ), this, SLOT( LoadTheme() ) );

-    m_loadtheme_action->addTo( settings );

-

-    m_repara_action = new QAction( tr( "EOP Marker" ),  QString::null, 0, this, NULL);

-    connect( m_repara_action, SIGNAL( activated() ), this, SLOT( reparastring() ) );

-    m_repara_action->addTo(settings);

-

-#ifdef USEQPE

-    m_grab_action = new QAction( tr( "Grab Buttons" ), QString::null, 0, this, NULL, true );

-    connect( m_grab_action, SIGNAL( toggled(bool) ), this, SLOT( setgrab(bool) ) );

-    m_grab_action->setOn(m_grabkeyboard);

-    m_grab_action->addTo( settings );

-#endif

-

-    m_open_action = new QAction( tr( "Open" ), geticon( "fileopen" ), QString::null, 0, this, 0 );

-    connect( m_open_action, SIGNAL( activated() ), this, SLOT( fileOpen() ) );

-    m_open_action->addTo( file );

-

-    m_close_action = new QAction( tr( "Close" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( m_close_action, SIGNAL( activated() ), this, SLOT( fileClose() ) );

-    m_close_action->addTo( file );

-

-#ifdef _SCRIPT

-    a = new QAction( tr( "Run Script" ), QString::null, 0, this, NULL);

-    connect( a, SIGNAL( activated() ), this, SLOT( RunScript() ) );

-    a->addTo( file );

-#endif

-    /*

-    a = new QAction( tr( "Revert" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( fileRevert() ) );

-    a->addTo( file );

-

-    a = new QAction( tr( "Cut" ), geticon( "cut" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );

-    a->addTo( filebar() );

-    a->addTo( edit );

-    */

-

-    m_info_action = new QAction( tr( "Info" ), geticon( "UtilsIcon" ), QString::null, 0, this, NULL);

-    connect( m_info_action, SIGNAL( activated() ), this, SLOT( showinfo() ) );

-    m_info_action->addTo( file );

-

-    m_touch_action = new QAction( tr( "Two/One Touch" ), geticon( "1to1" ), QString::null, 0, this, NULL, true );

-    connect( m_touch_action, SIGNAL( toggled(bool) ), this, SLOT( setTwoTouch(bool) ) );

-    m_touch_action->setOn(m_twoTouch);

-    m_touch_action->addTo( file );

-

-    m_find_action = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, NULL);

-     connect( m_find_action, SIGNAL( activated() ), this, SLOT( editFind() ) );

-     file->insertSeparator();

-//     a->addTo( bar );

-     m_find_action->addTo( file );

-

-    m_exportlinks_action = new QAction( tr( "Export Links" ), QString::null, 0, this, NULL);

-    connect( m_exportlinks_action, SIGNAL( activated() ), this, SLOT( ExportLinks() ) );

-    m_exportlinks_action->addTo( file );

-

-    m_scrollButton = new QAction( tr( "Scroll" ), getmyicon( "panel-arrow-down" ), QString::null, 0, this, 0, true );

-    connect( m_scrollButton, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) );

-    m_scrollButton->addTo(navigation);

-    m_scrollButton->setOn(false);

-

-    m_start_action = new QAction( tr( "Goto Start" ), geticon( "start" ), QString::null, 0, this, NULL);

-    connect( m_start_action, SIGNAL( activated() ), this, SLOT( gotoStart() ) );

-    m_start_action->addTo(navigation);

-

-    m_end_action = new QAction( tr( "Goto End" ), geticon( "finish" ), QString::null, 0, this, NULL);

-    connect( m_end_action, SIGNAL( activated() ), this, SLOT( gotoEnd() ) );

-    m_end_action->addTo(navigation);

-

-    m_jump_action = new QAction( tr( "Jump" ), geticon( "rotate" ), QString::null, 0, this, NULL);

-    connect( m_jump_action, SIGNAL( activated() ), this, SLOT( jump() ) );

-    m_jump_action->addTo(navigation);

-

-    m_pageline_action = new QAction( tr( "Page/Line Scroll" ), geticon( "pass" ), QString::null, 0, this, NULL, true );

-    connect( m_pageline_action, SIGNAL( toggled(bool) ), this, SLOT( pagemode(bool) ) );

-    m_pageline_action->addTo(navigation);

-    m_pageline_action->setOn(reader->m_bpagemode);

-

-    m_pageup_action = new QAction( tr( "Up" ), geticon( "up" ), QString::null, 0, this, 0 );

-    connect( m_pageup_action, SIGNAL( activated() ), this, SLOT( pageup() ) );

-    m_pageup_action->addTo( navigation );

-    

-    m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 );

-    connect( m_pagedn_action, SIGNAL( activated() ), this, SLOT( pagedn() ) );

-    m_pagedn_action->addTo( navigation );

-

-    m_back_action = new QAction( tr( "Back" ), geticon( "back" ), QString::null, 0, this, 0 );

-    connect( m_back_action, SIGNAL( activated() ), reader, SLOT( goBack() ) );

-    m_back_action->addTo( navigation );

-

-    m_home_action = new QAction( tr( "Home" ), geticon( "home" ), QString::null, 0, this, 0 );

-    connect( m_home_action, SIGNAL( activated() ), reader, SLOT( goHome() ) );

-    m_home_action->addTo( navigation );

-

-    m_forward_action = new QAction( tr( "Forward" ), geticon( "forward" ), QString::null, 0, this, 0 );

-    connect( m_forward_action, SIGNAL( activated() ), reader, SLOT( goForward() ) );

-    m_forward_action->addTo( navigation );

-

-    /*

-    a = new QAction( tr( "Find" ), QString::null, 0, this, NULL, true );

-    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );

-    a->addTo( file );

-

-    a = new QAction( tr( "Find Again" ), QString::null, 0, this, NULL, true );

-    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );

-    a->addTo( file );

-    */

-

-//    file->insertSeparator();

-

-#ifdef _SCROLLPIPE

-

-    QActionGroup* ag = new QActionGroup(this);

-    ag->setExclusive(false);

-    spacemenu = new QPopupMenu(this);

-    file->insertItem( tr( "Scrolling" ), spacemenu );

-

-    a = new QAction( tr( "Set Target" ), QString::null, 0, ag, NULL);

-    connect( a, SIGNAL( activated() ), this, SLOT( setpipetarget() ) );

-

-    a = new QAction( tr( "Pause Paras" ), QString::null, 0, ag, NULL, true );

-    connect( a, SIGNAL( toggled(bool) ), this, SLOT( setpause(bool) ) );

-    a->setOn(reader->m_pauseAfterEachPara);

-

-    ag->addTo(spacemenu);

-//    file->insertSeparator();

-

-#endif

-

-/*

-    a = new QAction( tr( "Import" ), QString::null, 0, this, NULL );

-    connect( a, SIGNAL( activated() ), this, SLOT( importFiles() ) );

-    a->addTo( file );

-*/

-

-    /*

-    a = new QAction( tr( "Paste" ), geticon( "paste" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );

-    a->addTo( fileBar );

-    a->addTo( edit );

-    */

-

-//     a = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, 0 );

-

-     m_fullscreen = false;

-    m_actFullscreen = new QAction( tr( "Fullscreen" ), geticon( "fullscreen" ), QString::null, 0, this, NULL, true );

-    connect( m_actFullscreen, SIGNAL( toggled(bool) ), this, SLOT( setfullscreen(bool) ) );

-    m_actFullscreen->setOn(m_fullscreen);

-    m_actFullscreen->addTo( view );

-

-    m_rotate_action = new QAction( tr( "Rotate" ), geticon( "repeat" ), QString::null, 0, this, NULL, true );

-    connect( m_rotate_action, SIGNAL( toggled(bool) ), this, SLOT( setrotated(bool) ) );

-    m_rotate_action->setOn(reader->m_rotated);

-    m_rotate_action->addTo( view );

-

-    m_inverse_action = new QAction( tr( "Invert" ), getmyicon( "invert" ), QString::null, 0, this, NULL, true );

-    connect( m_inverse_action, SIGNAL( toggled(bool) ), this, SLOT( setinverted(bool) ) );

-    m_inverse_action->setOn(reader->bInverse);

-    m_inverse_action->addTo( view );

-

-    view->insertSeparator();

-

-    m_zoomin_action = new QAction( tr( "Zoom In" ), geticon( "zoom" ), QString::null, 0, this);

-    connect( m_zoomin_action, SIGNAL( activated() ), this, SLOT( zoomin() ) );

-    m_zoomin_action->addTo( view );

-

-    m_zoomout_action = new QAction( tr( "Zoom Out" ), geticon( "mag" ), QString::null, 0, this);

-    connect( m_zoomout_action, SIGNAL( activated() ), this, SLOT( zoomout() ) );

-    m_zoomout_action->addTo( view );

-

-    view->insertSeparator();

-    m_setfont_action = new QAction( tr( "Set Font" ), getmyicon( "font" ), QString::null, 0, this);

-    connect( m_setfont_action, SIGNAL( activated() ), this, SLOT( setfont() ) );

-    m_setfont_action->addTo( view );

-

-    view->insertSeparator();

-    m_setenc_action = new QAction( tr( "Set Encoding" ), getmyicon( "charset" ), QString::null, 0, this);

-    connect( m_setenc_action, SIGNAL( activated() ), this, SLOT( chooseencoding() ) );

-    m_setenc_action->addTo( view );

-

-    m_setmono_action = new QAction( tr( "Ideogram" ), getmyicon( "ideogram" ), QString::null, 0, this, NULL, true);

-    connect( m_setmono_action, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );

-    m_setmono_action->addTo( view );

-    m_setmono_action->setOn(reader->m_bMonoSpaced);

-

-

-    //    a = new QAction( tr( "Zoom" ), QString::null, 0, this, NULL, true );

-    //    a = new QAction( tr( "Zoom" ), geticon( "mag" ), QString::null, 0, this, 0 );

-

-

-

-    //    a->addTo( filebar() );

-//     view->insertSeparator();

-

-/*

-    a = new QAction( tr( "Ideogram/Word" ), QString::null, 0, this, NULL, true );

-    connect( a, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );

-    a->setOn(reader->m_bMonoSpaced);

-    a->addTo( view );

-*/

-/*

-    a = new QAction( tr( "Set Width" ), QString::null, 0, this, NULL);

-    connect( a, SIGNAL( activated() ), this, SLOT( setspacing() ) );

-    a->addTo( view );

-*/

-

-    m_mark_action = new QAction( tr( "Bookmark" ), getmyicon( "bookmark" ), QString::null, 0, this, NULL);

-    connect( m_mark_action, SIGNAL( activated() ), this, SLOT( addbkmk() ) );

-    m_mark_action->addTo( marks );

-

-    m_annotate_action = new QAction( tr( "Annotate" ), getmyicon( "annotate" ), QString::null, 0, this, NULL);

-    connect( m_annotate_action, SIGNAL( activated() ), this, SLOT( addanno() ) );

-    m_annotate_action->addTo( marks );

-

-    m_goto_action = new QAction( tr( "Goto" ), getmyicon( "bookmark_goto" ), QString::null, 0, this, NULL, false );

-    connect( m_goto_action, SIGNAL( activated() ), this, SLOT( do_gotomark() ) );

-    m_goto_action->addTo( marks );

-

-    m_delete_action = new QAction( tr( "Delete" ), getmyicon( "bookmark_delete" ), QString::null, 0, this, NULL);

-    connect( m_delete_action, SIGNAL( activated() ), this, SLOT( do_delmark() ) );

-    m_delete_action->addTo( marks );

-

-    m_autogen_action = new QAction( tr( "Autogen" ), geticon( "exec" ), QString::null, 0, this, NULL, false );

-    connect( m_autogen_action, SIGNAL( activated() ), this, SLOT( do_autogen() ) );

-     marks->insertSeparator();

-    m_autogen_action->addTo( marks );

-

-    m_clear_action = new QAction( tr( "Clear" ), getmyicon( "bookmark_clear" ), QString::null, 0, this, NULL);

-    connect( m_clear_action, SIGNAL( activated() ), this, SLOT( clearBkmkList() ) );

-    m_clear_action->addTo( marks );

-

-    m_save_action = new QAction( tr( "Save" ), getmyicon( "bookmark_save" ), QString::null, 0, this, NULL );

-    connect( m_save_action, SIGNAL( activated() ), this, SLOT( savebkmks() ) );

-    m_save_action->addTo( marks );

-

-    m_tidy_action = new QAction( tr( "Tidy" ), getmyicon( "bookmark_tidy" ), QString::null, 0, this, NULL);

-    connect( m_tidy_action, SIGNAL( activated() ), this, SLOT( listBkmkFiles() ) );

-     marks->insertSeparator();

-    m_tidy_action->addTo( marks );

-

-    m_startBlock_action = new QAction( tr( "Start Block" ), geticon( "new" ), QString::null, 0, this, NULL);

-    connect( m_startBlock_action, SIGNAL( activated() ), this, SLOT( editMark() ) );

-    marks->insertSeparator();

-    m_startBlock_action->addTo( marks );

-

-    m_endBlock_action = new QAction( tr( "Copy Block" ), geticon( "copy" ), QString::null, 0, this, NULL);

-    connect( m_endBlock_action, SIGNAL( activated() ), this, SLOT( editCopy() ) );

-    m_endBlock_action->addTo( marks );

-

-    m_bkmkAvail = NULL;

-

-

-    setToolBarsMovable(m_tbmove);

-    addtoolbars(&config);

-

-    pbar = new QProgressBar(this);

-    pbar->hide();

-

-    searchBar = new QFloatBar( "Search", this, QMainWindow::Top, TRUE );

-

-    searchBar->setHorizontalStretchable( TRUE );

-

-    connect(searchBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));

-

-    searchEdit = new QLineEdit( searchBar, "searchEdit" );

-//      QFont f("unifont", 16 /*, QFont::Bold*/);

-//      searchEdit->setFont( f );

-    searchBar->setStretchableWidget( searchEdit );

-

-

-#ifdef __ISEARCH

-    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),

-	     this, SLOT( search( const QString& ) ) );

-#else

-    connect( searchEdit, SIGNAL( returnPressed( ) ),

-	     this, SLOT( search( ) ) );

-#endif

-     QAction*a = new QAction( tr( "Find Next" ), geticon( "next" ), QString::null, 0, this, 0 );

-     connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );

-     a->addTo( searchBar );

-

-    a = new QAction( tr( "Close Find" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );

-    a->addTo( searchBar );

-

-    searchBar->hide();

-

-    regBar = new QFloatBar( "Autogen", this, QMainWindow::Top, TRUE );

-    connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));

-

-    regBar->setHorizontalStretchable( TRUE );

-

-    regEdit = new QLineEdit( regBar, "regEdit" );

-//    regEdit->setFont( f );

-

-    regBar->setStretchableWidget( regEdit );

-

-    connect( regEdit, SIGNAL( returnPressed( ) ),

-	     this, SLOT( do_regaction() ) );

-

-    a = new QAction( tr( "Do Reg" ), geticon( "enter" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );

-    a->addTo( regBar );

-

-    a = new QAction( tr( "Close Edit" ), geticon( "close" ), QString::null, 0, this, 0 );

-    connect( a, SIGNAL( activated() ), this, SLOT( regClose() ) );

-    a->addTo( regBar );

-

-    regBar->hide();

-

-    m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );

-

-    m_fontBar->setHorizontalStretchable( TRUE );

-

-//    qDebug("Font selector");

-    m_fontSelector = new QComboBox(false, m_fontBar);

-    m_fontBar->setStretchableWidget( m_fontSelector );

-    {

-	QFontDatabase f;

-	QStringList flist = f.families();

-	bool realfont = false;

-	for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++)

-	{

-	    if (reader->m_fontname == *nm)

-	    {

-		realfont = true;

-	    }

-	    if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm);

-	}

-	if (!realfont) reader->m_fontname = flist[0];

-    } // delete the FontDatabase!!!

-    connect( m_fontSelector, SIGNAL( activated(const QString& ) ),

-	     this, SLOT( do_setfont(const QString&) ) );

-    connect( m_fontSelector, SIGNAL( activated(int ) ),

-	     this, SLOT( do_setencoding(int) ) );

-

-    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");

-

-    m_layout->addWidget(editorStack);

-    if (m_qtscroll != 0)

-      {

-	/*

-	m_scrollbar = new QToolBar( "Autogen", this, (m_localscrollbar) ? QMainWindow::Left : QMainWindow::Right, TRUE );

-

-	m_scrollbar->setVerticalStretchable( TRUE );

-	*/

-	scrollbar = m_scrollbar = new QScrollBar(QScrollBar::Vertical, widge);

-	m_layout->addWidget(scrollbar);

-	scrollbar->setTracking(false);

-	//	connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );

-	//	m_scrollbar->setStretchableWidget( scrollbar );

-	if (m_scrollishidden)

-	  {

-	    m_scrollbar->hide();

-	  }

-	else

-	  {

-	    m_scrollbar->show();

-	  }

-

-	setrotated(reader->m_rotated);

-      }

-    else

-      {

-	m_scrollbar = NULL;

-      }

-    setBackgroundBitmap();

-    m_inverse_action->setOn(reader->bInverse);

-    reader->init();

-

-//    qDebug("Inited");

-//    m_buttonAction[m_spaceTarget]->setOn(true);

-//    qDebug("fonting");

-    do_setfont(reader->m_fontname);

-    //    qDebug("fonted");

-    QFont progfont(reader->m_fontname, reader->m_fontControl.getsize(0));

-    m_prog->setFont( progfont );

-    if (m_statusishidden) m_prog->hide();

-    if (!reader->m_lastfile.isEmpty())

-    {

-//	qDebug("doclnk");

-//	doc = new DocLnk(reader->m_lastfile);

-//	qDebug("doclnk done");

-	if (pOpenlist != NULL)

-	{

-

-/*

-	    int ind = 0;

-	    Bkmk* p = (*pOpenlist)[ind];

-	    while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)

-	    {

-		p = (*pOpenlist)[++ind];

-	    }

-*/

-	    Bkmk* p = NULL;

-	    for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)

-	    {

-		p = iter.pContent();

-		if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)

-		{

-		    break;

-		}

-//		qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));

-		p = NULL;

-	    }

-	    if (p != NULL)

-	    {

-		if (!openfrombkmk(p))

-		  {

-		    showEditTools();

-		  }

-	    }

-	    else

-	    {

-		openFile( reader->m_lastfile );

-	    }

-	}

-	else

-	{

-	    if (!reader->m_lastfile.isEmpty())

-	      {

-		openFile( reader->m_lastfile );

-	      }

-	}

-    }

-    else

-    {

-      showEditTools();

-    }

-//    qApp->processEvents();

-    if (m_scrollbar == NULL || m_scrollbar->isHidden())

-      {

-	reader->m_scrollpos = m_localscroll;

-      }

-    else

-      {

-	reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;

-      }

-    reader->bDoUpdates = true;

-    reader->update();

-    config.setGroup("Version");

-    int major = config.readNumEntry("Major", 0);

-    int bkmktype = config.readNumEntry("BkmkType", 0);

-    char minor = config.readNumEntry("Minor", 0);

-    if (CheckVersion(major, bkmktype, minor))

-    {

-	config.writeEntry("Major", major);

-	config.writeEntry("BkmkType", bkmktype);

-	config.writeEntry("Minor", (int)minor);

-    }

-//    qDebug("finished update");

-    if (kmap.isEmpty())

-      {

-	QMessageBox::warning(this, PROGNAME, "You haven't mapped any keys yet!\n\nYou will be taken to the key\nmapping dialog.\nA few defaults are provided\nbut you can change then to\nsuit yourself.\n\nYou can change the key\nmapping at any time by\nselecting the Settings/Button\noption on the menu.");

-

-	m_buttonprefs->mapkey(Qt::NoButton, Key_Up, cesPageUp);

-	m_buttonprefs->mapkey(Qt::NoButton, Key_Down, cesPageDown);

-

-	m_buttonprefs->mapkey(Qt::NoButton, Key_Right, cesZoomIn);

-	m_buttonprefs->mapkey(Qt::NoButton, Key_Left, cesZoomOut);

-

-	showbuttonprefs();

-      }

-}

-

-void QTReaderApp::addtoolbars(Config* config)

-{

-    config->setGroup("Toolbar");

-

-    if (fileBar != NULL)

-    {

-#ifdef USEQPE

-	if (fileBar != menubar)

-	{

-	    fileBar->clear();

-	}

-	else

-	{

-	    m_preferences_action->removeFrom( filebar() );

-	    m_open_action->removeFrom( filebar() );

-	    m_close_action->removeFrom( filebar() );

-	    m_info_action->removeFrom( filebar() );

-	    m_touch_action->removeFrom( filebar() );

-	    m_find_action->removeFrom( filebar() );

-	}

-#else

-	fileBar->clear();

-#endif

-    }

-

-    m_preferences_action->addTo( filebar() );

-    addfilebar(config, "Open", m_open_action);

-    addfilebar(config, "Close", m_close_action);

-    addfilebar(config, "Info", m_info_action);

-    addfilebar(config, "Two/One Touch", m_touch_action);

-    addfilebar(config, "Find", m_find_action);

-

-    if (navBar != NULL)

-    {

-#ifdef USEQPE

-	if ((navBar == fileBar) && (fileBar == menubar))

-#else

-	if (navBar == fileBar)

-#endif

-	{

-	    m_scrollButton->removeFrom( navbar() );

-	    m_start_action->removeFrom( navbar() );

-	    m_end_action->removeFrom( navbar() );

-	    m_jump_action->removeFrom( navbar() );

-	    m_pageline_action->removeFrom( navbar() );

-	    m_pageup_action->removeFrom( navbar() );

-	    m_pagedn_action->removeFrom( navbar() );

-	    m_back_action->removeFrom( navbar() );

-	    m_home_action->removeFrom( navbar() );

-	    m_forward_action->removeFrom( navbar() );

-	}

-	else if (navBar != fileBar)

-	{

-	    navBar->clear();

-	}

-    }

-

-    addnavbar(config, "Scroll", m_scrollButton);

-    addnavbar(config, "Goto Start", m_start_action);

-    addnavbar(config, "Goto End", m_end_action);

-

-    addnavbar(config, "Jump", m_jump_action);

-    addnavbar(config, "Page/Line Scroll", m_pageline_action);

-

-    addnavbar(config, "Page Up", m_pageup_action);

-    addnavbar(config, "Page Down", m_pagedn_action);

-

-    addnavbar(config, "Back", m_back_action);

-    addnavbar(config, "Home", m_home_action);

-    addnavbar(config, "Forward", m_forward_action);

-

-    if (viewBar != NULL)

-    {

-#ifdef USEQPE

-	if ((viewBar == fileBar) && (fileBar == menubar))

-#else

-	if (viewBar == fileBar)

-#endif

-	{

-	    m_actFullscreen->removeFrom( filebar() );

-	    m_rotate_action->removeFrom( viewbar() );

-	    m_inverse_action->removeFrom( viewbar() );

-	    m_zoomin_action->removeFrom( viewbar() );

-	    m_zoomout_action->removeFrom( viewbar() );

-	    m_setfont_action->removeFrom( viewbar() );

-	    m_setenc_action->removeFrom( viewbar() );

-	    m_setmono_action->removeFrom( viewbar() );

-	}

-	else if (viewBar != fileBar)

-	{

-	    viewBar->clear();

-	}

-    }

-

-    addviewbar(config, "Fullscreen", m_actFullscreen);

-    addviewbar(config, "Rotate", m_rotate_action);

-    addviewbar(config, "Invert Action", m_inverse_action);

-    addviewbar(config, "Zoom In", m_zoomin_action);

-    addviewbar(config, "Zoom Out", m_zoomout_action);

-    addviewbar(config, "Set Font", m_setfont_action);

-    addviewbar(config, "Encoding Select", m_setenc_action);

-    addviewbar(config, "Ideogram Mode", m_setmono_action);

-

-    if (markBar != NULL)

-    {

-#ifdef USEQPE

-	if ((markBar == fileBar) && (fileBar == menubar))

-#else

-	if (markBar == fileBar)

-#endif

-	{

-	    m_mark_action->removeFrom( markbar() );

-	    m_annotate_action->removeFrom( markbar());

-	    m_goto_action->removeFrom( markbar() );

-	    m_delete_action->removeFrom( markbar() );

-	    m_autogen_action->removeFrom( markbar() );

-	    m_clear_action->removeFrom( markbar() );

-	    m_save_action->removeFrom( markbar() );

-	    m_tidy_action->removeFrom( markbar() );

-	    m_startBlock_action->removeFrom( markbar() );

-	    m_endBlock_action->removeFrom( markbar() );

-	}

-	else if (markBar != fileBar)

-	{

-	    markBar->clear();

-	}

-    }

-    addmarkbar(config, "Mark", m_mark_action);

-    addmarkbar(config, "Annotate", m_annotate_action);

-    addmarkbar(config, "Goto", m_goto_action);

-    addmarkbar(config, "Delete", m_delete_action);

-    addmarkbar(config, "Autogen", m_autogen_action);

-    addmarkbar(config, "Clear", m_clear_action);

-    addmarkbar(config, "Save", m_save_action);

-    addmarkbar(config, "Tidy", m_tidy_action);

-    addmarkbar(config, "Start Block", m_startBlock_action);

-    addmarkbar(config, "Copy Block", m_endBlock_action);

-    if (checkbar(config, "Annotation indicator"))

-    {

-	if (m_bkmkAvail == NULL)

-	{

-	    m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 );

-	    connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) );

-	

-	    m_bkmkAvail->setEnabled(false);

-	}

-	QLabel *spacer = new QLabel(markBar, "");

-	markbar()->setStretchableWidget(spacer);

-	m_bkmkAvail->removeFrom( markbar() );

-	m_bkmkAvail->addTo( markbar() );

-    }

-    else

-    {

-	if (m_bkmkAvail != NULL)

-	{

-	    m_bkmkAvail->removeFrom( markbar() );

-	    delete m_bkmkAvail;

-	    m_bkmkAvail = NULL;

-	}

-    }

-}

-

-bool QTReaderApp::checkbar(Config* _config, const QString& key)

-{

-    return _config->readBoolEntry(key, false);

-}

-

-

-QToolBar* QTReaderApp::filebar()

-{

-    if (fileBar == NULL)

-    {

-	switch (m_tbpol)

-	{

-#ifdef USEQPE

-	    case cesSingle:

-//		qDebug("Setting filebar to menubar");

-		fileBar = menubar;

-		break;

-#endif

-	    default:

-		qDebug("Incorrect toolbar policy set");

-	    case cesMenuTool:

-	    case cesMultiple:

-//		qDebug("Creating new file bar");

-		fileBar = new QToolBar("File", this, m_tbposition);

-		break;

-	}

-//	fileBar->setHorizontalStretchable( true );

-    }

-    return fileBar;

-}

-QToolBar* QTReaderApp::viewbar()

-{

-    if (viewBar == NULL)

-    {

-	switch (m_tbpol)

-	{

-	    case cesMultiple:

-		viewBar = new QToolBar("View", this, m_tbposition);

-		break;

-	    default:

-		qDebug("Incorrect toolbar policy set");

-#ifdef USEQPE

-	    case cesSingle:

-#endif

-	    case cesMenuTool:

-		viewBar = fileBar;

-		break;

-	}

-    }

-    return viewBar;

-}

-QToolBar* QTReaderApp::navbar()

-{

-    if (navBar == NULL)

-    {

-	switch (m_tbpol)

-	{

-	    case cesMultiple:

-//		qDebug("Creating new nav bar");

-		navBar = new QToolBar("Navigation", this, m_tbposition);

-		break;

-	    default:

-		qDebug("Incorrect toolbar policy set");

-#ifdef USEQPE

-	    case cesSingle:

-#endif

-	    case cesMenuTool:

-		navBar = fileBar;

-//		qDebug("Setting navbar to filebar");

-		break;

-	}

-    }

-    return navBar;

-}

-QToolBar* QTReaderApp::markbar()

-{

-    if (markBar == NULL)

-    {

-	switch (m_tbpol)

-	{

-	    case cesMultiple:

-		markBar = new QToolBar("Marks", this, m_tbposition);

-		break;

-	    default:

-		qDebug("Incorrect toolbar policy set");

-#ifdef USEQPE

-	    case cesSingle:

-#endif

-	    case cesMenuTool:

-		markBar = fileBar;

-		break;

-	}

-    }

-    return markBar;

-}

-

-void QTReaderApp::addfilebar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( filebar() );

-}

-void QTReaderApp::addnavbar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( navbar() );

-}

-void QTReaderApp::addmarkbar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( markbar() );

-}

-void QTReaderApp::addviewbar(Config* _config, const QString& key, QAction* a)

-{

-    if (_config->readBoolEntry(key, false)) a->addTo( viewbar() );

-}

-

-void QTReaderApp::suspend() { reader->suspend(); }

-

-void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)

-{

-#ifndef USEMSGS

-  return;

-#else

-    QString msg = QString::fromUtf8(_msg);

-

-    qDebug("Received:%s", (const char*)msg);

-    QDataStream stream( _data, IO_ReadOnly );

-    if ( msg == "suspend()" )

-    {

-      qDebug("Suspending");

-      suspend();

-      qDebug("Suspendedb");

-    }

-    return;

-    /*

-    QDataStream stream( _data, IO_ReadOnly );

-    if ( msg == "info(QString)" )

-    {

-	QString info;

-	stream >> info;

-	QMessageBox::information(this, PROGNAME, info);

-    }

-    else if ( msg == "Update(int)" )

-    {

-	int info;

-	stream >> info;

-	if (info)

-	{

-	    reader->bDoUpdates = true;

-	    reader->refresh();

-	}

-	else

-	{

-	    reader->bDoUpdates = false;

-	}

-    }

-    else if ( msg == "warn(QString)" )

-    {

-	QString info;

-	stream >> info;

-	QMessageBox::warning(this, PROGNAME, info);

-    }

-    else if ( msg == "exit()" )

-    {

-	m_dontSave = true;

-	close();

-    }

-    else if ( msg == "pageDown()" )

-    {

-	reader->dopagedn();

-    }

-    else if ( msg == "pageUp()" )

-    {

-	reader->dopageup();

-    }

-    else if ( msg == "lineDown()" )

-    {

-	reader->lineDown();

-    }

-    else if ( msg == "lineUp()" )

-    {

-	reader->lineUp();

-    }

-    else if ( msg == "showText()" )

-    {

-	showEditTools();

-    }

-    else if ( msg == "home()" )

-    {

-	reader->goHome();

-    }

-    else if ( msg == "back()" )

-    {

-	reader->goBack();

-    }

-    else if ( msg == "forward()" )

-    {

-	reader->goForward();

-    }

-    else if ( msg == "File/Open(QString)" )

-    {

-	QString info;

-	stream >> info;

-	openFile( info );

-    }

-    else if ( msg == "File/Info()" )

-    {

-	showinfo();

-    }

-    else if ( msg == "File/Action(QString)" )

-    {

-	QString info;

-	stream >> info;

-	m_spaceTarget = ActNameToInt(info);

-    }

-    else if ( msg == "Navigation/Scroll(int)" )

-    {

-	int info;

-	stream >> info;

-	autoScroll(info);

-    }

-

-    else if ( msg == "Navigation/GotoStart()" )

-    {

-	gotoStart();

-    }

-    else if ( msg == "Navigation/GotoEnd()" )

-    {

-	gotoEnd();

-    }

-    else if ( msg == "Navigation/Jump(int)" )

-    {

-	int info;

-	stream >> info;

-	reader->locate(info);

-    }

-    else if ( msg == "Navigation/Page/LineScroll(int)" )

-    {

-	int info;

-	stream >> info;

-	pagemode(info);

-    }

-    else if ( msg == "Navigation/SetOverlap(int)" )

-    {

-	int info;

-	stream >> info;

-	reader->m_overlap = info;

-    }

-    else if ( msg == "Navigation/SetMargin(int)" )

-    {

-	int info;

-	stream >> info;

-	do_margin(info);

-    }

-    else if ( msg == "File/SetDictionary(QString)" )

-    {

-	QString info;

-	stream >> info;

-	do_settarget(info);

-    }

-#ifdef _SCROLLPIPE

-    else if ( msg == "File/SetScrollTarget(QString)" )

-    {

-	QString info;

-	stream >> info;

-	reader->m_pipetarget = info;

-    }

-#endif

-    else if ( msg == "File/Two/OneTouch(int)" )

-    {

-	int info;

-	stream >> info;

-	setTwoTouch(info);

-    }

-    else if ( msg == "Target/Annotation(int)" )

-    {

-	int info;

-	stream >> info;

-	OnAnnotation(info);

-    }

-    else if ( msg == "Target/Dictionary(int)" )

-    {

-	int info;

-	stream >> info;

-	OnDictionary(info);

-    }

-    else if ( msg == "Target/Clipboard(int)" )

-    {

-	int info;

-	stream >> info;

-	OnClipboard(info);

-    }

-    else if ( msg == "File/Find(QString)" )

-    {

-	QString info;

-	stream >> info;

-	QRegExp arg(info);

-	size_t pos = reader->pagelocate();

-	size_t start = pos;

-	CDrawBuffer test(&(reader->m_fontControl));

-	reader->getline(&test);

-	while (arg.match(toQString(test.data())) == -1)

-	{

-	    pos = reader->locate();

-	    if (!reader->getline(&test))

-	    {

-		QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info);

-		pos = start;

-		break;

-	    }

-	}

-	reader->locate(pos);

-    }

-    else if ( msg == "File/Fullscreen(int)" )

-    {

-	int info;

-	stream >> info;

-	setfullscreen(info);

-    }

-    else if ( msg == "File/Continuous(int)" )

-    {

-	int info;

-	stream >> info;

-	setcontinuous(info);

-    }

-    else if ( msg == "Markup(QString)" )

-    {

-	QString info;

-	stream >> info;

-	if (info == "Auto")

-	{

-	    autofmt(true);

-	}

-	if (info == "None")

-	{

-	    autofmt(false);

-	    textfmt(false);

-	    striphtml(false);

-	    peanut(false);

-	}

-	if (info == "Text")

-	{

-	    textfmt(true);

-	}

-	if (info == "HTML")

-	{

-	    striphtml(true);

-	}

-	if (info == "Peanut/PML")

-	{

-	    peanut(true);

-	}

-    }

-    else if ( msg == "Layout/StripCR(int)" )

-    {

-	int info;

-	stream >> info;

-	stripcr(info);

-    }

-    else if ( msg == "Layout/Dehyphen(int)" )

-    {

-	int info;

-	stream >> info;

-	dehyphen(info);

-    }

-    else if ( msg == "Layout/Depluck(int)" )

-    {

-	int info;

-	stream >> info;

-	depluck(info);

-    }

-    else if ( msg == "Layout/Dejpluck(int)" )

-    {

-	int info;

-	stream >> info;

-	dejpluck(info);

-    }

-    else if ( msg == "Layout/SingleSpace(int)" )

-    {

-	int info;

-	stream >> info;

-	onespace(info);

-    }

-    else if ( msg == "Layout/Repalm(int)" )

-    {

-	int info;

-	stream >> info;

-	repalm(info);

-    }

-    else if ( msg == "Layout/Unindent(int)" )

-    {

-	int info;

-	stream >> info;

-	unindent(info);

-    }

-    else if ( msg == "Layout/Re-paragraph(int)" )

-    {

-	int info;

-	stream >> info;

-	repara(info);

-    }

-    else if ( msg == "Layout/DoubleSpace(int)" )

-    {

-	int info;

-	stream >> info;

-	dblspce(info);

-    }

-    else if ( msg == "Layout/Indent(int)" )

-    {

-	int info;

-	stream >> info;

-	reader->bindenter = info;

-	reader->setfilter(reader->getfilter());

-    }

-    else if ( msg == "Layout/Remap(int)" )

-    {

-	int info;

-	stream >> info;

-	remap(info);

-    }

-    else if ( msg == "Layout/Embolden(int)" )

-    {

-	int info;

-	stream >> info;

-	embolden(info);

-    }

-    else if ( msg == "Format/Ideogram/Word(int)" )

-    {

-	int info;

-	stream >> info;

-	monospace(info);

-    }

-    else if ( msg == "Format/SetWidth(int)" )

-    {

-	int info;

-	stream >> info;

-	reader->m_charpc = info;

-	reader->setfont();

-	reader->refresh();

-    }

-    else if ( msg == "Format/SetFont(QString,int)" )

-    {

-	QString fontname;

-	int size;

-	stream >> fontname;

-	stream >> size;

-	setfontHelper(fontname, size);

-    }

-    else if ( msg == "Marks/Autogen(QString)" )

-    {

-	QString info;

-	stream >> info;

-	do_autogen(info);

-    }

-    else if ( msg == "File/StartBlock()" )

-    {

-	editMark();

-    }

-    else if ( msg == "File/CopyBlock()" )

-    {

-	editCopy();

-    }

-    */

-#endif

-}

-

-ActionTypes QTReaderApp::ActNameToInt(const QString& _enc)

-{

-    for (int i = 0; i < MAX_ACTIONS; i++)

-    {

-	if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i;

-    }

-    return cesAutoScroll;

-}

-

-void QTReaderApp::setinverted(bool sfs)

-{

-  reader->setInverse(sfs);

-  reader->setfilter(reader->getfilter());

-  reader->refresh();

-}

-

-void QTReaderApp::setrotated(bool sfs)

-{

-    reader->setrotated(sfs);

-    if (sfs)

-      {

-        m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::BottomToTop : QBoxLayout::TopToBottom );

-	if (m_scrollbar != NULL)

-	  {

-	    scrollbar->disconnect();

-	    m_scrollbar->setOrientation(Qt::Horizontal);

-	    connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineUp()) );

-	    connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineDown()) );

-	    connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopageup()) );

-	    connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopagedn()) );

-	    connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );

-	  }

-	//	reader->repaint(0, reader->m_left_border, reader->width(), reader->height()-2*reader->m_border);

-	reader->repaint();

-      }

-    else

-      {

-        m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::RightToLeft : QBoxLayout::LeftToRight );

-	if (m_scrollbar != NULL)

-	  {

-	    scrollbar->disconnect();

-	    m_scrollbar->setOrientation(Qt::Vertical);

-	    connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineDown()) );

-	    connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineUp()) );

-	    connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopagedn()) );

-	    connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopageup()) );

-	    connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );

-	  }

-	//	reader->repaint(reader->m_border, 0, reader->width()-2*reader->m_border, reader->height());

-	reader->repaint();

-      }

-    //    reader->update();

-}

-

-void QTReaderApp::setgrab(bool sfs)

-{

-#ifdef USEQPE

-  m_grabkeyboard = sfs;

-  if (m_grabkeyboard)

-    {

-      ((QPEApplication*)qApp)->grabKeyboard();

-    }

-  else

-    {

-      ((QPEApplication*)qApp)->ungrabKeyboard();

-    }

-#endif

-}

-

-void QTReaderApp::setfullscreen(bool sfs)

-{

-    reader->bDoUpdates = false;

-    m_fullscreen = sfs;

-    showEditTools();

-//    qApp->processEvents();

-    reader->bDoUpdates = true;

-    reader->update();

-}

-/*

-void QTReaderApp::buttonActionSelected(QAction* _a)

-{

-////    qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));

-    m_spaceTarget = ActNameToInt(_a->text());

-}

-*/

-QTReaderApp::~QTReaderApp()

-{

-}

-

-void QTReaderApp::autoScroll(bool _b)

-{

-    reader->setautoscroll(_b);

-    setScrollState(reader->m_autoScroll);

-}

-

-void QTReaderApp::zoomin()

-{

-    reader->zoomin();

-    QFont f(reader->m_fontname, reader->m_fontControl.getsize(0));

-    m_prog->setFont( f );

-}

-

-void QTReaderApp::zoomout()

-{

-    reader->zoomout();

-    QFont f(reader->m_fontname, reader->m_fontControl.getsize(0));

-    m_prog->setFont( f );

-}

-

-void QTReaderApp::clearBkmkList()

-{

-	delete pBkmklist;

-	reader->pBkmklist = pBkmklist = NULL;

-	m_fBkmksChanged = false;

-    reader->refresh(true);

-}

-

-void QTReaderApp::fileClose()

-{

-    CCloseDialog* cd = new CCloseDialog(reader->m_string, false, this);

-    if (cd->exec())

-    {

-	if (pOpenlist != NULL)

-	{

-	    int ind = 0;

-	    Bkmk* p = (*pOpenlist)[ind];

-	    while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)

-	    {

-		p = (*pOpenlist)[++ind];

-	    }

-	    if (p != NULL) pOpenlist->erase(ind);

-	    if (cd->delFile())

-	    {

-		unlink((const char*)reader->m_lastfile);

-	    }

-	    if (cd->delMarks())

-	    {

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR);

-		d.remove(reader->m_string);

-#else /* USEQPE */

-		unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));

-#endif /* USEQPE */

-	    }

-	    if (cd->delConfig())

-	    {

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR "/configs");

-		d.remove(reader->m_string);

-#else /* USEQPE */

-		unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string));

-#endif /* USEQPE */

-	    }

-	}

-    

-	fileOpen2();

-    }

-    delete cd;

-}

-

-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);

-    bool notadded = true;

-    if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;

-    else

-    {

-	for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)

-	{

-	    if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0)

-	    {

-		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);

-//		getstate(data, dlen);

-		iter->setAnno(data, dlen);

-		notadded = false;

-		delete [] data;

-		break;

-	    }

-	}

-    }

-//    qDebug("Added?:%x", notadded);

-    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);

-	delete [] data;

-    }

-    delete [] nm;

-    delete [] fl;

-}

-

-void QTReaderApp::fileOpen()

-{

-/*

-    menu->hide();

-    fileBar->hide();

-    if (regVisible) regBar->hide();

-    if (searchVisible) searchBar->hide();

-*/

-//    qDebug("fileOpen");

-//    if (!reader->m_lastfile.isEmpty())

-    updatefileinfo();

-    fileOpen2();

-}

-

-void QTReaderApp::fileOpen2()

-{

-    if (pBkmklist != NULL)

-    {

-	if (m_fBkmksChanged)

-	{

-	    if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)

- 		savebkmks();

-	}     

-	delete pBkmklist;

-	reader->pBkmklist = pBkmklist = NULL;

-	m_fBkmksChanged = false;

-    }

-    reader->disableAutoscroll();

-/*

-    editorStack->raiseWidget( fileSelector );

-    fileSelector->reread();

-*/

-    bool usebrowser = true;

-    if (pOpenlist != NULL)

-    {

-	m_nBkmkAction = cOpenFile;

-	if (listbkmk(pOpenlist, "Browse")) usebrowser = false;

-    }

-    if (usebrowser)

-    {

-	QString fn = usefilebrowser();

-//	qApp->processEvents();

-	if (!fn.isEmpty() && QFileInfo(fn).isFile())

-	{

-	    openFile(fn);

-	}

-	reader->setFocus();

-    }

-//    reader->refresh();

-//    qDebug("HEIGHT:%d", reader->m_lastheight);

-}

-

-QString QTReaderApp::usefilebrowser()

-{

-#ifndef USEQPE

-    QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) );

-    return s;

-#else

-    QString fn;

-#ifdef OPIE

-    QMap<QString, QStringList> mimeTypes;

-    QStringList etypes;

-    etypes << "etext/*";

-    mimeTypes.insert( tr("eText"), etypes );

-    QStringList types;

-    types << "text/*";

-    mimeTypes.insert( tr("Text"), types );

-    mimeTypes.insert( tr("All"), "*/*" );

-    fn = OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL, QFileInfo(reader->m_lastfile).dirPath(true), QString::null, mimeTypes, 0, "OpieReader");

-#else

-    fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog,

-				      0,

-//				      WStyle_Customize | WStyle_NoBorderEx,

-				      "*", QFileInfo(reader->m_lastfile).dirPath(true));

-

-

-    if (fb->exec())

-    {

-	fn = fb->getCurrentFile();

-    }

-//    qDebug("Selected %s", (const char*)fn);

-    delete fb;

-#endif

-    showEditTools();

-    return fn;

-#endif

-}

-

-void QTReaderApp::showgraphic(QImage& pm)

-{

-    m_graphicwin->setImage(pm);

-    editorStack->raiseWidget( m_graphicwin );

-    hidetoolbars();

-    m_graphicwin->setFocus();

-}

-

-void QTReaderApp::showbuttonprefs()

-{

-    editorStack->raiseWidget( m_buttonprefs );

-    hidetoolbars();

-    m_buttonprefs->setFocus();

-    m_kmapchanged = true;

-}

-

-void QTReaderApp::showprefs()

-{

-    CPrefs* prefwin = new CPrefs(reader->width(), !m_bFloatingDialog, this);

-

-    //    prefwin->Debounce(m_debounce);

-    prefwin->bgtype(m_bgtype);

-    prefwin->repalm(reader->brepalm);

-    prefwin->kern(reader->bkern);

-    prefwin->hyphenate(reader->hyphenate);

-    //    prefwin->customhyphen(reader->buffdoc.getCustomHyphen());

-    prefwin->scrolltype(reader->m_scrolltype);

-    prefwin->scrollstep(reader->m_scrollstep);

-    prefwin->scrollcolor(m_scrollcolor);

-    prefwin->minibarcol(m_scrollbarcolor);

-    prefwin->foreground(m_foreground);

-    prefwin->background(m_background);

-    prefwin->twotouch(m_twoTouch); 

-    prefwin->propfontchange(m_propogatefontchange);

-    prefwin->StripCR(reader->bstripcr);

-    prefwin->Dehyphen(reader->bdehyphen);

-    prefwin->SingleSpace(reader->bonespace);

-    prefwin->Unindent(reader->bunindent);

-    prefwin->Reparagraph(reader->brepara);

-    prefwin->DoubleSpace(reader->bdblspce);

-    prefwin->Remap(reader->bremap);

-    prefwin->Embolden(reader->bmakebold);

-    prefwin->FullJustify(reader->bfulljust);

-    //    prefwin->Inverse(reader->bInverse);

-    //    prefwin->Negative(reader->bNegative);

-    prefwin->FixGraphics(reader->m_fontControl.FixGraphics());

-    prefwin->ParaLead(reader->getextraspace());

-    prefwin->LineLead(reader->getlead());

-    prefwin->TopMargin(reader->m_abstopmargin);

-    prefwin->BottomMargin(reader->m_absbottommargin);

-    prefwin->LeftMargin(reader->m_absleft_border);

-    prefwin->RightMargin(reader->m_absright_border);

-    prefwin->Indent(reader->bindenter);

-    if (reader->bautofmt)

-    {

-	prefwin->Markup(0);

-    }

-    else if (reader->btextfmt)

-    {

-	prefwin->Markup(2);

-    }

-    else if (reader->bstriphtml)

-    {

-	prefwin->Markup(3);

-    }

-    else if (reader->bpeanut)

-    {

-	prefwin->Markup(4);

-    }

-    else

-    {

-	prefwin->Markup(1);

-    }

-    prefwin->Depluck(reader->bdepluck);

-    prefwin->Dejpluck(reader->bdejpluck);

-    prefwin->Continuous(reader->m_continuousDocument);

-

-    prefwin->dictApplication(m_targetapp);

-    prefwin->dictMessage(m_targetmsg);

-

-    /*

-    prefwin->leftScroll(m_leftScroll);

-    prefwin->rightScroll(m_rightScroll);

-    prefwin->upScroll(m_upScroll);

-    prefwin->downScroll(m_downScroll);

-    */

-

-    prefwin->miscannotation(m_doAnnotation);

-    prefwin->miscdictionary(m_doDictionary);

-    prefwin->miscclipboard(m_doClipboard);

-

-    prefwin->SwapMouse(reader->m_swapmouse);

-

-    prefwin->Font(reader->m_fontname);

-

-    prefwin->gfxsize(reader->getBaseSize());

-

-    prefwin->pageoverlap(reader->m_overlap);

-

-    prefwin->ideogram(reader->m_bMonoSpaced);

-

-    prefwin->encoding(reader->m_encd);

-

-    prefwin->ideogramwidth(reader->m_charpc);

-

-    if (prefwin->exec())

-    {

-      //      m_debounce = prefwin->Debounce();

-      reader->brepalm = prefwin->repalm();

-      reader->bkern = prefwin->kern();

-      reader->hyphenate = prefwin->hyphenate();

-      //      reader->buffdoc.setCustomHyphen(prefwin->customhyphen());

-      reader->m_scrolltype = prefwin->scrolltype();

-      reader->m_scrollstep = prefwin->scrollstep();

-      m_scrollcolor = prefwin->scrollcolor();

-      setscrollcolour();

-      m_scrollbarcolor = prefwin->minibarcol();

-      setscrollbarcolour();

-      m_foreground = prefwin->foreground();

-      reader->setForeground(getcolour(m_foreground));

-      m_background = prefwin->background();

-      reader->setBackground(getcolour(m_background));

-	m_twoTouch = prefwin->twotouch();

-	reader->setTwoTouch(m_twoTouch);

-	m_touch_action->setOn(m_twoTouch);

-

-	reader->bstripcr = prefwin->StripCR();

-	reader->bdehyphen = prefwin->Dehyphen();

-	reader->bonespace = prefwin->SingleSpace();

-	reader->bunindent = prefwin->Unindent();

-	reader->brepara = prefwin->Reparagraph();

-	reader->bdblspce = prefwin->DoubleSpace();

-	reader->bremap = prefwin->Remap();

-	reader->bmakebold = prefwin->Embolden();

-	reader->bfulljust = prefwin->FullJustify();

-	//	if (reader->bInverse != prefwin->Inverse()) reader->setInverse(prefwin->Inverse());

-	//	if (reader->bNegative != prefwin->Negative()) reader->setNegative();

-	reader->m_fontControl.FixGraphics(prefwin->FixGraphics());

-

-	reader->setextraspace(prefwin->ParaLead());

-	reader->setlead(prefwin->LineLead());

-	reader->m_abstopmargin = prefwin->TopMargin();

-	reader->m_absbottommargin = prefwin->BottomMargin();

-	reader->m_absleft_border = prefwin->LeftMargin();

-	reader->m_absright_border = prefwin->RightMargin();

-	reader->bindenter = prefwin->Indent();

-	reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false;

-	switch (prefwin->Markup())

-	{

-	    case 0:

-		reader->bautofmt = true;

-		break;

-	    case 1:

-		break;

-	    case 2:

-		reader->btextfmt = true;

-		break;

-	    case 3:

-		reader->bstriphtml = true;

-		break;

-	    case 4:

-		reader->bpeanut = true;

-		break;

-	    default:

-		qDebug("Format out of range");

-	}

-	reader->bdepluck = prefwin->Depluck();

-	reader->bdejpluck = prefwin->Dejpluck();

-	reader->setContinuous(prefwin->Continuous());

-

-	/*

-	m_leftScroll = prefwin->leftScroll();

-	m_rightScroll = prefwin->rightScroll();

-	m_upScroll = prefwin->upScroll();

-	m_downScroll = prefwin->downScroll();

-	*/

-	m_targetapp = prefwin->dictApplication();

-	m_targetmsg = prefwin->dictMessage();

-

-	m_doAnnotation = prefwin->miscannotation();

-	m_doDictionary = prefwin->miscdictionary();

-	m_doClipboard = prefwin->miscclipboard();

-	reader->m_swapmouse = prefwin->SwapMouse();

-	reader->setBaseSize(prefwin->gfxsize());

-	reader->m_overlap = prefwin->pageoverlap();

-	reader->m_bMonoSpaced = prefwin->ideogram();

-	m_setmono_action->setOn(reader->m_bMonoSpaced);

-	reader->m_encd = prefwin->encoding();

-	reader->m_charpc = prefwin->ideogramwidth();

-

-	if (

-	    reader->m_fontname != prefwin->Font()

-	    ||

-	    m_propogatefontchange != prefwin->propfontchange())

-	{

-	    m_propogatefontchange = prefwin->propfontchange();

-	    setfontHelper(prefwin->Font());

-	}

-	if (m_bgtype != (bground)prefwin->bgtype())

-	  {

-	    m_bgtype = (bground)prefwin->bgtype();

-	    setBackgroundBitmap();

-	  }

-	delete prefwin;

-	reader->setfilter(reader->getfilter());

-	reader->refresh();

-    }

-    else

-    {

-	delete prefwin;

-    }

-}

-

-void QTReaderApp::showtoolbarprefs()

-{

-#ifdef USEQPE

-    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 );

-		d = QDir::home();

-		d.mkdir(APPDIR);

-		d.cd(APPDIR);

-	}

-	fi.setFile(d, INIFILE);

-    CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);

-#endif

-    prefwin->tbpolicy(m_tbpolsave);

-    prefwin->tbposition(m_tbposition-2);

-    prefwin->tbmovable(m_tbmovesave);

-    prefwin->floating(m_bFloatingDialog);

-    prefwin->qtscroll(m_qtscroll);

-    prefwin->localscroll(m_localscroll);

-    if (prefwin->exec())

-    {

-	m_bFloatingDialog = prefwin->floating();

-	if (

-	    m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy()

-	    ||

-	    m_tbposition != (ToolBarDock)(prefwin->tbposition()+2)

-	    ||

-	    m_tbmovesave != prefwin->tbmovable()

-	    ||

-	    m_qtscroll != prefwin->qtscroll()

-	    //	    ||

-	    //	    m_localscrollbar != prefwin->scrollonleft()

-	    )

-	{

-	    QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started");

-	}

-	m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy();

-	m_tbposition = (ToolBarDock)(prefwin->tbposition()+2);

-	m_tbmovesave = prefwin->tbmovable();

-	reader->m_scrollpos = m_localscroll = prefwin->localscroll();

-	if (m_qtscroll != prefwin->qtscroll())

-	  {

-	    m_qtscroll = prefwin->qtscroll();

-	    setrotated(reader->m_rotated);

-	  }

-	if (m_scrollbar == NULL || m_scrollbar->isHidden())

-	  {

-	    reader->m_scrollpos = m_localscroll;

-	  }

-	else

-	  {

-	    reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;

-	  }

-	bool isChanged = prefwin->isChanged();

-	delete prefwin;

-#ifdef USEQPE

-	Config config( APPDIR );

-#else

-	QFileInfo fi;

-    QDir d = QDir::home();                      // "/"

-	if ( !d.cd(APPDIR) )

-	{                       // "/tmp"

-		qWarning( "Cannot find the \"~/%s\" directory", APPDIR );

-		d = QDir::home();

-		d.mkdir(APPDIR);

-		d.cd(APPDIR);

-	}

-	fi.setFile(d, INIFILE);

-	Config config( fi.absFilePath() );

-#endif

-	if (isChanged) addtoolbars(&config);

-    }

-    else

-    {

-	delete prefwin;

-    }

-}

-

-void QTReaderApp::showinfo()

-{

-    unsigned long ds, fs, ts, pl, dl;

-    if (reader->empty())

-    {

-	QMessageBox::information(this, PROGNAME, "No file loaded", 1);

-    }

-    else

-    {

-	reader->sizes(fs,ts);

-	ds = reader->buffdoc.endSection() - reader->buffdoc.startSection();

-	pl = reader->pagelocate();

-	dl = pl - reader->buffdoc.startSection();

-	m_infoWin->setFileSize(fs);

-	m_infoWin->setTextSize(ts);

-	m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);

-	m_infoWin->setLocation(pl);

-	m_infoWin->setRead((100*pl + (ts >> 1))/ts);

-	m_infoWin->setDocSize(ds);

-	m_infoWin->setDocLocation(dl);

-	m_infoWin->setDocRead((100*dl + (ds >> 1))/ds);

-	m_infoWin->setZoom(reader->m_fontControl.currentsize()*10);

-	m_infoWin->setAbout(QString("\nApplication (c) Tim Wentford\n")+reader->about());

-	editorStack->raiseWidget( m_infoWin );

-	hidetoolbars();

-	m_infoWin->setFocus();

-    }

-}

-

-void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn, size_t posn2)

-{

-    if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>;

-#ifdef _UNICODE

-    CBuffer buff(name.length()+1);

-    int i;

-    for (i = 0; i < name.length(); i++)

-    {

-	buff[i] = name[i].unicode();

-    }

-    buff[i] = 0;

-    CBuffer buff2(text.length()+1);

-    for (i = 0; i < text.length(); i++)

-    {

-	buff2[i] = text[i].unicode();

-    }

-    buff2[i] = 0;

-    Bkmk b(buff.data(), buff2.data(), posn, posn2);

-	QColor c = m_annoWin->getColor();

-	int red,green,blue;

-	c.rgb(&red, &green, &blue);

-	b.red(red);

-	b.green(green);

-	b.blue(blue);

-    pBkmklist->push_front(b);

-#else

-    pBkmklist->push_front(Bkmk((const tchar*)text,posn));

-#endif

-    m_fBkmksChanged = true;

-    pBkmklist->sort();

-}

-

-void QTReaderApp::addAnno(const QString& name, const QString& text)

-{

-    if (m_annoIsEditing)

-    {

-	if (name.isEmpty())

-	{

-	    QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1);

-	}

-	else

-	{

-	    addAnno(name, text, m_annoWin->getPosn(), m_annoWin->getPosn2());

-	}

-	showEditTools();

-    }

-    else

-    {

-	if (m_annoWin->edited())

-	{

-	    CBuffer buff(text.length()+1);

-	    int i;

-	    for (i = 0; i < text.length(); i++)

-	    {

-		buff[i] = text[i].unicode();

-	    }

-	    buff[i] = 0;

-	    m_fBkmksChanged = true;

-	    m_anno->setAnno(buff.data());

-	}

-	QColor c = m_annoWin->getColor();

-	int red,green,blue;

-	c.rgb(&red, &green, &blue);

-	m_anno->red(red);

-	m_anno->green(green);

-	m_anno->blue(blue);

-	bool found = findNextBookmark(m_anno->value()+1);

-	if (found)

-	{

-	    m_annoWin->setName(toQString(m_anno->name()));

-	    m_annoWin->setAnno(toQString(m_anno->anno()));

-	    m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue()));

-	}

-	else

-	{

-	    showEditTools();

-	}

-    }

-}

-

-bool QTReaderApp::findNextBookmark(size_t start)

-{

-    bool found = false;

-    for (CList<Bkmk>::iterator iter = pBkmklist->begin(); iter != pBkmklist->end(); iter++)

-    {

-	if (iter->value() >= start)

-	{

-	    if (iter->value() < reader->locate())

-	    {

-		found = true;

-		m_anno = iter.pContent();

-	    }

-	    break;

-	}

-    }

-    return found;

-}

-

-void QTReaderApp::addanno()

-{

-    if (reader->empty())

-    {

-	QMessageBox::information(this, PROGNAME, "No file loaded", 1);

-    }

-    else

-    {

-	m_annoWin->setName("");

-	m_annoWin->setAnno("");

-	m_annoWin->setPosn(reader->pagelocate());

-	m_annoIsEditing = true;

-	editorStack->raiseWidget( m_annoWin );

-	hidetoolbars();

-#ifdef USEQPE

-	Global::showInputMethod();

-#endif

-	m_annoWin->setFocus();

-    }

-}

-

-void QTReaderApp::infoClose()

-{

-  m_debounce = m_buttonprefs->Debounce();

-  if (m_kmapchanged)

-    {

-      m_kmapchanged = false;

-#ifndef USEQPE

-      QDir d = QDir::home();                      // "/"

-      d.cd(APPDIR);

-      QFileInfo fi(d, ".keymap");

-      FILE* f = fopen((const char *)fi.absFilePath(), "w");

-#else /* USEQPE */

-      FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "w");

-#endif /* USEQPE */

-      if (f != NULL)

-	{

-	  uint cnt = KEYMAPVERSION;

-	  fwrite(&cnt, sizeof(cnt), 1, f);

-	  cnt = kmap.count();

-	  fwrite(&cnt, sizeof(cnt), 1, f);

-	  for (QMap<orKey,int>::Iterator i = kmap.begin(); i != kmap.end(); i++)

-	    {

-	      orKey key = i.key();

-	      int data = i.data();

-	      fwrite(&key, sizeof(key), 1, f);

-	      fwrite(&data, sizeof(data), 1, f);

-	      qDebug("Saved %s as %u", (const char*)key.text(), data);

-	    }

-	  fclose(f);

-	}

-    }

-    showEditTools();

-}

-

-/*

-void QTReaderApp::fileRevert()

-{

-    clear();

-    fileOpen();

-}

-

-void QTReaderApp::editCut()

-{

-#ifndef QT_NO_CLIPBOARD

-    editor->cut();

-#endif

-}

-*/

-void QTReaderApp::editMark()

-{

-    m_savedpos = reader->pagelocate();

-}

-

-void QTReaderApp::editCopy()

-{

-	QClipboard* cb = QApplication::clipboard();

-	QString text;

-	int ch;

-	unsigned long currentpos = reader->pagelocate();

-	unsigned long endpos = reader->locate();

-	if (m_savedpos == 0xffffffff)

-	{

-	    m_savedpos = currentpos;

-	}

-	reader->jumpto(m_savedpos);

-	while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)

-	{

-	    text += ch;

-	}

-	cb->setText(text);

-	reader->locate(currentpos);

-	m_savedpos = 0xffffffff;

-}

-

-void QTReaderApp::gotoStart()

-{

-    reader->locate(reader->buffdoc.startSection());

-}

-

-void QTReaderApp::gotoEnd()

-{

-    reader->dopageup(reader->buffdoc.endSection());

-}

-

-void QTReaderApp::pageup()

-{

-    reader->NavUp();

-}

-

-void QTReaderApp::pagedn()

-{

-    reader->NavDown();

-}

-

-void QTReaderApp::pagemode(bool _b)

-{

-    reader->setpagemode(_b);

-}

-

-/*

-void QTReaderApp::setspacing()

-{

-    m_nRegAction = cMonoSpace;

-    char lcn[20];

-    sprintf(lcn, "%lu", reader->m_charpc);

-    regEdit->setText(lcn);

-    do_regedit();

-}

-*/

-void QTReaderApp::settarget()

-{

-    m_nRegAction = cSetTarget;

-    QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp)

-	+ "/"

-	+ ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg);

-    regEdit->setText(text);

-    do_regedit();

-}

-

-/*

-void QTReaderApp::do_mono(const QString& lcn)

-{

-    bool ok;

-    unsigned long ulcn = lcn.toULong(&ok);

-    if (ok)

-    {

-	reader->m_charpc = ulcn;

-	reader->setfont();

-	reader->refresh();

-//	reader->setmono(true);

-    }

-    else

-	QMessageBox::information(this, PROGNAME, "Must be a number");

-}

-*/

-/*

-void QTReaderApp::editPaste()

-{

-#ifndef QT_NO_CLIPBOARD

-    editor->paste();

-#endif

-}

-*/

-

-void QTReaderApp::editFind()

-{

-  searchStart = reader->pagelocate();

-#ifdef __ISEARCH

-  searchStack = new QStack<searchrecord>;

-#endif

-#ifdef USEQPE

-  Global::showInputMethod();

-#endif

-  searchBar->show();

-  searchVisible = TRUE;

-  searchEdit->setFocus();

-#ifdef __ISEARCH

-  searchStack->push(new searchrecord("",reader->pagelocate()));

-#endif

-}

-

-void QTReaderApp::findNext()

-{

-//  //  qDebug("findNext called\n");

-#ifdef __ISEARCH

-  QString arg = searchEdit->text();

-#else

-  QRegExp arg = searchEdit->text();

-#endif

-  CDrawBuffer test(&(reader->m_fontControl));

-  size_t start = reader->pagelocate();

-  reader->jumpto(start);

-  reader->getline(&test);

-  dosearch(start, test, arg);

-}

-

-void QTReaderApp::findClose()

-{

-  searchVisible = FALSE;

-  searchEdit->setText("");

-#ifdef USEQPE

-  Global::hideInputMethod();

-#endif

-  searchBar->hide();

-#ifdef __ISEARCH

-//  searchStack = new QStack<searchrecord>;

-  while (!searchStack->isEmpty())

-    {

-      delete searchStack->pop();

-    }

-  delete searchStack;

-#endif

-  reader->setFocus();

-}

-

-void QTReaderApp::regClose()

-{

-  regVisible = FALSE;

-  regEdit->setText("");

-  regBar->hide();

-#ifdef USEQPE

-  Global::hideInputMethod();

-#endif

-  reader->setFocus();

-}

-

-#ifdef __ISEARCH

-bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QString& arg)

-#else

-bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)

-#endif

-{

-  bool ret = true;

-    unsigned long fs, ts;

-    reader->sizes(fs,ts);

-  size_t pos = reader->locate();

-  pbar->setGeometry(searchBar->x(),searchBar->y(),searchBar->width(), searchBar->height());

-  pbar->show();

-  pbar->raise();

-  pbar->reset();

-  int offset;

-  int lastpc = (100*pos)/ts;

-  pbar->setProgress(lastpc);

-//  qApp->processEvents();

-  if (reader->buffdoc.getpara(test) >= 0)

-  {

-      reader->setFocus();

-#ifdef __ISEARCH

-      while (strstr(test.data(),(const tchar*)arg) == NULL)

-#else

-#ifdef _UNICODE

-      while ((offset = arg.match(toQString(test.data()))) == -1)

-#else

-      while (arg.match(test.data()) == -1)

-#endif

-#endif

-      {

-	  pos = reader->locate();

-	  int pc = (100*pos)/ts;

-	  if (pc != lastpc)

-	  {

-	      pbar->setProgress(pc);

-	      qApp->processEvents();

-	      reader->setFocus();

-	      lastpc = pc;

-	  }

-	  

-	  if (reader->buffdoc.getpara(test) < 0)

-	  {

-	      if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)

-		  pos = searchStart;

-	      else

-		  pos = start;

-	      findClose();

-	      pbar->hide();

-	      reader->locate(pos);

-	      return false;

-	  }

-      }

-//      qDebug("Found it at %u:%u", pos, offset);

-      pbar->hide();

-//      qDebug("Hid");

-      reader->locate(pos+offset);

-//      qDebug("Loacted");

-//      qDebug("page up");

-      ret = true;

-  }

-  else

-  {

-	      if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)

-		  pos = searchStart;

-	      else

-		  pos = start;

-	      ret = false;

-	      findClose();

-  }

-  return ret;

-}

-

-#ifdef __ISEARCH

-void QTReaderApp::search(const QString & arg)

-{

-  searchrecord* ss = searchStack->top();

-  CBuffer test;

-  size_t start = reader->pagelocate();

-  bool haspopped = false;

-  while (arg.left(ss->s.length()) != ss->s)

-  {

-      haspopped = true;

-      start = ss->pos;

-//      reader->locate(start);

-      searchStack->pop();

-      delete ss;

-  }

-  if (haspopped) reader->locate(start);

-/*

-  if (arg.length() < ss->len)

-    {

-      start = ss->pos;

-      reader->locate(start);

-      searchStack->pop();

-      delete ss;

-    }

-*/

-  else

-    {

-      start = reader->pagelocate();

-      reader->jumpto(start);

-      searchStack->push(new searchrecord(arg,start));

-    }

-    dosearch(start, test, arg);

-}

-#else

-void QTReaderApp::search()

-{

-    findNext();

-}

-#endif

-

-void QTReaderApp::openFile( const QString &f )

-{

-//    qDebug("File:%s", (const char*)f);

-//    openFile(DocLnk(f));

-//}

-//

-//void QTReaderApp::openFile( const DocLnk &f )

-//{

-  clear();

-  QFileInfo fm(f);

-  if ( fm.exists() )

-    {

-//      QMessageBox::information(0, "Progress", "Calling fileNew()");

-#ifdef USEQPE

-	if (fm.extension( FALSE ) == "desktop")

-	{

-	    DocLnk d(f);

-	    QFileInfo fnew(d.file());

-	    fm = fnew;

-	    if (!fm.exists()) return;

-	}

-#endif

-      clear();

-      reader->setText(fm.baseName(), fm.absFilePath());

-      m_loadedconfig = readconfig(APPDIR "/configs", reader->m_string, false);

-      qDebug("Showing tools");

-      showEditTools();

-      qDebug("Shown tools");

-      readbkmks();

-      qDebug("read markss");

-      m_savedpos = 0xffffffff;

-    }

-  else

-    {

-      QString msg = f;

-       msg += "\nFile does not exist";

-      QMessageBox::information(this, PROGNAME, msg);

-      reader->m_lastfile = QString::null;

-    }

-	

-}

-/*

-void QTReaderApp::resizeEvent(QResizeEvent* e)

-{

-    if (m_fullscreen)

-    {

-	showNormal();

-	showFullScreen();

-    }

-}

-*/

-void QTReaderApp::handlekey(QKeyEvent* e)

-{

-//    qDebug("Keypress event");

-    timeb now;

-    ftime(&now);

-    unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;

-    if (etime < m_debounce)

-    {

-	return;

-    }

-    switch(e->key())

-    {

-	case Key_Escape:

-//	    qDebug("escape event");

-	    if (m_disableesckey)

-	    {

-		m_disableesckey = false;

-	    }

-	    else

-	    {

-		m_bcloseDisabled = true;

-		if (m_fullscreen)

-		{

-		    m_actFullscreen->setOn(false);

-		    e->accept();

-		}

-		else

-		{

-//		qDebug("escape action");

-		    doAction(e);

-		}

-	    }

-	    break;

-	    /*

-	case Key_Left:

-	{

-	    if (reader->m_autoScroll)

-	    {

-		reader->reduceScroll();

-	    }

-	    else

-	    {

-		doAction(e);

-	    }

-	}

-	break;

-	case Key_Right:

-	{

-	    if (reader->m_autoScroll)

-	    {

-		reader->increaseScroll();

-	    }

-	    else

-	    {

-		doAction(e);

-	    }

-	}

-	break;

-	case Key_Up:

-	{

-	    if (reader->m_autoScroll)

-	    {

-		reader->increaseScroll();

-	    }

-	    else

-	    {

-		doAction(e);

-	    }

-	}

-	break;

-	case Key_Down:

-	{

-	    if (reader->m_autoScroll)

-	    {

-		reader->reduceScroll();

-	    }

-	    else

-	    {

-		doAction(e);

-	    }

-	}

-	break;

-	    */

-	default:

-	{

-	  doAction(e);

-	}

-	

-/*

-	QString msg("Key press was:");

-	QString key;

-	msg += key.setNum(e->key());

-	QMessageBox::information(this, PROGNAME, msg);

-*/

-    }

-    ftime(&m_lastkeytime);

-}

-

-#ifdef NEWFULLSCREEN

-void QTReaderApp::enableFullscreen()

-{

-    setFixedSize(qApp->desktop()->size());

-    showNormal();

-    reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));

-    showFullScreen();

-}

-

-void QTReaderApp::resizeEvent(QResizeEvent *)

-{

-    if (m_fullscreen && (size() != qApp->desktop()->size()))

-    {

-	enableFullscreen();

-    }

-}

-

-void QTReaderApp::focusInEvent(QFocusEvent*)

-{

-    if (m_fullscreen)

-    {

-	enableFullscreen();

-	raise();

-    }

-}

-#endif

-

-void QTReaderApp::showEditTools()

-{

-//    if ( !doc )

-//	close();

-    if (m_fullscreen)

-    {

-#ifdef USEQPE

-	if (menubar != NULL) menubar->hide();

-#endif

-	if (fileBar != NULL) fileBar->hide();

-	if (viewBar != NULL) viewBar->hide();

-	if (navBar != NULL) navBar->hide();

-	if (markBar != NULL) markBar->hide();

-	if (m_prog != NULL) 

-	  {

-	    //	    qDebug("Hiding status");

-	    m_prog->hide();

-	  }

-	searchBar->hide();

-	regBar->hide();

-#ifdef USEQPE

-	Global::hideInputMethod();

-#endif

-	if (m_scrollbar != NULL) m_scrollbar->hide();

-	m_fontBar->hide();

-//	showNormal();

-#ifdef NEWFULLSCREEN

-	enableFullscreen();

-#else

-	showFullScreen();

-#endif

-    }

-    else

-    {

-//	qDebug("him");

-#ifdef USEQPE

-	Global::hideInputMethod();

-#endif

-//	qDebug("eb");

-	if (m_scrollbar != NULL)

-	  {

-	    if (m_scrollishidden)

-	      {

-		m_scrollbar->hide();

-	      }

-	    else

-	      {

-		m_scrollbar->show();

-	      }

-	  }

-	if (!m_hidebars)

-	  {

-#ifdef USEQPE

-	    menubar->show();

-#endif

-	    if (fileBar != NULL) fileBar->show();

-	    if (viewBar != NULL) viewBar->show();

-	    if (navBar != NULL) navBar->show();

-	    if (markBar != NULL) markBar->show();

-	    if (m_prog != NULL && !m_statusishidden) 

-	      {

-		//		qDebug("Showing status");

-		m_prog->show();

-		//		qDebug("Shown status");

-	      }

-	    //	    qDebug("Showing mb");

-	    mb->show();

-	  }

-	if ( searchVisible )

-	{

-#ifdef USEQPE

-	    Global::showInputMethod();

-#endif

-		searchBar->show();

-	}

-	if ( regVisible )

-	{

-#ifdef USEQPE

-	    Global::showInputMethod();

-#endif

-		regBar->show();

-	}

-	if (m_fontVisible) m_fontBar->show();

-//	qDebug("sn");

-	showNormal();

-//	qDebug("sm");

-#ifdef USEQPE

-	showMaximized();

-#endif

-//	setCentralWidget(reader);

-    }

-

-    //    qDebug("uc");

-    updateCaption();

-    //    qDebug("rw");

-    editorStack->raiseWidget( reader );

-    //    qDebug("sf");

-    reader->setFocus();

-    //    qDebug("ref");

-    reader->refresh(true);

-    //    qDebug("done");

-}

-/*

-void QTReaderApp::save()

-{

-    if ( !doc )

-	return;

-    if ( !editor->edited() )

-	return;

-

-    QString rt = editor->text();

-    QString pt = rt;

-

-    if ( doc->name().isEmpty() ) {

-	unsigned ispace = pt.find( ' ' );

-	unsigned ienter = pt.find( '\n' );

-	int i = (ispace < ienter) ? ispace : ienter;

-	QString docname;

-	if ( i == -1 ) {

-	    if ( pt.isEmpty() )

-		docname = "Empty Text";

-	    else

-		docname = pt;

-	} else {

-	    docname = pt.left( i );

-	}

-	doc->setName(docname);

-    }

-    FileManager fm;

-    fm.saveFile( *doc, rt );

-}

-*/

-

-void QTReaderApp::clear()

-{

-//    if (doc != 0)

-//      {

-//  QMessageBox::information(this, PROGNAME, "Deleting doc", 1);

-//	delete doc;

-//  QMessageBox::information(this, PROGNAME, "Deleted doc", 1);

-//	doc = 0;

-    //     }

-    reader->clear();

-}

-

-void QTReaderApp::updateCaption()

-{

-//    if ( !doc )

-//	setCaption( tr("QTReader") );

-//    else {

-//	QString s = doc->name();

-//	if ( s.isEmpty() )

-//	    s = tr( "Unnamed" );

-	setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) );

-//    }

-}

-

-void QTReaderApp::setDocument(const QString& fileref)

-{

-//QMessageBox::information(0, "setDocument", fileref);

-    openFile(fileref);

-//    showEditTools();

-}

-

-void QTReaderApp::closeEvent( QCloseEvent *e )

-{

-//    qDebug("Close event");

-    if (m_fullscreen)

-    {

-	m_fullscreen = false;

-	showEditTools();

-	e->ignore();

-    }

-    else if (editorStack->visibleWidget() == m_buttonprefs)

-      {

-	m_buttonprefs->mapkey(Qt::NoButton, Key_Escape);

-	e->ignore();

-      }

-    else if (m_dontSave)

-    {

-	e->accept();

-    }

-    else

-    {

-	if (editorStack->visibleWidget() == reader)

-	{

-	    if ((kmap.find(orKey(Qt::NoButton,Key_Escape,false)) != kmap.end()) && m_bcloseDisabled)

-	    {

-//	qDebug("Close disabled");

-		m_bcloseDisabled = false;

-		e->ignore();

-	    }

-	    else

-	    {

-		if (m_fontVisible)

-		{

-		    m_fontBar->hide();

-		    m_fontVisible = false;

-		    e->ignore();

-		    return;

-		}

-		if (regVisible)

-		{

-		    regBar->hide();

-#ifdef USEQPE

-		    Global::hideInputMethod();

-#endif

-		    regVisible = false;

-		    e->ignore();

-		    return;

-		}

-		if (searchVisible)

-		{

-		    searchBar->hide();

-#ifdef USEQPE

-		    Global::hideInputMethod();

-#endif

-		    searchVisible = false;

-		    e->ignore();

-		    return;

-		}

-		if (m_fBkmksChanged && pBkmklist != NULL)

-		{

-		    if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)

-			savebkmks();

-		    delete pBkmklist;

-		    reader->pBkmklist = pBkmklist = NULL;

-		    m_fBkmksChanged = false;

-		}

-		updatefileinfo();

-		saveprefs();

-		e->accept();

-	    }

-	}

-	else

-	{

-	    showEditTools();

-	    m_disableesckey = true;

-	}

-    }

-}

-

-void QTReaderApp::do_gotomark()

-{

-    m_nBkmkAction = cGotoBkmk;

-    if (!listbkmk(pBkmklist))

-	QMessageBox::information(this, PROGNAME, "No bookmarks in memory");

-}

-

-void QTReaderApp::do_delmark()

-{

-    m_nBkmkAction = cDelBkmk;

-    if (!listbkmk(pBkmklist))

-	QMessageBox::information(this, PROGNAME, "No bookmarks in memory");

-}

-

-bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)

-{

-    bkmkselector->clear();

-    if (_lab.isEmpty())

-	bkmkselector->setText("Cancel");

-    else

-	bkmkselector->setText(_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()));

-	    bkmkselector->insertItem(toQString(i->name()));

-#else

-	    bkmkselector->insertItem(i->name());

-#endif

-	    cnt++;

-	  }

-      }

-    if (cnt > 0)

-      {

-	  hidetoolbars();

-        editorStack->raiseWidget( bkmkselector );

-	return true;

-      }

-    else

-	return false;

-}

-

-void QTReaderApp::do_autogen()

-{

-  m_nRegAction = cAutoGen;

-  regEdit->setText(m_autogenstr);

-  do_regedit();

-}

-

-void QTReaderApp::do_regedit()

-{

-//    fileBar->hide();

-    reader->bDoUpdates = false;

-//    qDebug("Showing regbar");

-  regBar->show();

-//    qDebug("Showing kbd");

-#ifdef USEQPE

-  Global::showInputMethod();

-#endif

-  regVisible = true;

-  regEdit->setFocus();

-//  qApp->processEvents();

-    reader->bDoUpdates = true;

-    reader->update();

-}

-

-bool QTReaderApp::openfrombkmk(Bkmk* bk)

-{

-    QString fn = toQString(

-	CFiledata(bk->anno()).name()

-	);

-//	qDebug("fileinfo");

-    if (!fn.isEmpty() && QFileInfo(fn).isFile())

-    {

-//	qDebug("Opening");

-	openFile(fn);

-	struct stat fnstat;

-	stat((const char *)reader->m_lastfile, &fnstat);

-	

-	if (CFiledata(bk->anno()).date()

-	    != fnstat.st_mtime)

-	{

-	    CFiledata fd(bk->anno());

-	    fd.setdate(fnstat.st_mtime);

-	    bk->value(0);

-	}

-	else

-	{

-	    unsigned short svlen = bk->filedatalen();

-	    unsigned char* svdata = bk->filedata();

-	    reader->putSaveData(svdata, svlen);

-//	    setstate(svdata, svlen);

-	    if (svlen != 0)

-	    {

-		QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");

-	    }

-//	    qDebug("updating");

-//	    showEditTools();

-	    reader->locate(bk->value());

-	}

-	return true;

-    }

-    else

-    {

-	return false;

-    }

-}

-

-void QTReaderApp::gotobkmk(int ind)

-{

-  qDebug("gbkmk");

-    showEditTools();

-    switch (m_nBkmkAction)

-    {

-	case cOpenFile:

-	{

-//	    qApp->processEvents();

-	    if (!openfrombkmk((*pOpenlist)[ind]))

-	    {

-		pOpenlist->erase(ind);

-		QMessageBox::information(this, PROGNAME, "Can't find file");

-	    }

-	}

-	break;

-	case cGotoBkmk:

-	    reader->buffdoc.saveposn(reader->m_lastfile, reader->pagelocate());

-	    reader->locate((*pBkmklist)[ind]->value());

-	    break;

-	case cDelBkmk:

-////	    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());

-	    pBkmklist->erase(ind);

-	    m_fBkmksChanged = true;

-	    reader->refresh(true);

-//	    pBkmklist->sort();

-	    break;

-	case cRmBkmkFile:

-		{

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR);

-		d.remove(bkmkselector->text(ind));

-#else /* USEQPE */

-		unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind)));

-#endif /* USEQPE */

-		}

-	    break;

-	case cLdConfig:

-	    readconfig(APPDIR "/configs", bkmkselector->text(ind), false);

-	    break;

-	case cLdTheme:

-	  m_themename = bkmkselector->text(ind);

-	  readconfig(QString(APPDIR "/Themes/")+m_themename , "config", false);

-	  setBackgroundBitmap();

-	    break;

-	case cRmConfig:

-		{

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR "/configs");

-		d.remove(bkmkselector->text(ind));

-#else /* USEQPE */

-		unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind)));

-#endif /* USEQPE */

-		}

-	    break;

-	case cExportLinks:

-	{

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-	    d.cd(APPDIR "/urls");

-	    QFileInfo fi(d, bkmkselector->text(ind));

-	    if (fi.exists())

-	    {

-		QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) );

-		if (!outfile.isEmpty())

-		{

-		    FILE* fout = fopen((const char *)outfile, "w");

-		    if (fout != NULL)

-		    {

-			FILE* fin = fopen((const char *)fi.absFilePath(), "r");

-			if (fin != NULL)

-			{

-			    fprintf(fout, "<html><body>\n");

-			    int ch = 0;

-			    while ((ch = fgetc(fin)) != EOF)

-			    {

-				fputc(ch, fout);

-			    }

-			    fclose(fin);

-			    fprintf(fout, "</html></body>\n");

-			    d.remove(bkmkselector->text(ind));

-			}

-			fclose(fout);

-		    }

-		    else

-			QMessageBox::information(this, PROGNAME, "Couldn't open output");

-		}

-	    }

-#else /* USEQPE */

-	    FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");

-	    if (fin != NULL)

-	    {

-		bool allok = false;

-#ifdef OPIE

-		QString outfile = OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null, QString::null, MimeTypes(), 0, "OpieReader");

-		if (!outfile.isEmpty())

-		{

-		    FILE* fout = fopen((const char *)outfile, "w");

-		    if (fout != NULL)

-		    {

-			fprintf(fout, "<html><body>\n");

-			int ch = 0;

-			while ((ch = fgetc(fin)) != EOF)

-			{

-			    fputc(ch, fout);

-			}

-			fprintf(fout, "</html></body>\n");

-			fclose(fout);

-			allok = true;

-		    }

-		    else

-			QMessageBox::information(this, PROGNAME, "Couldn't open output");

-		}

-		fclose(fin);

-		if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));

-#else

-		fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null);

-		if (fb->exec())

-		{

-		    QString outfile = fb->getCurrentFile();

-		    FILE* fout = fopen((const char *)outfile, "w");

-		    if (fout != NULL)

-		    {

-			fprintf(fout, "<html><body>\n");

-			int ch = 0;

-			while ((ch = fgetc(fin)) != EOF)

-			{

-			    fputc(ch, fout);

-			}

-			fprintf(fout, "</html></body>\n");

-			fclose(fout);

-			allok = true;

-		    }

-		    else

-			QMessageBox::information(this, PROGNAME, "Couldn't open output");

-		}

-		delete fb;

-		fclose(fin);

-		if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));

-#endif

-	    }

-	    else

-	    {

-		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);

-	    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";

-		int ch = 0;

-		while ((ch = fgetc(fin)) != EOF)

-		{

-		    rt += (char)ch;

-		}

-		fclose(fin);

-		rt += "</html></body>\n";

-		if ( doc->name().isEmpty() )

-		{

-		    doc->setName(bkmkselector->text(ind));

-		}

-		FileManager fm;

-		fm.saveFile( *doc, rt );

-		qDebug("YES");

-	    }

-	    else

-	    {

-		qDebug("NO");

-	    }

-	    delete f;

-*/

-

-#endif /* USEQPE */

-	}

-	break;

-    }

-}

-

-void QTReaderApp::cancelbkmk()

-{

-    if (m_nBkmkAction == cOpenFile)

-    {

-	QString fn = usefilebrowser();

-	if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);

-    }

-  showEditTools();

-}

-

-void QTReaderApp::reparastring()

-{

-  m_nRegAction = cRepara;

-  regEdit->setText(reader->m_reparastring);

-  do_regedit();

-}

-

-void QTReaderApp::do_reparastring(const QString& _lcn)

-{

-  reader->m_reparastring = _lcn;

-  if (reader->brepara)

-    {

-      reader->bDoUpdates = true;

-      reader->setfilter(reader->getfilter());

-    }

-}

-

-void QTReaderApp::jump()

-{

-  m_nRegAction = cJump;

-  char lcn[20];

-  sprintf(lcn, "%lu", reader->pagelocate());

-  regEdit->setText(lcn);

-  do_regedit();

-}

-

-void QTReaderApp::do_jump(const QString& _lcn)

-{

-    bool ok;

-    QString lcn = _lcn.stripWhiteSpace();

-    unsigned long ulcn = lcn.toULong(&ok);

-    if (!ok)

-      {

-	double pc = 0.0;

-#ifdef _WINDOWS

-	if (lcn.at(lcn.length()-1) == '%')

-#else

-	if (lcn[lcn.length()-1] == '%')

-#endif

-	{

-	    lcn = lcn.left(lcn.length()-1);

-	    pc = lcn.toDouble(&ok);

-	  }

-	else

-	  {

-	    pc = lcn.toDouble(&ok);

-	  }

-	if (ok && 0 <= pc && pc <= 100)

-	  {

-	    ulcn = (pc*(reader->buffdoc.endSection()-reader->buffdoc.startSection()))/100 + reader->buffdoc.startSection();

-	  }

-	else

-	  {

-	    ok = false;

-	  }

-      }

-    if (ok)

-	reader->locate(ulcn);      

-    else

-	QMessageBox::information(this, PROGNAME, "Must be a number\nor a percentage");

-}

-

-void QTReaderApp::do_regaction()

-{

-    reader->bDoUpdates = false;

-  regBar->hide();

-#ifdef USEQPE

-  Global::hideInputMethod();

-#endif

-  regVisible = false;

-  switch(m_nRegAction)

-  {

-      case cAutoGen:

-	  do_autogen(regEdit->text());

-	  break;

-      case cAddBkmk:

-	  do_addbkmk(regEdit->text());

-	  break;

-      case cRepara:

-	do_reparastring(regEdit->text());

-	break;

-      case cJump:

-	  do_jump(regEdit->text());

-	  break;

-/*

-      case cMonoSpace:

-	  do_mono(regEdit->text());

-	  break;

-*/

-      case cSetTarget:

-	  do_settarget(regEdit->text());

-	  break;

-#ifdef _SCROLLPIPE

-      case cSetPipeTarget:

-	  do_setpipetarget(regEdit->text());

-	  break;

-#endif

-      case cSetConfigName:

-//	  qDebug("Saving config");

-	  do_saveconfig(regEdit->text(), false);

-	  break;

-  }

-//  reader->restore();

-//    fileBar->show();

-  reader->setFocus();

-//    qApp->processEvents();

-    reader->bDoUpdates = true;

-    reader->update();

-}

-

-void QTReaderApp::do_settarget(const QString& _txt)

-{

-    int ind = _txt.find('/');

-    if (ind == -1)

-    {

-	m_targetapp = "";

-	m_targetmsg = "";

-	QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename");

-    }

-    else

-    {

-	m_targetapp = _txt.left(ind);

-	m_targetmsg = _txt.right(_txt.length()-ind-1);

-    }

-}

-

-void QTReaderApp::chooseencoding()

-{

-    m_fontSelector->clear();

-    m_fontSelector->insertItem("Ascii");

-    m_fontSelector->insertItem("UTF-8");

-    m_fontSelector->insertItem("UCS-2(BE)");

-    m_fontSelector->insertItem("USC-2(LE)");

-    m_fontSelector->insertItem("Palm");

-    for (unicodetable::iterator iter = unicodetable::begin(); iter != unicodetable::end(); iter++)

-    {

-	m_fontSelector->insertItem(iter->mime);

-    } // delete the FontDatabase!!!

-    m_fontSelector->setCurrentItem (reader->m_encd);

-    m_fontAction = cChooseEncoding;

-    m_fontBar->show();

-    m_fontVisible = true;

-}

-

-void QTReaderApp::setfont()

-{

-    m_fontSelector->clear();

-    {

-	QFontDatabase f;

-	QStringList flist = f.families();

-	m_fontSelector->insertStringList(flist);

-    } // delete the FontDatabase!!!

-

-    for (int i = 1; i <= m_fontSelector->count(); i++)

-    {

-	if (m_fontSelector->text(i) == reader->m_fontname)

-	{

-	    m_fontSelector->setCurrentItem(i);

-	    break;

-	}

-    }

-    m_fontAction = cChooseFont;

-    m_fontBar->show();

-    m_fontVisible = true;

-}

-

-void QTReaderApp::setfontHelper(const QString& lcn, int size)

-{

-    if (size == 0) size = reader->m_fontControl.currentsize();

-    if (m_propogatefontchange)

-    {

-	QFont f(lcn, 10);

-	bkmkselector->setFont( f );

-	regEdit->setFont( f );

-	searchEdit->setFont( f );

-	m_annoWin->setFont( f );

-    }

-    reader->m_fontname = lcn;

-    if (!reader->ChangeFont(size))

-    {

-	reader->ChangeFont(size);

-    }

-}

-

-void QTReaderApp::do_setencoding(int i)

-{

-    qDebug("setencoding:%d", i);

-    if (m_fontAction == cChooseEncoding)

-    {

-	reader->setencoding(i);

-    }

-    reader->refresh();

-    m_fontBar->hide();

-    m_fontVisible = false;

-//    qDebug("showedit");

-    if (reader->isVisible()) showEditTools();

-//    qDebug("showeditdone");

-}

-

-void QTReaderApp::do_setfont(const QString& lcn)

-{

-    if (m_fontAction == cChooseFont)

-    {

-	setfontHelper(lcn);

-    }

-    reader->refresh();

-    m_fontBar->hide();

-    m_fontVisible = false;

-    //    qDebug("setfont");

-    //if (reader->isVisible())

-    showEditTools();

-//    qDebug("showeditdone");

-}

-

-void QTReaderApp::do_autogen(const QString& regText)

-{

-    unsigned long fs, ts;

-    reader->sizes(fs,ts);

-//  //  qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));

-  m_autogenstr = regText;

-  QRegExp re(regText);

-  CBuffer buff;

-  if (pBkmklist != NULL) delete pBkmklist;

-  reader->pBkmklist = pBkmklist = new CList<Bkmk>;

-  m_fBkmksChanged = true;

-

-  pbar->setGeometry(regBar->x(),regBar->y(),regBar->width(), regBar->height());

-  pbar->show();

-  pbar->raise();

-  pbar->reset();

-  reader->update();

-  qApp->processEvents();

-  reader->setFocus();

-  reader->jumpto(0);

-  int lastpc = 0;

-  int i = 0;

-  while (i >= 0)

-    {

-      unsigned int lcn = reader->locate();

-      int pc = (100*lcn)/ts;

-      if (pc != lastpc)

-      {

-        pbar->setProgress(pc);

-	qApp->processEvents();

-	if (reader->locate() != lcn) reader->jumpto(lcn);

-	reader->setFocus();

-        lastpc = pc;

-      }

-      i = reader->buffdoc.getpara(buff);

-#ifdef _UNICODE

-      if (re.match(toQString(buff.data())) != -1)

-#else

-      if (re.match(buff.data()) != -1)

-#endif

-	pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn));

-    }

-  pBkmklist->sort();

-  pbar->setProgress(100);

-  qApp->processEvents();

-  pbar->hide();

-  reader->refresh();

-}

-

-void QTReaderApp::saveprefs()

-{

-  do_saveconfig( APPDIR, true );

-  savefilelist();

-}

-

-/*

-void QTReaderApp::oldFile()

-{

-//  qDebug("oldFile called");

-  reader->setText(true);

-//  qDebug("settext called");

-  showEditTools();

-//  qDebug("showedit called");

-}

-*/

-

-/*

-void info_cb(Fl_Widget* o, void* _data)

-{

-

-    if (infowin == NULL)

-    {

-	

-	infowin = new Fl_Window(160,240);

-	filename = new Fl_Output(45,5,110,14,"Filename");

-	filesize = new Fl_Output(45,25,110,14,"Filesize");

-	textsize = new Fl_Output(45,45,110,14,"Textsize");

-	comprat = new CBar(45,65,110,14,"Ratio %");

-	posn = new Fl_Output(45,85,110,14,"Location");

-	frcn = new CBar(45,105,110,14,"% Read");

-	about = new Fl_Multiline_Output(5,125,150,90);

-	about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");

-	Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");

-	infowin->set_modal();

-    }

-    if (((reader_ui *)_data)->g_filename[0] != '\0')

-    {

-	unsigned long fs,ts;

-	tchar sz[20];

-	((reader_ui *)_data)->input->sizes(fs,ts);

-	unsigned long pl = ((reader_ui *)_data)->input->locate();

-

-	filename->value(((reader_ui *)_data)->g_filename);

-

-	sprintf(sz,"%u",fs);

-	filesize->value(sz);

-

-	sprintf(sz,"%u",ts);

-	textsize->value(sz);

-

-	comprat->value(100-(100*fs + (ts >> 1))/ts);

-

-	sprintf(sz,"%u",pl);

-	posn->value(sz);

-

-	frcn->value((100*pl + (ts >> 1))/ts);

-    }

-    infowin->show();

-}

-*/

-

-void QTReaderApp::savebkmks()

-{

-    if (pBkmklist != NULL)

-    {

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR);

-		QFileInfo fi(d, reader->m_string);

-	BkmkFile bf((const char *)fi.absFilePath(), true, true);

-#else /* USEQPE */

-	BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true, true);

-#endif /* USEQPE */

-	bf.write(*pBkmklist);

-    }

-	m_fBkmksChanged = false;

-}

-

-void QTReaderApp::readfilelist()

-{

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR);

-		QFileInfo fi(d, ".openfiles");

-    BkmkFile bf((const char *)fi.absFilePath(), false, false);

-#else /* USEQPE */

-    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), false, false);

-#endif /* USEQPE */

-//    qDebug("Reading open files");

-    pOpenlist = bf.readall();

-//    if (pOpenlist != NULL) qDebug("...with success");

-//    else qDebug("...without success!");

-}

-

-void QTReaderApp::savefilelist()

-{

-    if (pOpenlist != NULL)

-    {

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR);

-		QFileInfo fi(d, ".openfiles");

-	BkmkFile bf((const char *)fi.absFilePath(), true, false);

-#else /* USEQPE */

-	BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true, false);

-#endif /* USEQPE */

-//	qDebug("Writing open files");

-	bf.write(*pOpenlist);

-    }

-}

-

-void QTReaderApp::readbkmks()

-{

-    if (pBkmklist != NULL)

-    {

-    	delete pBkmklist;

-    }

-    struct stat fnstat;

-    struct stat bkstat;

-#ifndef USEQPE

-	    QDir d = QDir::home();                      // "/"

-		d.cd(APPDIR);

-		QFileInfo fi(d, reader->m_string);

-#endif /* ! USEQPE */

-    if (

-	stat((const char *)reader->m_lastfile, &fnstat) == 0

-	&&

-#ifndef USEQPE

-	stat((const char *)fi.absFilePath(), &bkstat) == 0

-#else /* USEQPE */

-	stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0

-#endif /* USEQPE */

-	)

-    {

-	if (bkstat.st_mtime < fnstat.st_mtime)

-	{

-#ifndef USEQPE

-	    unlink((const char *)fi.absFilePath());

-#else /* USEQPE */

-	    unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));

-#endif /* USEQPE */

-	}

-    }

-

-#ifndef USEQPE

-    BkmkFile bf((const char *)fi.absFilePath(), false, true);

-#else /* USEQPE */

-    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), false, true);

-#endif /* USEQPE */

-

-    reader->pBkmklist = pBkmklist = bf.readall();

-    m_fBkmksChanged = bf.upgraded();

-    if (pBkmklist == NULL)

-    {

-	reader->pBkmklist = pBkmklist = reader->getbkmklist();

-    }

-    if (pBkmklist != NULL)

-	pBkmklist->sort();

-}

-

-void QTReaderApp::addbkmk()

-{

-  m_nRegAction = cAddBkmk;

-  regEdit->setText(reader->firstword());

-  do_regedit();

-}

-

-void QTReaderApp::do_addbkmk(const QString& text)

-{

-	if (text.isEmpty())

-	{

-	  QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1);

-	}

-	else

-	{

-		if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>;

-#ifdef _UNICODE

-		CBuffer buff;

-		int i = 0;

-		for (i = 0; i < text.length(); i++)

-		{

-		    buff[i] = text[i].unicode();

-		}

-		buff[i] = 0;

-		pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate()));

-#else

-		pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate()));

-#endif

-		m_fBkmksChanged = true;

-		pBkmklist->sort();

-		reader->refresh(true);

-	}

-}

-

-void QTReaderApp::UpdateStatus()

-{

-  QString status;

-  for (int i = 0; i < m_statusstring.length(); i++)

-    {

-      if (m_statusstring[i].unicode() == '%')

-	{

-	  i++;

-	  if (i < m_statusstring.length())

-	    {

-	      switch (m_statusstring[i].unicode())

-		{

-		case 'F':

-		  {

-		    unsigned long fs,ts;

-		    reader->sizes(fs,ts);

-		    status += filesize(ts);

-		  }

-		  break;

-		case 'f':

-		  {

-		    status += filesize(reader->pagelocate());

-		  }

-		  break;

-		case 'D':

-		  {

-		    status += filesize(reader->buffdoc.endSection()-reader->buffdoc.startSection());

-		  }

-		  break;

-		case 'd':

-		  {

-		    status += filesize(reader->pagelocate()-reader->buffdoc.startSection());

-		  }

-		  break;

-		case 'P':

-		  {

-		    unsigned long fs,ts;

-		    reader->sizes(fs,ts);

-		    status += percent(reader->pagelocate(),ts);

-		  }

-		  break;

-		case 'p':

-		  {

-		    status += percent(reader->pagelocate()-reader->buffdoc.startSection(),reader->buffdoc.endSection()-reader->buffdoc.startSection());

-		  }

-		  break;

-		case 'z':

-		  {

-		    //	    qDebug("case d");

-		    status += QString().setNum(reader->m_fontControl.currentsize()*10);

-		  }

-		  break;

-		default:

-		  status += m_statusstring[i];

-		}

-	    }

-	}

-      else

-	{

-	  status += m_statusstring[i];

-	}

-    }

-  m_prog->setText(status);

-}

-

-void QTReaderApp::OnRedraw()

-{

-  if ((pBkmklist != NULL) && (m_bkmkAvail != NULL))

-    {

-      bool found = findNextBookmark(reader->pagelocate());

-      m_bkmkAvail->setEnabled(found);

-    }

-  if (m_scrollbar != NULL)

-    {

-      //qDebug("OnRedraw:[%u, %u]", reader->buffdoc.startSection(), reader->buffdoc.endSection());

-      scrollbar->setRange(reader->buffdoc.startSection(), reader->buffdoc.endSection()-1);

-      scrollbar->setPageStep(reader->locate()-reader->pagelocate());

-      scrollbar->setValue((reader->m_rotated) ? 

-			  (reader->buffdoc.endSection() - reader->locate()+reader->buffdoc.startSection()) :

-			  reader->pagelocate());

-    }

-  if (m_prog->isVisible())

-    {

-      //      qDebug("updating status");

-      UpdateStatus();

-      //      qDebug("updated status");

-    }

-}

-

-void QTReaderApp::showAnnotation()

-{

-    m_annoWin->setName(toQString(m_anno->name()));

-    m_annoWin->setAnno(toQString(m_anno->anno()));

-    m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue()));

-    m_annoIsEditing = false;

-#ifdef USEQPE

-    Global::showInputMethod();

-#endif

-    editorStack->raiseWidget( m_annoWin );

-    hidetoolbars();

-    m_annoWin->setFocus();

-}

-

-void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, size_t posn2, const QString& line)

-{

-////    qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);

-

-    if (m_doClipboard)

-    {

-	QClipboard* cb = QApplication::clipboard();

-	cb->setText(wrd);

-#ifdef USEQPE

-	if (wrd.length() > 10)

-	{

-	    Global::statusMessage(wrd.left(8) + "..");

-	}

-	else

-	{

-	    Global::statusMessage(wrd);

-	}

-#endif

-    }

-    if (m_doAnnotation)

-    {

-//	addAnno(wrd, "Need to be able to edit this", posn);

-	m_annoWin->setName(line);

-	m_annoWin->setAnno("");

-	m_annoWin->setPosn(posn);

-	m_annoWin->setPosn2(posn2);

-	m_annoIsEditing = true;

-#ifdef USEQPE

-	Global::showInputMethod();

-#endif

-	editorStack->raiseWidget( m_annoWin );

-	hidetoolbars();

-    }

-#ifdef USEQPE

-    if (m_doDictionary)

-    {

-	if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty())

-	{

-	    QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8());

-	    e << wrd;

-	}

-    }

-#endif

-}

-

-void QTReaderApp::doAction(QKeyEvent* e)

-{

-  QMap<orKey,int>::Iterator f = kmap.end();

-

-  if (reader->m_autoScroll)

-    {

-      f = kmap.find(orKey(e->state(), e->key(), true));

-    }

-  if (f == kmap.end())

-    {

-      f = kmap.find(orKey(e->state(), e->key(), false));

-    }

-

-    if (f == kmap.end())

-    {

-      qDebug("doaction (no action) : %d %d %d", e->key(), e->state(), f.data());

-	e->ignore();

-    }

-    else

-    {

-      qDebug("doaction (some action) : %d %d %d", e->key(), e->state(), f.data());

-      ActionTypes a = (ActionTypes)f.data();

-	e->accept();

-//	qDebug("Accepted");

-	switch (a)

-	{

-	case cesGotoLink:

-	  {

-	    reader->gotoLink();

-	  }

-	  break;

-	case cesNextLink:

-	  {

-	    reader->getNextLink();

-	  }

-	  break;

-	case cesInvertColours:

-	  m_inverse_action->setOn(!reader->bInverse);

-	  break;

-	case cesToggleBars:

-	  m_hidebars = !m_hidebars;

-	  if (m_hidebars)

-	    {

-#ifdef USEQPE

-	      menubar->hide();

-#endif

-	      if (fileBar != NULL) fileBar->hide();

-	      if (viewBar != NULL) viewBar->hide();

-	      if (navBar != NULL) navBar->hide();

-	      if (markBar != NULL) markBar->hide();

-	      mb->hide();

-	    }

-	  else

-	    {

-#ifdef USEQPE

-	      menubar->show();

-#endif

-	      if (fileBar != NULL) fileBar->show();

-	      if (viewBar != NULL) viewBar->show();

-	      if (navBar != NULL) navBar->show();

-	      if (markBar != NULL) markBar->show();

-	      mb->show();

-	    }

-	  break;

-	case cesToggleScrollBar:

-	  if (m_scrollbar != NULL)

-	    {

-	      if (m_scrollbar->isHidden())

-		{

-		  m_scrollishidden = false;

-		  m_scrollbar->show();

-		  reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;

-		}

-	      else

-		{

-		  m_scrollishidden = true;

-		  m_scrollbar->hide();

-		  reader->m_scrollpos = m_localscroll;

-		}

-	    }

-	  break;

-	case cesToggleStatusBar:

-	  if (m_prog != NULL)

-	    {

-	      if (m_prog->isHidden())

-		{

-		  m_statusishidden = false;

-		  m_prog->show();

-		}

-	      else

-		{

-		  m_statusishidden = true;

-		  m_prog->hide();

-		}

-	    }

-	  break;

-	    case cesOpenFile:

-	    {

-	      qDebug("Open file");

-		fileOpen();

-	    }

-	    break;

-	    case cesAutoScroll:

-	    {

-		reader->setautoscroll(!reader->m_autoScroll);

-		setScrollState(reader->m_autoScroll);

-	    }

-	    break;

-	    case cesActionMark:

-	    {

-		addbkmk();

-	    }

-	    break;

-	    case cesFullScreen:

-	    {

-		m_actFullscreen->setOn(!m_fullscreen);

-	    }

-	    break;

-	    case cesRotate:

-	    {

-		m_rotate_action->setOn(!reader->m_rotated);

-	    }

-	    break;

-	    case cesActionAnno:

-	    {

-		addanno();

-	    }

-	    break;

-	    case cesZoomIn:

-		zoomin();

-		break;

-	    case cesZoomOut:

-		zoomout();

-		break;

-	    case cesBack:

-		reader->goBack();

-		break;

-	    case cesForward:

-		reader->goForward();

-		break;

-	    case cesHome:

-		reader->goHome();

-		break;

-	    case cesPageUp:

-		reader->dopageup();

-		/*

-		ftime(&m_lastkeytime);

-		m_fndelay = m_debounce;

-		//

-		{

-		  timeb now;

-		  ftime(&now);

-		  m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+100;

-		}

-		*/

-		break;

-	    case cesPageDown:

-		reader->dopagedn();

-		/*

-		ftime(&m_lastkeytime);

-		m_fndelay = m_debounce;

-		//		

-			if (m_debounce != 0)

-			{

-			timeb now;

-			ftime(&now);

-			m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+10;

-			}

-		*/

-		break;

-	    case cesLineUp:

-		reader->lineUp();

-		break;

-	    case cesLineDown:

-		reader->lineDown();

-		break;

-	    case cesStartDoc:

-		gotoStart();

-		break;

-	    case cesEndDoc:

-		gotoEnd();

-		break;

-	    case cesScrollMore:

-		reader->increaseScroll();

-		break;

-	    case cesScrollLess:

-		reader->reduceScroll();

-		break;

-	    default:

-		qDebug("Unknown ActionType:%u", a);

-		break;

-	}

-    }

-}

-

-void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }

-void QTReaderApp::restoreFocus() { reader->setFocus(); } 

-

-void QTReaderApp::SaveConfig()

-{

-    m_nRegAction = cSetConfigName;

-    regEdit->setText(reader->m_string);

-    do_regedit();

-}

-

-void QTReaderApp::do_saveconfig(const QString& _txt, bool full)

-{

-//    qDebug("do_saveconfig:%s", (const char*)_txt);

-#ifdef USEQPE

-    QString configname;

-    Config::Domain dom;

-

-    if (full)

-    {

-	configname = _txt;

-	dom = Config::User;

-    }

-    else

-    {

-	configname = Global::applicationFileName(APPDIR "/configs", _txt);

-	dom = Config::File;

-    }

-

-    Config config(configname, dom);

-    config.setGroup( "View" );

-

-#else

-	QFileInfo fi;

-	if (full)

-	{

-//	    qDebug("full:%s", (const char*)_txt);

-	    QDir d = QDir::home();                      // "/"

-		if ( !d.cd(_txt) )

-		{                       // "/tmp"

-			qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );

-			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" );

-			d = QDir::home();

-			d.mkdir(APPDIR);

-			d.cd(APPDIR);

-		}

-		if ( !d.cd("configs") )

-		{                       // "/tmp"

-			qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );

-			d = QDir::home();

-			d.cd(APPDIR);

-			d.mkdir("configs");

-			d.cd("configs");

-		}

-		fi.setFile(d, _txt);

-	}

-//	qDebug("Path:%s", (const char*)fi.absFilePath());

-	Config config(fi.absFilePath());

-#endif

-

-

-    config.writeEntry( "StripCr", reader->bstripcr );

-    config.writeEntry( "AutoFmt", reader->bautofmt );

-    config.writeEntry( "TextFmt", reader->btextfmt );

-    config.writeEntry( "StripHtml", reader->bstriphtml );

-    config.writeEntry( "Dehyphen", reader->bdehyphen );

-    config.writeEntry( "Depluck", reader->bdepluck );

-    config.writeEntry( "Dejpluck", reader->bdejpluck );

-    config.writeEntry( "OneSpace", reader->bonespace );

-    config.writeEntry( "Unindent", reader->bunindent );

-    config.writeEntry( "Repara", reader->brepara );

-    config.writeEntry( "ReparaString", reader->m_reparastring);

-    config.writeEntry( "BackgroundType" , (int)m_bgtype );

-    config.writeEntry( "Theme", m_themename );

-    config.writeEntry( "DoubleSpace", reader->bdblspce );

-    config.writeEntry( "Indent", reader->bindenter );

-    config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) );

-    config.writeEntry( "ScrollDelay", reader->m_delay);

-    config.writeEntry( "ScrollStep", reader->m_scrollstep);

-    config.writeEntry( "ScrollType", reader->m_scrolltype );

-    if (full)

-    {

-	config.writeEntry("Debounce", m_debounce);

-	config.writeEntry("FloatDialogs", m_bFloatingDialog);

-	reader->m_lastposn = reader->pagelocate();

-	config.writeEntry( "LastFile", reader->m_lastfile );

-	config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );

-    }

-    config.writeEntry( "PageMode", reader->m_bpagemode );

-    config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced );

-    config.writeEntry( "SwapMouse", reader->m_swapmouse);

-    config.writeEntry( "IsRotated", reader->m_rotated );

-    config.writeEntry("StatusContent", m_statusstring);

-    config.writeEntry("StatusHidden", m_statusishidden);

-    config.writeEntry( "Background", m_background );

-    config.writeEntry( "Foreground", m_foreground );

-    config.writeEntry( "ScrollColour", m_scrollcolor );

-    config.writeEntry( "ScrollBarColour", m_scrollbarcolor );

-    config.writeEntry( "Hyphenate", reader->hyphenate );

-    //    config.writeEntry( "CustomHyphen", reader->buffdoc.getCustomHyphen() );

-    config.writeEntry( "Fontname", reader->m_fontname );

-    config.writeEntry( "Encoding", reader->m_encd );

-    config.writeEntry( "CharSpacing", reader->m_charpc );

-    config.writeEntry( "Overlap", (int)(reader->m_overlap) );

-    config.writeEntry( "Top Margin", (int)reader->m_abstopmargin );

-    config.writeEntry( "Bottom Margin", (int)reader->m_absbottommargin );

-    config.writeEntry( "Left Margin", (int)reader->m_absleft_border );

-    config.writeEntry( "Right Margin", (int)reader->m_absright_border );

-    config.writeEntry( "TargetApp", m_targetapp );

-    config.writeEntry( "TargetMsg", m_targetmsg );

-#ifdef _SCROLLPIPE

-    config.writeEntry( "PipeTarget", reader->m_pipetarget );

-    config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );

-#endif

-    config.writeEntry( "TwoTouch", m_twoTouch );

-    config.writeEntry( "Annotation", m_doAnnotation);

-    config.writeEntry( "Dictionary", m_doDictionary);

-    config.writeEntry( "Clipboard", m_doClipboard);

-    /*

-    config.writeEntry( "SpaceTarget", m_spaceTarget);

-    config.writeEntry( "EscapeTarget", m_escapeTarget);

-    config.writeEntry( "ReturnTarget", m_returnTarget);

-    config.writeEntry( "LeftTarget", m_leftTarget);

-    config.writeEntry( "RightTarget", m_rightTarget);

-    config.writeEntry( "UpTarget", m_upTarget);

-    config.writeEntry( "DownTarget", m_downTarget);

-    config.writeEntry("LeftScroll", m_leftScroll);

-    config.writeEntry("RightScroll", m_rightScroll);

-    config.writeEntry("UpScroll", m_upScroll);

-    config.writeEntry("DownScroll", m_downScroll);

-    */

-    config.writeEntry( "Repalm", reader->brepalm );

-    config.writeEntry( "HideScrollBar", m_scrollishidden );

-    config.writeEntry( "Kern", reader->bkern );

-    config.writeEntry( "Remap", reader->bremap );

-    config.writeEntry( "Peanut", reader->bpeanut );

-    config.writeEntry( "MakeBold", reader->bmakebold );

-    config.writeEntry( "Continuous", reader->m_continuousDocument );

-    config.writeEntry( "FullJust", reader->bfulljust );

-    //    config.writeEntry( "Negative", reader->bNegative );

-    config.writeEntry( "Inverse", reader->bInverse );

-    config.writeEntry( "FixGraphics", reader->m_fontControl.FixGraphics());

-    config.writeEntry( "ExtraSpace", reader->getextraspace() );

-    config.writeEntry( "ExtraLead", reader->getlead() );

-    config.writeEntry( "Basesize",  (int)reader->getBaseSize());

-    config.writeEntry( "RequestorFontChange", m_propogatefontchange);

-#ifdef USEQPE

-    config.writeEntry( "GrabKeyboard", m_grabkeyboard );

-#endif

-    if (full)

-    {

-	config.setGroup( "Toolbar" );

-	config.writeEntry("QTScrollBar", m_qtscroll);

-	config.writeEntry("LocalScrollBar", m_localscroll);

-	config.writeEntry("Movable", m_tbmovesave);

-	config.writeEntry("Policy", m_tbpolsave);

-	config.writeEntry("Position", m_tbposition);

-#ifndef USEQPE

-	if (!isMaximized() && !isMinimized())

-	  {

-	    config.setGroup( "Geometry" );

-	    config.writeEntry( "x", x() );

-	    config.writeEntry( "y", y() );

-	    config.writeEntry( "width", width() );

-	    config.writeEntry( "height", height() );

-	  }

-#endif

-    }

-}

-

-#ifdef _SCROLLPIPE

-void QTReaderApp::setpipetarget()

-{

-    m_nRegAction = cSetPipeTarget;

-    QString text = (reader->m_pipetarget.isEmpty()) ? QString("") : reader->m_pipetarget;

-    regEdit->setText(text);

-    do_regedit();

-}

-

-void QTReaderApp::do_setpipetarget(const QString& _txt)

-{

-    reader->m_pipetarget = _txt;

-}

-

-void QTReaderApp::setpause(bool sfs)

-{

-    reader->m_pauseAfterEachPara = sfs;

-}

-#endif

-

-void QTReaderApp::monospace(bool _b)

-{

-    reader->setmono(_b);

-}

-

-bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool full=false)

-{

-#ifdef USEQPE

-    QString configname;

-    Config::Domain dom;

-

-    if (full)

-    {

-	configname = _txt;

-	dom = Config::User;

-    }

-    else

-    {

-	configname = Global::applicationFileName(dirname, _txt);

-	QFileInfo fm(configname);

-	if ( !fm.exists() ) return false;

-	dom = Config::File;

-    }

-

-    Config config(configname, dom);

-    config.setGroup( "View" );

-

-#else

-	QString fullname;

-	if (full)

-	{

-	  fullname = QDir::homeDirPath() + "/" + _txt + "/" + INIFILE;

-	}

-	else

-	{

-	  fullname = QDir::homeDirPath() + "/" + dirname + "/" + _txt;

-	}

-    if (!QFile::exists(fullname)) return false;

-

-    Config config(fullname);

-#endif

-    if (full)

-    {

-	config.setGroup("Toolbar");

-	m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", m_tbmovesave);

-	m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", m_tbpolsave);

-	m_tbposition = (ToolBarDock)config.readNumEntry("Position", m_tbposition);

-    }

-    config.setGroup( "View" );

-    m_bFloatingDialog = config.readBoolEntry("FloatDialogs", m_bFloatingDialog);

-    reader->bstripcr = config.readBoolEntry( "StripCr", reader->bstripcr );

-    reader->bfulljust = config.readBoolEntry( "FullJust", reader->bfulljust );

-    reader->bInverse = config.readBoolEntry( "Inverse", reader->bInverse );

-    //    reader->bNegative = config.readBoolEntry( "Negative", false );

-    reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", reader->m_fontControl.FixGraphics() ));

-    reader->setextraspace(config.readNumEntry( "ExtraSpace", reader->getextraspace() ));

-    reader->setlead(config.readNumEntry( "ExtraLead", reader->getlead() ));

-    reader->btextfmt = config.readBoolEntry( "TextFmt", reader->btextfmt );

-    reader->bautofmt = config.readBoolEntry( "AutoFmt", reader->bautofmt );

-    reader->bstriphtml = config.readBoolEntry( "StripHtml", reader->bstriphtml );

-    reader->bpeanut = config.readBoolEntry( "Peanut", reader->bpeanut );

-    reader->bdehyphen = config.readBoolEntry( "Dehyphen", reader->bdehyphen );

-    reader->bdepluck = config.readBoolEntry( "Depluck", reader->bdepluck );

-    reader->bdejpluck = config.readBoolEntry( "Dejpluck", reader->bdejpluck );

-    reader->bonespace = config.readBoolEntry( "OneSpace", reader->bonespace );

-    reader->bunindent = config.readBoolEntry( "Unindent", reader->bunindent );

-    reader->brepara = config.readBoolEntry( "Repara", reader->brepara );

-    reader->m_reparastring = config.readEntry( "ReparaString", reader->m_reparastring);

-    m_bgtype = (bground)config.readNumEntry( "BackgroundType" , m_bgtype );

-    m_themename = config.readEntry("Theme", m_themename );

-    reader->bdblspce = config.readBoolEntry( "DoubleSpace", reader->bdblspce );

-    reader->bindenter = config.readNumEntry( "Indent", reader->bindenter );

-    reader->m_textsize = config.readNumEntry( "FontSize", reader->m_textsize );

-    reader->m_delay = config.readNumEntry( "ScrollDelay", reader->m_delay);

-    reader->m_scrollstep = config.readNumEntry( "ScrollStep", reader->m_scrollstep);

-    reader->m_scrolltype = config.readNumEntry( "ScrollType", reader->m_scrolltype);

-    if (full)

-    {

-      reader->m_lastfile = config.readEntry( "LastFile", reader->m_lastfile );

-      reader->m_lastposn = config.readNumEntry( "LastPosn", reader->m_lastposn );

-    }

-    reader->m_bpagemode = config.readBoolEntry( "PageMode", reader->m_bpagemode );

-    reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", reader->m_bMonoSpaced);

-    reader->m_rotated = config.readBoolEntry( "IsRotated", reader->m_rotated );

-    m_statusstring = config.readEntry("StatusContent", m_statusstring);

-    m_statusishidden = config.readBoolEntry("StatusHidden", m_statusishidden);

-    m_background = config.readNumEntry( "Background", m_background );

-    reader->setBackground(getcolour(m_background));

-    m_foreground = config.readNumEntry( "Foreground", m_foreground );

-    reader->setForeground(getcolour(m_foreground));

-    m_scrollcolor = config.readNumEntry( "ScrollColour", m_scrollcolor);

-    setscrollcolour();

-    m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", m_scrollbarcolor);

-    setscrollbarcolour();

-    reader->hyphenate = config.readBoolEntry( "Hyphenate", reader->hyphenate );

-    //  reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false ));

-    reader->m_swapmouse = config.readBoolEntry( "SwapMouse", reader->m_swapmouse);

-    reader->m_fontname = config.readEntry( "Fontname", reader->m_fontname );

-    reader->m_encd = config.readNumEntry( "Encoding", reader->m_encd );

-    reader->m_charpc = config.readNumEntry( "CharSpacing", reader->m_charpc );

-    reader->m_overlap = config.readNumEntry( "Overlap", reader->m_overlap );

-    reader->m_abstopmargin = config.readNumEntry( "Top Margin", reader->m_abstopmargin );

-    reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", reader->m_absbottommargin );

-    reader->m_absleft_border = config.readNumEntry( "Left Margin", reader->m_absleft_border );

-    reader->m_absright_border = config.readNumEntry( "Right Margin", reader->m_absright_border );

-    m_scrollishidden = config.readBoolEntry( "HideScrollBar", m_scrollishidden );

-    reader->brepalm = config.readBoolEntry( "Repalm", reader->brepalm );

-    reader->bkern = config.readBoolEntry( "Kern", reader->bkern );

-    reader->bremap = config.readBoolEntry( "Remap", reader->bremap );

-    reader->bmakebold = config.readBoolEntry( "MakeBold", reader->bmakebold );

-    reader->setContinuous(config.readBoolEntry( "Continuous", reader->m_continuousDocument ));

-    m_targetapp = config.readEntry( "TargetApp", m_targetapp );

-    m_targetmsg = config.readEntry( "TargetMsg", m_targetmsg );

-#ifdef _SCROLLPIPE

-    reader->m_pipetarget = config.readEntry( "PipeTarget", reader->m_pipetarget );

-    reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );

-#endif

-    m_twoTouch = config.readBoolEntry( "TwoTouch", m_twoTouch);

-    m_doAnnotation = config.readBoolEntry( "Annotation", m_doAnnotation);

-    m_doDictionary = config.readBoolEntry( "Dictionary", m_doDictionary);

-    m_doClipboard = config.readBoolEntry( "Clipboard", m_doClipboard);

-#ifdef USEQPE

-    m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", m_grabkeyboard);

-#endif

-    m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", m_propogatefontchange);

-    reader->setBaseSize(config.readNumEntry( "Basesize", reader->getBaseSize() ));

-    reader->setTwoTouch(m_twoTouch);

-

-    m_touch_action->setOn(m_twoTouch);

-    m_setmono_action->setOn(reader->m_bMonoSpaced);

-    setfontHelper(reader->m_fontname);

-    if (full)

-    {

-	addtoolbars(&config);

-    }

-    reader->setfilter(reader->getfilter());

-    reader->refresh();

-    return true;

-}

-

-bool QTReaderApp::PopulateConfig(const char* tgtdir, bool usedirs)

-{

-    bkmkselector->clear();

-    bkmkselector->setText("Cancel");

-#ifndef USEQPE

-    int cnt = 0;

-

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-	d = QDir::home();

-	d.mkdir(APPDIR);

-	d.cd(APPDIR);

-    }

-    if ( !d.cd(tgtdir) ) {                       // "/tmp"

-        qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );

-	d = QDir::home();

-	d.mkdir(tgtdir);

-	d.cd(tgtdir);

-    }

-    d.setFilter( ((usedirs) ? QDir::Dirs : QDir::Files) | QDir::NoSymLinks );

-//        d.setSorting( QDir::Size | QDir::Reversed );

-

-    const QFileInfoList *list = d.entryInfoList();

-    QFileInfoListIterator it( *list );      // create list iterator

-    QFileInfo *fi;                          // pointer for traversing

-

-    while ( (fi=it.current()) ) {           // for each file...

-  

-	bkmkselector->insertItem(fi->fileName());

-	cnt++;

-			

-	//qDebug( "%10li %s", fi->size(), fi->fileName().data() );

-	++it;                               // goto next list element

-    }

- 

-#else /* USEQPE */

-    int cnt = 0;

-    DIR *d;

-    char* finaldir;

-    finaldir = new char[strlen(APPDIR)+1+strlen(tgtdir)+1];

-    strcpy(finaldir, APPDIR);

-    strcat(finaldir, "/");

-    strcat(finaldir, tgtdir);

-    d = opendir((const char *)Global::applicationFileName(finaldir,""));

-

-    while(1)

-    {

-	struct dirent* de;

-	struct stat buf;

-	de = readdir(d);

-	if (de == NULL) break;

-

-	if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && ((usedirs && S_ISDIR(buf.st_mode)) || (!usedirs && S_ISREG(buf.st_mode))))

-	{

-	    bkmkselector->insertItem(de->d_name);

-	    cnt++;

-	}

-    }

-    delete [] finaldir;

-    closedir(d);

-#endif

-    return (cnt > 0);

-}

-

-void QTReaderApp::LoadTheme()

-{

-    if (PopulateConfig("Themes", true))

-      {

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-	m_nBkmkAction = cLdTheme;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No config files");

-}

-

-void QTReaderApp::LoadConfig()

-{

-    if (PopulateConfig("configs"))

-      {

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-	m_nBkmkAction = cLdConfig;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No config files");

-}

-

-void QTReaderApp::TidyConfig()

-{

-    if (PopulateConfig("configs"))

-      {

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-	m_nBkmkAction = cRmConfig;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No config files");

-}

-

-void QTReaderApp::ExportLinks()

-{

-    if (PopulateConfig("urls"))

-      {

-        editorStack->raiseWidget( bkmkselector );

-        hidetoolbars();

-	m_nBkmkAction = cExportLinks;

-      }

-    else

-      QMessageBox::information(this, PROGNAME, "No url files");

-}

-

-void QTReaderApp::OnURLSelected(const QString& href, const size_t tgt)

-{

-#ifndef USEQPE

-  qDebug("URL:%s", (const char*)href);

-  int col = href.find(':');

-  if (col > 0)

-    {

-      QString type = href.left(col);

-      qDebug("Type:%s", (const char*)type);

-    }

-  else

-    {

-      qDebug("No type");

-    }

-#else

-  if (href.isEmpty())

-    {

-      QMessageBox::information(this, PROGNAME, "No URL information supplied");

-    }

-  else

-    {

-      CURLDialog* urld = new CURLDialog(href, false, this);

-      urld->clipboard(m_url_clipboard);

-      urld->localfile(m_url_localfile);

-      urld->globalfile(m_url_globalfile);

-      if (urld->exec())

-	{

-	  m_url_clipboard = urld->clipboard();

-	  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);

-	    }

-	  if (m_url_localfile)

-	    {

-	      writeUrl(reader->m_string, href);

-	    }

-	  if (m_url_globalfile)

-	    {

-	      writeUrl("GlobalURLFile", href);

-	    }

-	}

-      delete urld;

-    }

-#endif

-}

-

-void QTReaderApp::writeUrl(const QString& file, const QString& href)

-{

-    QString filename;

-#ifdef USEQPE

-    filename = Global::applicationFileName(APPDIR "/urls", file);

-#else

-    QFileInfo fi;

-    QDir d = QDir::home();                      // "/"

-    if ( !d.cd(APPDIR) )

-    {                       // "/tmp"

-	qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

-	d = QDir::home();

-	d.mkdir(APPDIR);

-	d.cd(APPDIR);

-    }

-    if ( !d.cd("urls") )

-    {                       // "/tmp"

-	qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );

-	d = QDir::home();

-	d.cd(APPDIR);

-	d.mkdir("urls");

-	d.cd("urls");

-    }

-    fi.setFile(d, file);

-    filename = fi.absFilePath();

-#endif

-    FILE* fout = fopen(filename, "a");

-    if (fout != NULL)

-    {

-	fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href);

-	fclose(fout);

-    }

-    else

-    {

-	QMessageBox::warning(this, PROGNAME, "Problem with writing URL");

-    }

-}

-

-QColor QTReaderApp::getcolour(int _c)

-{

-  QColor c = white;

-  switch (_c)

-    {

-    case 0:

-      c = white;

-      break;

-    case 1:

-      c = black;

-      break;

-    case 2:

-      c = darkGray;

-      break;

-    case 3:

-      c = gray;

-      break;

-    case 4:

-      c = lightGray;

-      break;

-    case 5:

-      c = red;

-      break;

-    case 6:

-      c = green;

-      break;

-    case 7:

-      c = blue;

-      break;

-    case 8:

-      c = cyan;

-      break;

-    case 9:

-      c = magenta;

-      break;

-    case 10:

-      c = yellow;

-      break;

-    case 11:

-      c = darkRed;

-      break;

-    case 12:

-      c = darkGreen;

-      break;

-    case 13:

-      c = darkBlue;

-      break;

-    case 14:

-      c = darkCyan;

-      break;

-    case 15:

-      c = darkMagenta;

-      break;

-    case 16:

-      c = darkYellow;

-      break;

-    default:

-      c = lightGray;

-      break;

-    }

-  return c;

-}

-

-void QTReaderApp::setscrollcolour()

-{

-  /*

-  QColor xc = getcolour(m_scrollcolor);

-  int r,g,b;

-  xc.rgb(&r,&g,&b);

-  reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b);

-  */

-  reader->m_scrollcolor = getcolour(m_scrollcolor);

-}

-

-void QTReaderApp::setscrollbarcolour()

-{

-  /*

-  QColor xc = getcolour(m_scrollcolor);

-  int r,g,b;

-  xc.rgb(&r,&g,&b);

-  reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b);

-  */

-  reader->m_scrollbarcolor = getcolour(m_scrollbarcolor);

-}

-

-void QTReaderApp::forceopen(const QString& filename)

-{

-  /*

-    QFileInfo fi(reader->m_lastfile);

-    fi = QFileInfo(filename);

-    QString flnm = fi.absFilePath();

-  */

-  if (!filename.isEmpty())

-    {

-      updatefileinfo();

-      if (pBkmklist != NULL)

-	{

-	  if (m_fBkmksChanged)

-	    {

-	      savebkmks();

-	    }     

-	  delete pBkmklist;

-	  pBkmklist = NULL;

-	  m_fBkmksChanged = false;

-	}

-      reader->disableAutoscroll();

-      openFile(filename);

-      reader->setFocus();

-    }

-}

-

-void QTReaderApp::actionscroll(int v)

-{

-  if (reader->m_rotated)

-    {

-      reader->dopageup(reader->buffdoc.startSection()+reader->buffdoc.endSection()-v);

-    }

-  else

-    {

-      /*

-      if (reader->pagelocate() < v)

-	{

-	  while (reader->pagelocate() < v) reader->lineDown();

-	}

-      else

-      */

-	reader->locate(v);

-    }

-}

-

-void QTReaderApp::setBackgroundBitmap()

-{

-#ifdef USEQPE

-  QString file = APPDIR "/Themes/";

-  file += m_themename;

-    QString tgt = Global::applicationFileName(file,"background");

-#else

-    QString tgt(QDir::homeDirPath());

-    tgt += QString("/" APPDIR "/Themes/") + m_themename + "/background";

-#endif

-    qDebug("Trying to load %s", (const char *)tgt);

-    QPixmap pm(tgt);

-    reader->setBackgroundBitmap(pm, m_bgtype);

-}

-

-/*

-

-     myChannel = new QCopChannel( "QPE/FooBar", this );

-      connect( myChannel, SIGNAL(received(const QCString &, const QByteArray &)),

-               this, SLOT(fooBarMessage( const QCString &, const QByteArray &)) );

-  

-*/

+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS.  Allrights reserved.
+**
+** This file is part of Qt Palmtop Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** 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>
+#ifdef USEQPE
+#include <qpe/qpemenubar.h>
+#include <qpe/qpetoolbar.h>
+#endif
+#include <qmenubar.h>
+#include <qtoolbar.h>
+#ifdef USEQPE
+#include <qpe/menubutton.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>
+#include <qstatusbar.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 "util.h"
+#include <qfontdatabase.h>
+#ifdef USEQPE
+#include <qpe/resource.h>
+#ifdef OPIE
+//#include <qpe/applnk.h>
+#include <opie2/ofiledialog.h>
+using namespace Opie::Ui;
+#else
+#include "fileBrowser.h"
+#endif
+#else
+#include "qfiledialog.h"
+#endif
+
+#include "QTReaderApp.h"
+#include "CDrawBuffer.h"
+#include "Filedata.h"
+#include "useqpe.h"
+#include "names.h"
+#include "CEncoding_tables.h"
+#include "CloseDialog.h"
+
+#include "ButtonPrefs.h"
+
+bool CheckVersion(int&, int&, char&);
+
+#ifdef _WINDOWS
+#define PICDIR "c:\\uqtreader\\pics\\"
+#else
+#ifdef USEQPE
+#define USEMSGS
+#define PICDIR "opie-reader/"
+#else
+//#define PICDIR "/home/tim/uqtreader/pics/"
+QString picdir()
+{
+  QString hd(getenv("READERDIR"));
+  return hd + "/pics";
+}
+#define PICDIR picdir()
+#endif
+#endif
+
+unsigned long QTReaderApp::m_uid = 0;
+
+void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); }
+
+#ifdef USEQPE
+#define geticon(iconname) Resource::loadPixmap( iconname )
+#define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname )
+#else
+//#define geticon(iconname) QPixmap(PICDIR iconname ".png")
+#define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png")
+#define getmyicon(iconname) geticon(iconname)
+//#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) )
+#endif
+
+#ifndef _WINDOWS
+#include <unistd.h>
+#endif
+#include <stddef.h>
+#ifndef _WINDOWS
+#include <dirent.h>
+#endif
+
+void QTReaderApp::listBkmkFiles()
+{
+    bkmkselector->clear();
+    bkmkselector->setText("Cancel");
+#ifndef USEQPE
+    int cnt = 0;
+
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+		d = QDir::home();
+		d.mkdir(APPDIR);
+		d.cd(APPDIR);
+    }
+
+
+  
+		
+        d.setFilter( QDir::Files | QDir::NoSymLinks );
+//        d.setSorting( QDir::Size | QDir::Reversed );
+
+        const QFileInfoList *list = d.entryInfoList();
+        QFileInfoListIterator it( *list );      // create list iterator
+        QFileInfo *fi;                          // pointer for traversing
+
+        while ( (fi=it.current()) ) {           // for each file...
+  
+		    bkmkselector->insertItem(fi->fileName());
+		    cnt++;
+			
+			//qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+            ++it;                               // goto next list element
+        }
+ 
+#else /* USEQPE */
+    int cnt = 0;
+    DIR *d;
+    d = opendir((const char *)Global::applicationFileName(APPDIR,""));
+
+    while(1)
+    {
+	struct dirent* de;
+	struct stat buf;
+	de = readdir(d);
+	if (de == NULL) break;
+
+	if (lstat((const char *)Global::applicationFileName(APPDIR,de->d_name),&buf) == 0 && S_ISREG(buf.st_mode))
+	{
+	    bkmkselector->insertItem(de->d_name);
+	    cnt++;
+	}
+    }
+
+    closedir(d);
+#endif
+    if (cnt > 0)
+      {
+//tjw        menu->hide();
+
+
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+	m_nBkmkAction = cRmBkmkFile;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No bookmark files");
+}
+
+void QTReaderApp::hidetoolbars()
+{
+  if (m_scrollbar != NULL) m_scrollbar->hide();
+  if (m_prog != NULL) m_prog->hide();
+
+#ifdef USEQPE
+    menubar->hide();
+#endif
+
+    if (m_scrollbar != NULL) m_scrollbar->hide();
+
+    if (fileBar != NULL) fileBar->hide();
+    if (viewBar != NULL) viewBar->hide();
+    if (navBar != NULL) navBar->hide();
+    if (markBar != NULL) markBar->hide();
+    if (m_fontVisible) m_fontBar->hide();
+    if (regVisible)
+    {
+#ifdef USEQPE
+		Global::hideInputMethod();
+#endif
+	regBar->hide();
+    }
+    if (searchVisible)
+    {
+#ifdef USEQPE
+		Global::hideInputMethod();
+#endif
+	searchBar->hide();
+    }
+}
+
+QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
+    : QMainWindow( parent, name, f ), m_dontSave(false),
+      fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL), m_scrollbar(NULL), m_localscroll(2), m_hidebars(false), m_kmapchanged(false)
+{
+  {
+    setKeyCompression ( true );
+#ifndef USEQPE
+  QDir d = QDir::home();                      // "/"
+  d.cd(APPDIR);
+  QFileInfo fi(d, ".keymap");
+  FILE* f = fopen((const char *)fi.absFilePath(), "r");
+#else /* USEQPE */
+  FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "r");
+#endif /* USEQPE */
+  if (f != NULL)
+    {
+      uint cnt;
+      if ((fread(&cnt, sizeof(cnt), 1, f) != 0) && (cnt == KEYMAPVERSION))
+	{
+	  if (fread(&cnt, sizeof(cnt), 1, f) == 0) cnt = 0;
+	  for (uint i = 0; i != cnt; i++)
+	    {
+	      orKey key;
+	      int data;
+	      fread(&key, sizeof(key), 1, f);
+	      fread(&data, sizeof(data), 1, f);
+	      kmap[key] = data;
+	    }
+	}
+      fclose(f);
+    }
+  }
+
+	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"));
+
+    m_bcloseDisabled = true;
+    m_disableesckey = false;
+    pBkmklist = NULL;
+    pOpenlist = NULL;
+//    doc = 0;
+
+	m_fBkmksChanged = false;
+    
+  QString lang = getenv( "LANG" );
+  QString rot = getenv( "QWS_DISPLAY" );
+
+/*
+  int m_rot = 0;
+  if (rot.contains("Rot90"))
+  {
+      m_rot = 90;
+  }
+  else if (rot.contains("Rot180"))
+  {
+      m_rot = 180;
+  }
+  else if (rot.contains("Rot270"))
+  {
+      m_rot = 270;
+  }
+
+//  qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
+*/
+  m_autogenstr = "^ *[A-Z].*[a-z] *$";
+
+#ifdef USEQPE
+    setIcon( Resource::loadPixmap( PICDIR  "uqtreader") );
+#else
+    setIcon( QPixmap (PICDIR  + "/uqtreader.png") );
+#endif /* USEQPE */
+
+//    QPEToolBar *bar = new QPEToolBar( this );
+//    menubar = new QPEToolBar( this );
+#ifdef USEQPE
+  Config config( APPDIR );
+#else
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+		d = QDir::home();
+		d.mkdir(APPDIR);
+		d.cd(APPDIR);
+    }
+    QFileInfo fi(d, INIFILE);
+//    qDebug("Path:%s", (const char*)fi.absFilePath());
+    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);
+    m_qtscroll = config.readNumEntry("QTScrollBar", false);
+    m_localscroll = config.readNumEntry("LocalScrollBar", false);
+
+//    fileBar = new QToolBar("File", this);
+//    QToolBar* viewBar = new QToolBar("File", this);
+//    QToolBar* navBar = new QToolBar("File", this);
+//    QToolBar* markBar = new QToolBar("File", this);
+
+#ifdef USEQPE
+    menubar = new QToolBar("Menus", this, m_tbposition);
+    mb = new QPEMenuBar( menubar );
+#else
+    mb = new QMenuBar( this );
+#endif
+
+#ifdef USEQPE
+    QPopupMenu* tmp = new QPopupMenu(mb);
+    mb->insertItem( geticon( "AppsIcon" ), tmp );
+#else
+    QMenuBar* tmp = mb;
+#endif
+
+    QPopupMenu *file = new QPopupMenu( mb );
+    tmp->insertItem( tr( "File" ), file );
+
+    QPopupMenu *navigation = new QPopupMenu(mb);
+    tmp->insertItem( tr( "Navigation" ), navigation );
+
+    QPopupMenu *view = new QPopupMenu( mb );
+    tmp->insertItem( tr( "View" ), view );
+
+    QPopupMenu *marks = new QPopupMenu( this );
+    tmp->insertItem( tr( "Marks" ), marks );
+
+    QPopupMenu *settings = new QPopupMenu( this );
+    tmp->insertItem( tr( "Settings" ), settings );
+
+//    addToolBar(menubar, "Menus",QMainWindow::Top);
+//    addToolBar(fileBar, "Toolbar",QMainWindow::Top);
+
+    //    QPopupMenu *edit = new QPopupMenu( this );
+
+    /*
+    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
+    a->addTo( bar );
+    a->addTo( file );
+    */
+    QWidget* widge = new QWidget(this);
+    setCentralWidget( widge );
+    QVBoxLayout* vlayout = new QVBoxLayout(widge);
+    m_layout = new QBoxLayout(QBoxLayout::LeftToRight);
+    m_prog = new QLabel(widge);
+    vlayout->addLayout(m_layout, 1);
+    vlayout->addWidget(m_prog);
+
+    editorStack = new QWidgetStack( widge );
+    //    setCentralWidget( editorStack );
+
+    searchVisible = FALSE;
+    regVisible = FALSE;
+    m_fontVisible = false;
+
+    m_buttonprefs = new CButtonPrefs(&kmap, this);
+    editorStack->addWidget(m_buttonprefs, get_unique_id());
+    connect( m_buttonprefs, SIGNAL( Closed() ), this, SLOT( infoClose() ) );
+
+
+    m_annoWin = new CAnnoEdit(editorStack);
+    editorStack->addWidget(m_annoWin, get_unique_id());
+    connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) );
+    connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) );
+
+    m_infoWin = new infowin(editorStack);
+    editorStack->addWidget(m_infoWin, get_unique_id());
+    connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) );
+
+    m_graphicwin = new GraphicWin(editorStack);
+    editorStack->addWidget(m_graphicwin, get_unique_id());
+    connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) );
+
+//    bkmkselector = new QListBox(editorStack, "Bookmarks");
+    bkmkselector = new CBkmkSelector(editorStack, "Bookmarks");
+    //    connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) );
+    connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) );
+    connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) );
+    editorStack->addWidget( bkmkselector, get_unique_id() );
+
+/*
+    importSelector = new FileSelector( "*", editorStack, "importselector", false );
+    connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) );
+
+    editorStack->addWidget( importSelector, get_unique_id() );
+
+    // don't need the close visible, it is redundant...
+    importSelector->setCloseVisible( FALSE );
+*/    
+//    qDebug("Reading file list");
+    readfilelist();
+
+    reader = new QTReader( editorStack );
+
+    reader->setDoUpdates(false);
+
+#ifdef USEQPE
+    ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
+#endif
+
+//    qDebug("Reading config");
+//  Config config( APPDIR );
+  config.setGroup( "View" );
+  m_debounce = config.readNumEntry("Debounce", 0);
+  m_buttonprefs->Debounce(m_debounce);
+#ifdef USEQPE
+  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
+#else
+  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", true);
+#endif
+  reader->setStripCR(config.readBoolEntry( "StripCr", true ));
+  reader->bfulljust = config.readBoolEntry( "FullJust", false );
+  /*
+  bool btmp = config.readBoolEntry("Negative", false);
+  if (btmp) reader->setNegative();
+  */
+  reader->bInverse = config.readBoolEntry("Inverse", false);
+  reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", false ));
+  reader->setextraspace(config.readNumEntry( "ExtraSpace", 0 ));
+  reader->setlead(config.readNumEntry( "ExtraLead", 0 ));
+  reader->btextfmt = config.readBoolEntry( "TextFmt", false );
+  reader->bautofmt = config.readBoolEntry( "AutoFmt", true );
+  reader->bstriphtml = config.readBoolEntry( "StripHtml", false );
+  reader->bpeanut = config.readBoolEntry( "Peanut", false );
+  reader->bdehyphen = config.readBoolEntry( "Dehyphen", false );
+  reader->bdepluck = config.readBoolEntry( "Depluck", false );
+  reader->bdejpluck = config.readBoolEntry( "Dejpluck", false );
+  reader->bonespace = config.readBoolEntry( "OneSpace", false );
+  reader->bunindent = config.readBoolEntry( "Unindent", false );
+  reader->brepara = config.readBoolEntry( "Repara", false );
+  reader->m_reparastring = config.readEntry( "ReparaString", "\\n{[\\n \\t]}");
+  m_bgtype = (bground)config.readNumEntry( "BackgroundType" , 0 );
+  m_themename = config.readEntry("Theme", QString::null );
+  reader->bdblspce = config.readBoolEntry( "DoubleSpace", false );
+  reader->bindenter = config.readNumEntry( "Indent", 0 );
+  reader->m_textsize = config.readNumEntry( "FontSize", 12 );
+  reader->m_delay = config.readNumEntry( "ScrollDelay", 5184);
+  reader->m_scrollstep = config.readNumEntry( "ScrollStep", 1);
+
+  reader->m_lastfile = config.readEntry( "LastFile", QString::null );
+  reader->m_lastposn = config.readNumEntry( "LastPosn", 0 );
+  reader->m_bpagemode = config.readBoolEntry( "PageMode", true );
+  reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", false);
+  reader->m_rotated = config.readBoolEntry( "IsRotated", false );
+  reader->m_scrolltype = config.readNumEntry( "ScrollType", 0 );
+  m_statusstring = config.readEntry("StatusContent", "%P%% Doc:%d/%D %p%% %z%%");
+  m_statusishidden = config.readBoolEntry("StatusHidden", false);
+  m_background = config.readNumEntry( "Background", 0 );
+  reader->setBackground(getcolour(m_background));
+  m_foreground = config.readNumEntry( "Foreground", 1 );
+  reader->setForeground(getcolour(m_foreground));
+  m_scrollcolor = config.readNumEntry( "ScrollColour", 5 );
+  setscrollcolour();
+  m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", 5 );
+  setscrollbarcolour();
+  reader->hyphenate = config.readBoolEntry( "Hyphenate", false );
+  reader->m_swapmouse = config.readBoolEntry( "SwapMouse", false);
+  reader->m_fontname = config.readEntry( "Fontname", "helvetica" );
+  reader->m_encd = config.readNumEntry( "Encoding", 0 );
+  reader->m_charpc = config.readNumEntry( "CharSpacing", 100 );
+  reader->m_overlap = config.readNumEntry( "Overlap", 0 );
+  reader->m_abstopmargin = config.readNumEntry( "Top Margin", 100 );
+  reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", 100 );
+  reader->m_absleft_border = config.readNumEntry( "Left Margin", 100 );
+  reader->m_absright_border = config.readNumEntry( "Right Margin", 100 );
+
+  m_scrollishidden = config.readBoolEntry( "HideScrollBar", false );
+
+  reader->brepalm = config.readBoolEntry( "Repalm", false );
+  reader->bkern = config.readBoolEntry( "Kern", false );
+  reader->bremap = config.readBoolEntry( "Remap", true );
+  reader->bmakebold = config.readBoolEntry( "MakeBold", false );
+  reader->setContinuous(config.readBoolEntry( "Continuous", true ));
+  m_targetapp = config.readEntry( "TargetApp", QString::null );
+  m_targetmsg = config.readEntry( "TargetMsg", QString::null );
+#ifdef _SCROLLPIPE
+  reader->m_pipetarget = config.readEntry( "PipeTarget", QString::null );
+  reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", true );
+#endif
+  m_twoTouch = config.readBoolEntry( "TwoTouch", false);
+  m_doAnnotation = config.readBoolEntry( "Annotation", false);
+  m_doDictionary = config.readBoolEntry( "Dictionary", false);
+  m_doClipboard = config.readBoolEntry( "Clipboard", false);
+  /*
+  m_spaceTarget = (ActionTypes)config.readNumEntry("SpaceTarget", cesAutoScroll);
+  m_escapeTarget = (ActionTypes)config.readNumEntry("EscapeTarget", cesNone);
+  m_returnTarget = (ActionTypes)config.readNumEntry("ReturnTarget", cesFullScreen);
+  m_leftTarget = (ActionTypes)config.readNumEntry("LeftTarget", cesZoomOut);
+  m_rightTarget = (ActionTypes)config.readNumEntry("RightTarget", cesZoomIn);
+  m_upTarget = (ActionTypes)config.readNumEntry("UpTarget", cesPageUp);
+  m_downTarget = (ActionTypes)config.readNumEntry("DownTarget", cesPageDown);
+
+  m_leftScroll = config.readBoolEntry("LeftScroll", false);
+  m_rightScroll = config.readBoolEntry("RightScroll", false);
+  m_upScroll = config.readBoolEntry("UpScroll", true);
+  m_downScroll = config.readBoolEntry("DownScroll", true);
+  */
+  m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", false);
+  reader->setBaseSize(config.readNumEntry( "Basesize", 10 ));
+  reader->setHyphenThreshold(config.readNumEntry( "HyphenThreshold", 50 ));
+  //  reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false ));
+#ifndef USEQPE
+	config.setGroup( "Geometry" );
+	setGeometry(0,0,
+	config.readNumEntry( "width", QApplication::desktop()->width()/2 ),
+	config.readNumEntry( "height", QApplication::desktop()->height()/2 ));
+	move(
+	config.readNumEntry( "x", 20 ),
+	config.readNumEntry( "y", 20 ));
+#else
+	m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", false);
+#endif
+
+
+
+  setTwoTouch(m_twoTouch);
+
+    connect( reader, SIGNAL( OnShowPicture(QImage&) ), this, SLOT( showgraphic(QImage&) ) );
+
+    connect( reader, SIGNAL( OnRedraw() ), this, SLOT( OnRedraw() ) );
+    connect( reader, SIGNAL( OnWordSelected(const QString&, size_t, size_t, const QString&) ), this, SLOT( OnWordSelected(const QString&, size_t, size_t, const QString&) ) );
+    connect( reader, SIGNAL( OnURLSelected(const QString&, const size_t) ), this, SLOT( OnURLSelected(const QString&, const size_t) ) );
+    connect( reader, SIGNAL( NewFileRequest(const QString&) ), this, SLOT( forceopen(const QString&) ) );
+    connect( reader, SIGNAL( HandleKeyRequest(QKeyEvent*) ), this, SLOT( handlekey(QKeyEvent*) ) );
+    connect( reader, SIGNAL( SetScrollState(bool) ), this, SLOT( setScrollState(bool) ) );
+    connect( reader, SIGNAL(RefreshBitmap()), this, SLOT(setBackgroundBitmap()));
+    editorStack->addWidget( reader, get_unique_id() );
+
+    m_preferences_action = new QAction( tr( "Configuration" ), geticon( "SettingsIcon" ), QString::null, 0, this, NULL);
+    connect( m_preferences_action, SIGNAL( activated() ), this, SLOT( showprefs() ) );
+    m_preferences_action->addTo( settings );
+
+    m_saveconfig_action = new QAction( tr( "Save Config" ), QString::null, 0, this, NULL);
+    connect( m_saveconfig_action, SIGNAL( activated() ), this, SLOT( SaveConfig() ) );
+    m_saveconfig_action->addTo( settings );
+
+    m_loadconfig_action = new QAction( tr( "Load Config" ), QString::null, 0, this, NULL);
+    connect( m_loadconfig_action, SIGNAL( activated() ), this, SLOT( LoadConfig() ) );
+    m_loadconfig_action->addTo( settings );
+
+    m_tidyconfig_action = new QAction( tr( "Delete Config" ), QString::null, 0, this, NULL);
+    connect( m_tidyconfig_action, SIGNAL( activated() ), this, SLOT( TidyConfig() ) );
+    m_tidyconfig_action->addTo( settings );
+
+    settings->insertSeparator();
+    m_toolbarprefs_action = new QAction( tr( "Toolbars" ), QString::null, 0, this, NULL);
+    connect( m_toolbarprefs_action, SIGNAL( activated() ), this, SLOT( showtoolbarprefs() ) );
+    m_toolbarprefs_action->addTo( settings );
+
+    m_buttonprefs_action = new QAction( tr( "Buttons" ), QString::null, 0, this, NULL);
+    connect( m_buttonprefs_action, SIGNAL( activated() ), this, SLOT( showbuttonprefs() ) );
+    m_buttonprefs_action->addTo( settings );
+
+    m_loadtheme_action = new QAction( tr( "Load Theme" ), QString::null, 0, this, NULL);
+    connect( m_loadtheme_action, SIGNAL( activated() ), this, SLOT( LoadTheme() ) );
+    m_loadtheme_action->addTo( settings );
+
+    m_repara_action = new QAction( tr( "EOP Marker" ),  QString::null, 0, this, NULL);
+    connect( m_repara_action, SIGNAL( activated() ), this, SLOT( reparastring() ) );
+    m_repara_action->addTo(settings);
+
+#ifdef USEQPE
+    m_grab_action = new QAction( tr( "Grab Buttons" ), QString::null, 0, this, NULL, true );
+    connect( m_grab_action, SIGNAL( toggled(bool) ), this, SLOT( setgrab(bool) ) );
+    m_grab_action->setOn(m_grabkeyboard);
+    m_grab_action->addTo( settings );
+#endif
+
+    m_open_action = new QAction( tr( "Open" ), geticon( "fileopen" ), QString::null, 0, this, 0 );
+    connect( m_open_action, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
+    m_open_action->addTo( file );
+
+    m_close_action = new QAction( tr( "Close" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( m_close_action, SIGNAL( activated() ), this, SLOT( fileClose() ) );
+    m_close_action->addTo( file );
+
+#ifdef _SCRIPT
+    a = new QAction( tr( "Run Script" ), QString::null, 0, this, NULL);
+    connect( a, SIGNAL( activated() ), this, SLOT( RunScript() ) );
+    a->addTo( file );
+#endif
+    /*
+    a = new QAction( tr( "Revert" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( fileRevert() ) );
+    a->addTo( file );
+
+    a = new QAction( tr( "Cut" ), geticon( "cut" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
+    a->addTo( filebar() );
+    a->addTo( edit );
+    */
+
+    m_info_action = new QAction( tr( "Info" ), geticon( "UtilsIcon" ), QString::null, 0, this, NULL);
+    connect( m_info_action, SIGNAL( activated() ), this, SLOT( showinfo() ) );
+    m_info_action->addTo( file );
+
+    m_touch_action = new QAction( tr( "Two/One Touch" ), geticon( "1to1" ), QString::null, 0, this, NULL, true );
+    connect( m_touch_action, SIGNAL( toggled(bool) ), this, SLOT( setTwoTouch(bool) ) );
+    m_touch_action->setOn(m_twoTouch);
+    m_touch_action->addTo( file );
+
+    m_find_action = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, NULL);
+     connect( m_find_action, SIGNAL( activated() ), this, SLOT( editFind() ) );
+     file->insertSeparator();
+//     a->addTo( bar );
+     m_find_action->addTo( file );
+
+    m_exportlinks_action = new QAction( tr( "Export Links" ), QString::null, 0, this, NULL);
+    connect( m_exportlinks_action, SIGNAL( activated() ), this, SLOT( ExportLinks() ) );
+    m_exportlinks_action->addTo( file );
+
+    m_scrollButton = new QAction( tr( "Scroll" ), getmyicon( "panel-arrow-down" ), QString::null, 0, this, 0, true );
+    connect( m_scrollButton, SIGNAL( toggled(bool) ), this, SLOT( autoScroll(bool) ) );
+    m_scrollButton->addTo(navigation);
+    m_scrollButton->setOn(false);
+
+    m_start_action = new QAction( tr( "Goto Start" ), geticon( "start" ), QString::null, 0, this, NULL);
+    connect( m_start_action, SIGNAL( activated() ), this, SLOT( gotoStart() ) );
+    m_start_action->addTo(navigation);
+
+    m_end_action = new QAction( tr( "Goto End" ), geticon( "finish" ), QString::null, 0, this, NULL);
+    connect( m_end_action, SIGNAL( activated() ), this, SLOT( gotoEnd() ) );
+    m_end_action->addTo(navigation);
+
+    m_jump_action = new QAction( tr( "Jump" ), geticon( "rotate" ), QString::null, 0, this, NULL);
+    connect( m_jump_action, SIGNAL( activated() ), this, SLOT( jump() ) );
+    m_jump_action->addTo(navigation);
+
+    m_pageline_action = new QAction( tr( "Page/Line Scroll" ), geticon( "pass" ), QString::null, 0, this, NULL, true );
+    connect( m_pageline_action, SIGNAL( toggled(bool) ), this, SLOT( pagemode(bool) ) );
+    m_pageline_action->addTo(navigation);
+    m_pageline_action->setOn(reader->m_bpagemode);
+
+    m_pageup_action = new QAction( tr( "Up" ), geticon( "up" ), QString::null, 0, this, 0 );
+    connect( m_pageup_action, SIGNAL( activated() ), this, SLOT( pageup() ) );
+    m_pageup_action->addTo( navigation );
+    
+    m_pagedn_action = new QAction( tr( "Down" ), geticon( "down" ), QString::null, 0, this, 0 );
+    connect( m_pagedn_action, SIGNAL( activated() ), this, SLOT( pagedn() ) );
+    m_pagedn_action->addTo( navigation );
+
+    m_back_action = new QAction( tr( "Back" ), geticon( "back" ), QString::null, 0, this, 0 );
+    connect( m_back_action, SIGNAL( activated() ), reader, SLOT( goBack() ) );
+    m_back_action->addTo( navigation );
+
+    m_home_action = new QAction( tr( "Home" ), geticon( "home" ), QString::null, 0, this, 0 );
+    connect( m_home_action, SIGNAL( activated() ), reader, SLOT( goHome() ) );
+    m_home_action->addTo( navigation );
+
+    m_forward_action = new QAction( tr( "Forward" ), geticon( "forward" ), QString::null, 0, this, 0 );
+    connect( m_forward_action, SIGNAL( activated() ), reader, SLOT( goForward() ) );
+    m_forward_action->addTo( navigation );
+
+    /*
+    a = new QAction( tr( "Find" ), QString::null, 0, this, NULL, true );
+    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );
+    a->addTo( file );
+
+    a = new QAction( tr( "Find Again" ), QString::null, 0, this, NULL, true );
+    //    connect( a, SIGNAL( activated() ), this, SLOT( pagedn() ) );
+    a->addTo( file );
+    */
+
+//    file->insertSeparator();
+
+#ifdef _SCROLLPIPE
+
+    QActionGroup* ag = new QActionGroup(this);
+    ag->setExclusive(false);
+    spacemenu = new QPopupMenu(this);
+    file->insertItem( tr( "Scrolling" ), spacemenu );
+
+    a = new QAction( tr( "Set Target" ), QString::null, 0, ag, NULL);
+    connect( a, SIGNAL( activated() ), this, SLOT( setpipetarget() ) );
+
+    a = new QAction( tr( "Pause Paras" ), QString::null, 0, ag, NULL, true );
+    connect( a, SIGNAL( toggled(bool) ), this, SLOT( setpause(bool) ) );
+    a->setOn(reader->m_pauseAfterEachPara);
+
+    ag->addTo(spacemenu);
+//    file->insertSeparator();
+
+#endif
+
+/*
+    a = new QAction( tr( "Import" ), QString::null, 0, this, NULL );
+    connect( a, SIGNAL( activated() ), this, SLOT( importFiles() ) );
+    a->addTo( file );
+*/
+
+    /*
+    a = new QAction( tr( "Paste" ), geticon( "paste" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
+    a->addTo( fileBar );
+    a->addTo( edit );
+    */
+
+//     a = new QAction( tr( "Find..." ), geticon( "find" ), QString::null, 0, this, 0 );
+
+     m_fullscreen = false;
+    m_actFullscreen = new QAction( tr( "Fullscreen" ), geticon( "fullscreen" ), QString::null, 0, this, NULL, true );
+    connect( m_actFullscreen, SIGNAL( toggled(bool) ), this, SLOT( setfullscreen(bool) ) );
+    m_actFullscreen->setOn(m_fullscreen);
+    m_actFullscreen->addTo( view );
+
+    m_rotate_action = new QAction( tr( "Rotate" ), geticon( "repeat" ), QString::null, 0, this, NULL, true );
+    connect( m_rotate_action, SIGNAL( toggled(bool) ), this, SLOT( setrotated(bool) ) );
+    m_rotate_action->setOn(reader->m_rotated);
+    m_rotate_action->addTo( view );
+
+    m_inverse_action = new QAction( tr( "Invert" ), getmyicon( "invert" ), QString::null, 0, this, NULL, true );
+    connect( m_inverse_action, SIGNAL( toggled(bool) ), this, SLOT( setinverted(bool) ) );
+    m_inverse_action->setOn(reader->bInverse);
+    m_inverse_action->addTo( view );
+
+    view->insertSeparator();
+
+    m_zoomin_action = new QAction( tr( "Zoom In" ), geticon( "zoom" ), QString::null, 0, this);
+    connect( m_zoomin_action, SIGNAL( activated() ), this, SLOT( zoomin() ) );
+    m_zoomin_action->addTo( view );
+
+    m_zoomout_action = new QAction( tr( "Zoom Out" ), geticon( "mag" ), QString::null, 0, this);
+    connect( m_zoomout_action, SIGNAL( activated() ), this, SLOT( zoomout() ) );
+    m_zoomout_action->addTo( view );
+
+    view->insertSeparator();
+    m_setfont_action = new QAction( tr( "Set Font" ), getmyicon( "font" ), QString::null, 0, this);
+    connect( m_setfont_action, SIGNAL( activated() ), this, SLOT( setfont() ) );
+    m_setfont_action->addTo( view );
+
+    view->insertSeparator();
+    m_setenc_action = new QAction( tr( "Set Encoding" ), getmyicon( "charset" ), QString::null, 0, this);
+    connect( m_setenc_action, SIGNAL( activated() ), this, SLOT( chooseencoding() ) );
+    m_setenc_action->addTo( view );
+
+    m_setmono_action = new QAction( tr( "Ideogram" ), getmyicon( "ideogram" ), QString::null, 0, this, NULL, true);
+    connect( m_setmono_action, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );
+    m_setmono_action->addTo( view );
+    m_setmono_action->setOn(reader->m_bMonoSpaced);
+
+
+    //    a = new QAction( tr( "Zoom" ), QString::null, 0, this, NULL, true );
+    //    a = new QAction( tr( "Zoom" ), geticon( "mag" ), QString::null, 0, this, 0 );
+
+
+
+    //    a->addTo( filebar() );
+//     view->insertSeparator();
+
+/*
+    a = new QAction( tr( "Ideogram/Word" ), QString::null, 0, this, NULL, true );
+    connect( a, SIGNAL( toggled(bool) ), this, SLOT( monospace(bool) ) );
+    a->setOn(reader->m_bMonoSpaced);
+    a->addTo( view );
+*/
+/*
+    a = new QAction( tr( "Set Width" ), QString::null, 0, this, NULL);
+    connect( a, SIGNAL( activated() ), this, SLOT( setspacing() ) );
+    a->addTo( view );
+*/
+
+    m_mark_action = new QAction( tr( "Bookmark" ), getmyicon( "bookmark" ), QString::null, 0, this, NULL);
+    connect( m_mark_action, SIGNAL( activated() ), this, SLOT( addbkmk() ) );
+    m_mark_action->addTo( marks );
+
+    m_annotate_action = new QAction( tr( "Annotate" ), getmyicon( "annotate" ), QString::null, 0, this, NULL);
+    connect( m_annotate_action, SIGNAL( activated() ), this, SLOT( addanno() ) );
+    m_annotate_action->addTo( marks );
+
+    m_goto_action = new QAction( tr( "Goto" ), getmyicon( "bookmark_goto" ), QString::null, 0, this, NULL, false );
+    connect( m_goto_action, SIGNAL( activated() ), this, SLOT( do_gotomark() ) );
+    m_goto_action->addTo( marks );
+
+    m_delete_action = new QAction( tr( "Delete" ), getmyicon( "bookmark_delete" ), QString::null, 0, this, NULL);
+    connect( m_delete_action, SIGNAL( activated() ), this, SLOT( do_delmark() ) );
+    m_delete_action->addTo( marks );
+
+    m_autogen_action = new QAction( tr( "Autogen" ), geticon( "exec" ), QString::null, 0, this, NULL, false );
+    connect( m_autogen_action, SIGNAL( activated() ), this, SLOT( do_autogen() ) );
+     marks->insertSeparator();
+    m_autogen_action->addTo( marks );
+
+    m_clear_action = new QAction( tr( "Clear" ), getmyicon( "bookmark_clear" ), QString::null, 0, this, NULL);
+    connect( m_clear_action, SIGNAL( activated() ), this, SLOT( clearBkmkList() ) );
+    m_clear_action->addTo( marks );
+
+    m_save_action = new QAction( tr( "Save" ), getmyicon( "bookmark_save" ), QString::null, 0, this, NULL );
+    connect( m_save_action, SIGNAL( activated() ), this, SLOT( savebkmks() ) );
+    m_save_action->addTo( marks );
+
+    m_tidy_action = new QAction( tr( "Tidy" ), getmyicon( "bookmark_tidy" ), QString::null, 0, this, NULL);
+    connect( m_tidy_action, SIGNAL( activated() ), this, SLOT( listBkmkFiles() ) );
+     marks->insertSeparator();
+    m_tidy_action->addTo( marks );
+
+    m_startBlock_action = new QAction( tr( "Start Block" ), geticon( "new" ), QString::null, 0, this, NULL);
+    connect( m_startBlock_action, SIGNAL( activated() ), this, SLOT( editMark() ) );
+    marks->insertSeparator();
+    m_startBlock_action->addTo( marks );
+
+    m_endBlock_action = new QAction( tr( "Copy Block" ), geticon( "copy" ), QString::null, 0, this, NULL);
+    connect( m_endBlock_action, SIGNAL( activated() ), this, SLOT( editCopy() ) );
+    m_endBlock_action->addTo( marks );
+
+    m_bkmkAvail = NULL;
+
+
+    setToolBarsMovable(m_tbmove);
+    addtoolbars(&config);
+
+    pbar = new QProgressBar(this);
+    pbar->hide();
+
+    searchBar = new QFloatBar( "Search", this, QMainWindow::Top, TRUE );
+
+    searchBar->setHorizontalStretchable( TRUE );
+
+    connect(searchBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
+
+    searchEdit = new QLineEdit( searchBar, "searchEdit" );
+//      QFont f("unifont", 16 /*, QFont::Bold*/);
+//      searchEdit->setFont( f );
+    searchBar->setStretchableWidget( searchEdit );
+
+
+#ifdef __ISEARCH
+    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
+	     this, SLOT( search( const QString& ) ) );
+#else
+    connect( searchEdit, SIGNAL( returnPressed( ) ),
+	     this, SLOT( search( ) ) );
+#endif
+     QAction*a = new QAction( tr( "Find Next" ), geticon( "next" ), QString::null, 0, this, 0 );
+     connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
+     a->addTo( searchBar );
+
+    a = new QAction( tr( "Close Find" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
+    a->addTo( searchBar );
+
+    searchBar->hide();
+
+    regBar = new QFloatBar( "Autogen", this, QMainWindow::Top, TRUE );
+    connect(regBar, SIGNAL( OnHide() ), this, SLOT( restoreFocus() ));
+
+    regBar->setHorizontalStretchable( TRUE );
+
+    regEdit = new QLineEdit( regBar, "regEdit" );
+//    regEdit->setFont( f );
+
+    regBar->setStretchableWidget( regEdit );
+
+    connect( regEdit, SIGNAL( returnPressed( ) ),
+	     this, SLOT( do_regaction() ) );
+
+    a = new QAction( tr( "Do Reg" ), geticon( "enter" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( do_regaction() ) );
+    a->addTo( regBar );
+
+    a = new QAction( tr( "Close Edit" ), geticon( "close" ), QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( regClose() ) );
+    a->addTo( regBar );
+
+    regBar->hide();
+
+    m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );
+
+    m_fontBar->setHorizontalStretchable( TRUE );
+
+//    qDebug("Font selector");
+    m_fontSelector = new QComboBox(false, m_fontBar);
+    m_fontBar->setStretchableWidget( m_fontSelector );
+    {
+	QFontDatabase f;
+	QStringList flist = f.families();
+	bool realfont = false;
+	for (QStringList::Iterator nm = flist.begin(); nm != flist.end(); nm++)
+	{
+	    if (reader->m_fontname == *nm)
+	    {
+		realfont = true;
+	    }
+	    if ((*nm).contains(FIXEDFONT,false)) reader->m_fontControl.hasCourier(true, *nm);
+	}
+	if (!realfont) reader->m_fontname = flist[0];
+    } // delete the FontDatabase!!!
+    connect( m_fontSelector, SIGNAL( activated(const QString& ) ),
+	     this, SLOT( do_setfont(const QString&) ) );
+    connect( m_fontSelector, SIGNAL( activated(int ) ),
+	     this, SLOT( do_setencoding(int) ) );
+
+    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");
+
+    m_layout->addWidget(editorStack);
+    if (m_qtscroll != 0)
+      {
+	/*
+	m_scrollbar = new QToolBar( "Autogen", this, (m_localscrollbar) ? QMainWindow::Left : QMainWindow::Right, TRUE );
+
+	m_scrollbar->setVerticalStretchable( TRUE );
+	*/
+	scrollbar = m_scrollbar = new QScrollBar(QScrollBar::Vertical, widge);
+	m_layout->addWidget(scrollbar);
+	scrollbar->setTracking(false);
+	//	connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );
+	//	m_scrollbar->setStretchableWidget( scrollbar );
+	if (m_scrollishidden)
+	  {
+	    m_scrollbar->hide();
+	  }
+	else
+	  {
+	    m_scrollbar->show();
+	  }
+
+	setrotated(reader->m_rotated);
+      }
+    else
+      {
+	m_scrollbar = NULL;
+      }
+    setBackgroundBitmap();
+    m_inverse_action->setOn(reader->bInverse);
+    reader->init();
+
+//    qDebug("Inited");
+//    m_buttonAction[m_spaceTarget]->setOn(true);
+//    qDebug("fonting");
+    do_setfont(reader->m_fontname);
+    //    qDebug("fonted");
+    QFont progfont(reader->m_fontname, reader->m_fontControl.getsize(0));
+    m_prog->setFont( progfont );
+    if (m_statusishidden) m_prog->hide();
+    if (!reader->m_lastfile.isEmpty())
+    {
+//	qDebug("doclnk");
+//	doc = new DocLnk(reader->m_lastfile);
+//	qDebug("doclnk done");
+	if (pOpenlist != NULL)
+	{
+
+/*
+	    int ind = 0;
+	    Bkmk* p = (*pOpenlist)[ind];
+	    while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
+	    {
+		p = (*pOpenlist)[++ind];
+	    }
+*/
+	    Bkmk* p = NULL;
+	    for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
+	    {
+		p = iter.pContent();
+		if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
+		{
+		    break;
+		}
+//		qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));
+		p = NULL;
+	    }
+	    if (p != NULL)
+	    {
+		if (!openfrombkmk(p))
+		  {
+		    showEditTools();
+		  }
+	    }
+	    else
+	    {
+		openFile( reader->m_lastfile );
+	    }
+	}
+	else
+	{
+	    if (!reader->m_lastfile.isEmpty())
+	      {
+		openFile( reader->m_lastfile );
+	      }
+	}
+    }
+    else
+    {
+      showEditTools();
+    }
+//    qApp->processEvents();
+    if (m_scrollbar == NULL || m_scrollbar->isHidden())
+      {
+	reader->m_scrollpos = m_localscroll;
+      }
+    else
+      {
+	reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;
+      }
+    reader->bDoUpdates = true;
+    reader->update();
+    config.setGroup("Version");
+    int major = config.readNumEntry("Major", 0);
+    int bkmktype = config.readNumEntry("BkmkType", 0);
+    char minor = config.readNumEntry("Minor", 0);
+    if (CheckVersion(major, bkmktype, minor))
+    {
+	config.writeEntry("Major", major);
+	config.writeEntry("BkmkType", bkmktype);
+	config.writeEntry("Minor", (int)minor);
+    }
+//    qDebug("finished update");
+    if (kmap.isEmpty())
+      {
+	QMessageBox::warning(this, PROGNAME, "You haven't mapped any keys yet!\n\nYou will be taken to the key\nmapping dialog.\nA few defaults are provided\nbut you can change then to\nsuit yourself.\n\nYou can change the key\nmapping at any time by\nselecting the Settings/Button\noption on the menu.");
+
+	m_buttonprefs->mapkey(Qt::NoButton, Key_Up, cesPageUp);
+	m_buttonprefs->mapkey(Qt::NoButton, Key_Down, cesPageDown);
+
+	m_buttonprefs->mapkey(Qt::NoButton, Key_Right, cesZoomIn);
+	m_buttonprefs->mapkey(Qt::NoButton, Key_Left, cesZoomOut);
+
+	showbuttonprefs();
+      }
+}
+
+void QTReaderApp::addtoolbars(Config* config)
+{
+    config->setGroup("Toolbar");
+
+    if (fileBar != NULL)
+    {
+#ifdef USEQPE
+	if (fileBar != menubar)
+	{
+	    fileBar->clear();
+	}
+	else
+	{
+	    m_preferences_action->removeFrom( filebar() );
+	    m_open_action->removeFrom( filebar() );
+	    m_close_action->removeFrom( filebar() );
+	    m_info_action->removeFrom( filebar() );
+	    m_touch_action->removeFrom( filebar() );
+	    m_find_action->removeFrom( filebar() );
+	}
+#else
+	fileBar->clear();
+#endif
+    }
+
+    m_preferences_action->addTo( filebar() );
+    addfilebar(config, "Open", m_open_action);
+    addfilebar(config, "Close", m_close_action);
+    addfilebar(config, "Info", m_info_action);
+    addfilebar(config, "Two/One Touch", m_touch_action);
+    addfilebar(config, "Find", m_find_action);
+
+    if (navBar != NULL)
+    {
+#ifdef USEQPE
+	if ((navBar == fileBar) && (fileBar == menubar))
+#else
+	if (navBar == fileBar)
+#endif
+	{
+	    m_scrollButton->removeFrom( navbar() );
+	    m_start_action->removeFrom( navbar() );
+	    m_end_action->removeFrom( navbar() );
+	    m_jump_action->removeFrom( navbar() );
+	    m_pageline_action->removeFrom( navbar() );
+	    m_pageup_action->removeFrom( navbar() );
+	    m_pagedn_action->removeFrom( navbar() );
+	    m_back_action->removeFrom( navbar() );
+	    m_home_action->removeFrom( navbar() );
+	    m_forward_action->removeFrom( navbar() );
+	}
+	else if (navBar != fileBar)
+	{
+	    navBar->clear();
+	}
+    }
+
+    addnavbar(config, "Scroll", m_scrollButton);
+    addnavbar(config, "Goto Start", m_start_action);
+    addnavbar(config, "Goto End", m_end_action);
+
+    addnavbar(config, "Jump", m_jump_action);
+    addnavbar(config, "Page/Line Scroll", m_pageline_action);
+
+    addnavbar(config, "Page Up", m_pageup_action);
+    addnavbar(config, "Page Down", m_pagedn_action);
+
+    addnavbar(config, "Back", m_back_action);
+    addnavbar(config, "Home", m_home_action);
+    addnavbar(config, "Forward", m_forward_action);
+
+    if (viewBar != NULL)
+    {
+#ifdef USEQPE
+	if ((viewBar == fileBar) && (fileBar == menubar))
+#else
+	if (viewBar == fileBar)
+#endif
+	{
+	    m_actFullscreen->removeFrom( filebar() );
+	    m_rotate_action->removeFrom( viewbar() );
+	    m_inverse_action->removeFrom( viewbar() );
+	    m_zoomin_action->removeFrom( viewbar() );
+	    m_zoomout_action->removeFrom( viewbar() );
+	    m_setfont_action->removeFrom( viewbar() );
+	    m_setenc_action->removeFrom( viewbar() );
+	    m_setmono_action->removeFrom( viewbar() );
+	}
+	else if (viewBar != fileBar)
+	{
+	    viewBar->clear();
+	}
+    }
+
+    addviewbar(config, "Fullscreen", m_actFullscreen);
+    addviewbar(config, "Rotate", m_rotate_action);
+    addviewbar(config, "Invert Action", m_inverse_action);
+    addviewbar(config, "Zoom In", m_zoomin_action);
+    addviewbar(config, "Zoom Out", m_zoomout_action);
+    addviewbar(config, "Set Font", m_setfont_action);
+    addviewbar(config, "Encoding Select", m_setenc_action);
+    addviewbar(config, "Ideogram Mode", m_setmono_action);
+
+    if (markBar != NULL)
+    {
+#ifdef USEQPE
+	if ((markBar == fileBar) && (fileBar == menubar))
+#else
+	if (markBar == fileBar)
+#endif
+	{
+	    m_mark_action->removeFrom( markbar() );
+	    m_annotate_action->removeFrom( markbar());
+	    m_goto_action->removeFrom( markbar() );
+	    m_delete_action->removeFrom( markbar() );
+	    m_autogen_action->removeFrom( markbar() );
+	    m_clear_action->removeFrom( markbar() );
+	    m_save_action->removeFrom( markbar() );
+	    m_tidy_action->removeFrom( markbar() );
+	    m_startBlock_action->removeFrom( markbar() );
+	    m_endBlock_action->removeFrom( markbar() );
+	}
+	else if (markBar != fileBar)
+	{
+	    markBar->clear();
+	}
+    }
+    addmarkbar(config, "Mark", m_mark_action);
+    addmarkbar(config, "Annotate", m_annotate_action);
+    addmarkbar(config, "Goto", m_goto_action);
+    addmarkbar(config, "Delete", m_delete_action);
+    addmarkbar(config, "Autogen", m_autogen_action);
+    addmarkbar(config, "Clear", m_clear_action);
+    addmarkbar(config, "Save", m_save_action);
+    addmarkbar(config, "Tidy", m_tidy_action);
+    addmarkbar(config, "Start Block", m_startBlock_action);
+    addmarkbar(config, "Copy Block", m_endBlock_action);
+    if (checkbar(config, "Annotation indicator"))
+    {
+	if (m_bkmkAvail == NULL)
+	{
+	    m_bkmkAvail = new QAction( tr( "Annotation" ), geticon( "find" ), QString::null, 0, this, 0 );
+	    connect( m_bkmkAvail, SIGNAL( activated() ), this, SLOT( showAnnotation() ) );
+	
+	    m_bkmkAvail->setEnabled(false);
+	}
+	QLabel *spacer = new QLabel(markBar, "");
+	markbar()->setStretchableWidget(spacer);
+	m_bkmkAvail->removeFrom( markbar() );
+	m_bkmkAvail->addTo( markbar() );
+    }
+    else
+    {
+	if (m_bkmkAvail != NULL)
+	{
+	    m_bkmkAvail->removeFrom( markbar() );
+	    delete m_bkmkAvail;
+	    m_bkmkAvail = NULL;
+	}
+    }
+}
+
+bool QTReaderApp::checkbar(Config* _config, const QString& key)
+{
+    return _config->readBoolEntry(key, false);
+}
+
+
+QToolBar* QTReaderApp::filebar()
+{
+    if (fileBar == NULL)
+    {
+	switch (m_tbpol)
+	{
+#ifdef USEQPE
+	    case cesSingle:
+//		qDebug("Setting filebar to menubar");
+		fileBar = menubar;
+		break;
+#endif
+	    default:
+		qDebug("Incorrect toolbar policy set");
+	    case cesMenuTool:
+	    case cesMultiple:
+//		qDebug("Creating new file bar");
+		fileBar = new QToolBar("File", this, m_tbposition);
+		break;
+	}
+//	fileBar->setHorizontalStretchable( true );
+    }
+    return fileBar;
+}
+QToolBar* QTReaderApp::viewbar()
+{
+    if (viewBar == NULL)
+    {
+	switch (m_tbpol)
+	{
+	    case cesMultiple:
+		viewBar = new QToolBar("View", this, m_tbposition);
+		break;
+	    default:
+		qDebug("Incorrect toolbar policy set");
+#ifdef USEQPE
+	    case cesSingle:
+#endif
+	    case cesMenuTool:
+		viewBar = fileBar;
+		break;
+	}
+    }
+    return viewBar;
+}
+QToolBar* QTReaderApp::navbar()
+{
+    if (navBar == NULL)
+    {
+	switch (m_tbpol)
+	{
+	    case cesMultiple:
+//		qDebug("Creating new nav bar");
+		navBar = new QToolBar("Navigation", this, m_tbposition);
+		break;
+	    default:
+		qDebug("Incorrect toolbar policy set");
+#ifdef USEQPE
+	    case cesSingle:
+#endif
+	    case cesMenuTool:
+		navBar = fileBar;
+//		qDebug("Setting navbar to filebar");
+		break;
+	}
+    }
+    return navBar;
+}
+QToolBar* QTReaderApp::markbar()
+{
+    if (markBar == NULL)
+    {
+	switch (m_tbpol)
+	{
+	    case cesMultiple:
+		markBar = new QToolBar("Marks", this, m_tbposition);
+		break;
+	    default:
+		qDebug("Incorrect toolbar policy set");
+#ifdef USEQPE
+	    case cesSingle:
+#endif
+	    case cesMenuTool:
+		markBar = fileBar;
+		break;
+	}
+    }
+    return markBar;
+}
+
+void QTReaderApp::addfilebar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( filebar() );
+}
+void QTReaderApp::addnavbar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( navbar() );
+}
+void QTReaderApp::addmarkbar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( markbar() );
+}
+void QTReaderApp::addviewbar(Config* _config, const QString& key, QAction* a)
+{
+    if (_config->readBoolEntry(key, false)) a->addTo( viewbar() );
+}
+
+void QTReaderApp::suspend() { reader->suspend(); }
+
+void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
+{
+#ifndef USEMSGS
+  return;
+#else
+    QString msg = QString::fromUtf8(_msg);
+
+    qDebug("Received:%s", (const char*)msg);
+    QDataStream stream( _data, IO_ReadOnly );
+    if ( msg == "suspend()" )
+    {
+      qDebug("Suspending");
+      suspend();
+      qDebug("Suspendedb");
+    }
+    return;
+    /*
+    QDataStream stream( _data, IO_ReadOnly );
+    if ( msg == "info(QString)" )
+    {
+	QString info;
+	stream >> info;
+	QMessageBox::information(this, PROGNAME, info);
+    }
+    else if ( msg == "Update(int)" )
+    {
+	int info;
+	stream >> info;
+	if (info)
+	{
+	    reader->bDoUpdates = true;
+	    reader->refresh();
+	}
+	else
+	{
+	    reader->bDoUpdates = false;
+	}
+    }
+    else if ( msg == "warn(QString)" )
+    {
+	QString info;
+	stream >> info;
+	QMessageBox::warning(this, PROGNAME, info);
+    }
+    else if ( msg == "exit()" )
+    {
+	m_dontSave = true;
+	close();
+    }
+    else if ( msg == "pageDown()" )
+    {
+	reader->dopagedn();
+    }
+    else if ( msg == "pageUp()" )
+    {
+	reader->dopageup();
+    }
+    else if ( msg == "lineDown()" )
+    {
+	reader->lineDown();
+    }
+    else if ( msg == "lineUp()" )
+    {
+	reader->lineUp();
+    }
+    else if ( msg == "showText()" )
+    {
+	showEditTools();
+    }
+    else if ( msg == "home()" )
+    {
+	reader->goHome();
+    }
+    else if ( msg == "back()" )
+    {
+	reader->goBack();
+    }
+    else if ( msg == "forward()" )
+    {
+	reader->goForward();
+    }
+    else if ( msg == "File/Open(QString)" )
+    {
+	QString info;
+	stream >> info;
+	openFile( info );
+    }
+    else if ( msg == "File/Info()" )
+    {
+	showinfo();
+    }
+    else if ( msg == "File/Action(QString)" )
+    {
+	QString info;
+	stream >> info;
+	m_spaceTarget = ActNameToInt(info);
+    }
+    else if ( msg == "Navigation/Scroll(int)" )
+    {
+	int info;
+	stream >> info;
+	autoScroll(info);
+    }
+
+    else if ( msg == "Navigation/GotoStart()" )
+    {
+	gotoStart();
+    }
+    else if ( msg == "Navigation/GotoEnd()" )
+    {
+	gotoEnd();
+    }
+    else if ( msg == "Navigation/Jump(int)" )
+    {
+	int info;
+	stream >> info;
+	reader->locate(info);
+    }
+    else if ( msg == "Navigation/Page/LineScroll(int)" )
+    {
+	int info;
+	stream >> info;
+	pagemode(info);
+    }
+    else if ( msg == "Navigation/SetOverlap(int)" )
+    {
+	int info;
+	stream >> info;
+	reader->m_overlap = info;
+    }
+    else if ( msg == "Navigation/SetMargin(int)" )
+    {
+	int info;
+	stream >> info;
+	do_margin(info);
+    }
+    else if ( msg == "File/SetDictionary(QString)" )
+    {
+	QString info;
+	stream >> info;
+	do_settarget(info);
+    }
+#ifdef _SCROLLPIPE
+    else if ( msg == "File/SetScrollTarget(QString)" )
+    {
+	QString info;
+	stream >> info;
+	reader->m_pipetarget = info;
+    }
+#endif
+    else if ( msg == "File/Two/OneTouch(int)" )
+    {
+	int info;
+	stream >> info;
+	setTwoTouch(info);
+    }
+    else if ( msg == "Target/Annotation(int)" )
+    {
+	int info;
+	stream >> info;
+	OnAnnotation(info);
+    }
+    else if ( msg == "Target/Dictionary(int)" )
+    {
+	int info;
+	stream >> info;
+	OnDictionary(info);
+    }
+    else if ( msg == "Target/Clipboard(int)" )
+    {
+	int info;
+	stream >> info;
+	OnClipboard(info);
+    }
+    else if ( msg == "File/Find(QString)" )
+    {
+	QString info;
+	stream >> info;
+	QRegExp arg(info);
+	size_t pos = reader->pagelocate();
+	size_t start = pos;
+	CDrawBuffer test(&(reader->m_fontControl));
+	reader->getline(&test);
+	while (arg.match(toQString(test.data())) == -1)
+	{
+	    pos = reader->locate();
+	    if (!reader->getline(&test))
+	    {
+		QMessageBox::information(this, PROGNAME, QString("Can't find\n")+info);
+		pos = start;
+		break;
+	    }
+	}
+	reader->locate(pos);
+    }
+    else if ( msg == "File/Fullscreen(int)" )
+    {
+	int info;
+	stream >> info;
+	setfullscreen(info);
+    }
+    else if ( msg == "File/Continuous(int)" )
+    {
+	int info;
+	stream >> info;
+	setcontinuous(info);
+    }
+    else if ( msg == "Markup(QString)" )
+    {
+	QString info;
+	stream >> info;
+	if (info == "Auto")
+	{
+	    autofmt(true);
+	}
+	if (info == "None")
+	{
+	    autofmt(false);
+	    textfmt(false);
+	    striphtml(false);
+	    peanut(false);
+	}
+	if (info == "Text")
+	{
+	    textfmt(true);
+	}
+	if (info == "HTML")
+	{
+	    striphtml(true);
+	}
+	if (info == "Peanut/PML")
+	{
+	    peanut(true);
+	}
+    }
+    else if ( msg == "Layout/StripCR(int)" )
+    {
+	int info;
+	stream >> info;
+	stripcr(info);
+    }
+    else if ( msg == "Layout/Dehyphen(int)" )
+    {
+	int info;
+	stream >> info;
+	dehyphen(info);
+    }
+    else if ( msg == "Layout/Depluck(int)" )
+    {
+	int info;
+	stream >> info;
+	depluck(info);
+    }
+    else if ( msg == "Layout/Dejpluck(int)" )
+    {
+	int info;
+	stream >> info;
+	dejpluck(info);
+    }
+    else if ( msg == "Layout/SingleSpace(int)" )
+    {
+	int info;
+	stream >> info;
+	onespace(info);
+    }
+    else if ( msg == "Layout/Repalm(int)" )
+    {
+	int info;
+	stream >> info;
+	repalm(info);
+    }
+    else if ( msg == "Layout/Unindent(int)" )
+    {
+	int info;
+	stream >> info;
+	unindent(info);
+    }
+    else if ( msg == "Layout/Re-paragraph(int)" )
+    {
+	int info;
+	stream >> info;
+	repara(info);
+    }
+    else if ( msg == "Layout/DoubleSpace(int)" )
+    {
+	int info;
+	stream >> info;
+	dblspce(info);
+    }
+    else if ( msg == "Layout/Indent(int)" )
+    {
+	int info;
+	stream >> info;
+	reader->bindenter = info;
+	reader->setfilter(reader->getfilter());
+    }
+    else if ( msg == "Layout/Remap(int)" )
+    {
+	int info;
+	stream >> info;
+	remap(info);
+    }
+    else if ( msg == "Layout/Embolden(int)" )
+    {
+	int info;
+	stream >> info;
+	embolden(info);
+    }
+    else if ( msg == "Format/Ideogram/Word(int)" )
+    {
+	int info;
+	stream >> info;
+	monospace(info);
+    }
+    else if ( msg == "Format/SetWidth(int)" )
+    {
+	int info;
+	stream >> info;
+	reader->m_charpc = info;
+	reader->setfont();
+	reader->refresh();
+    }
+    else if ( msg == "Format/SetFont(QString,int)" )
+    {
+	QString fontname;
+	int size;
+	stream >> fontname;
+	stream >> size;
+	setfontHelper(fontname, size);
+    }
+    else if ( msg == "Marks/Autogen(QString)" )
+    {
+	QString info;
+	stream >> info;
+	do_autogen(info);
+    }
+    else if ( msg == "File/StartBlock()" )
+    {
+	editMark();
+    }
+    else if ( msg == "File/CopyBlock()" )
+    {
+	editCopy();
+    }
+    */
+#endif
+}
+
+ActionTypes QTReaderApp::ActNameToInt(const QString& _enc)
+{
+    for (int i = 0; i < MAX_ACTIONS; i++)
+    {
+	if (m_buttonAction[i]->text() == _enc) return (ActionTypes)i;
+    }
+    return cesAutoScroll;
+}
+
+void QTReaderApp::setinverted(bool sfs)
+{
+  reader->setInverse(sfs);
+  reader->setfilter(reader->getfilter());
+  reader->refresh();
+}
+
+void QTReaderApp::setrotated(bool sfs)
+{
+    reader->setrotated(sfs);
+    if (sfs)
+      {
+        m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::BottomToTop : QBoxLayout::TopToBottom );
+	if (m_scrollbar != NULL)
+	  {
+	    scrollbar->disconnect();
+	    m_scrollbar->setOrientation(Qt::Horizontal);
+	    connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineUp()) );
+	    connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineDown()) );
+	    connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopageup()) );
+	    connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopagedn()) );
+	    connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );
+	  }
+	//	reader->repaint(0, reader->m_left_border, reader->width(), reader->height()-2*reader->m_border);
+	reader->repaint();
+      }
+    else
+      {
+        m_layout->setDirection( (m_qtscroll == 2) ? QBoxLayout::RightToLeft : QBoxLayout::LeftToRight );
+	if (m_scrollbar != NULL)
+	  {
+	    scrollbar->disconnect();
+	    m_scrollbar->setOrientation(Qt::Vertical);
+	    connect(scrollbar, SIGNAL(nextLine()), reader, SLOT(lineDown()) );
+	    connect(scrollbar, SIGNAL(prevLine()), reader, SLOT(lineUp()) );
+	    connect(scrollbar, SIGNAL(nextPage()), reader, SLOT(dopagedn()) );
+	    connect(scrollbar, SIGNAL(prevPage()), reader, SLOT(dopageup()) );
+	    connect(scrollbar, SIGNAL(sliderMoved(int)), this, SLOT(actionscroll(int)) );
+	  }
+	//	reader->repaint(reader->m_border, 0, reader->width()-2*reader->m_border, reader->height());
+	reader->repaint();
+      }
+    //    reader->update();
+}
+
+void QTReaderApp::setgrab(bool sfs)
+{
+#ifdef USEQPE
+  m_grabkeyboard = sfs;
+  if (m_grabkeyboard)
+    {
+      ((QPEApplication*)qApp)->grabKeyboard();
+    }
+  else
+    {
+      ((QPEApplication*)qApp)->ungrabKeyboard();
+    }
+#endif
+}
+
+void QTReaderApp::setfullscreen(bool sfs)
+{
+    reader->bDoUpdates = false;
+    m_fullscreen = sfs;
+    showEditTools();
+//    qApp->processEvents();
+    reader->bDoUpdates = true;
+    reader->update();
+}
+/*
+void QTReaderApp::buttonActionSelected(QAction* _a)
+{
+////    qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));
+    m_spaceTarget = ActNameToInt(_a->text());
+}
+*/
+QTReaderApp::~QTReaderApp()
+{
+}
+
+void QTReaderApp::autoScroll(bool _b)
+{
+    reader->setautoscroll(_b);
+    setScrollState(reader->m_autoScroll);
+}
+
+void QTReaderApp::zoomin()
+{
+    reader->zoomin();
+    QFont f(reader->m_fontname, reader->m_fontControl.getsize(0));
+    m_prog->setFont( f );
+}
+
+void QTReaderApp::zoomout()
+{
+    reader->zoomout();
+    QFont f(reader->m_fontname, reader->m_fontControl.getsize(0));
+    m_prog->setFont( f );
+}
+
+void QTReaderApp::clearBkmkList()
+{
+	delete pBkmklist;
+	reader->pBkmklist = pBkmklist = NULL;
+	m_fBkmksChanged = false;
+    reader->refresh(true);
+}
+
+void QTReaderApp::fileClose()
+{
+    CCloseDialog* cd = new CCloseDialog(reader->m_string, false, this);
+    if (cd->exec())
+    {
+	if (pOpenlist != NULL)
+	{
+	    int ind = 0;
+	    Bkmk* p = (*pOpenlist)[ind];
+	    while (p != NULL && toQString(CFiledata(p->anno()).name()) != reader->m_lastfile)
+	    {
+		p = (*pOpenlist)[++ind];
+	    }
+	    if (p != NULL) pOpenlist->erase(ind);
+	    if (cd->delFile())
+	    {
+		unlink((const char*)reader->m_lastfile);
+	    }
+	    if (cd->delMarks())
+	    {
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR);
+		d.remove(reader->m_string);
+#else /* USEQPE */
+		unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
+#endif /* USEQPE */
+	    }
+	    if (cd->delConfig())
+	    {
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR "/configs");
+		d.remove(reader->m_string);
+#else /* USEQPE */
+		unlink((const char *)Global::applicationFileName(APPDIR "/configs",reader->m_string));
+#endif /* USEQPE */
+	    }
+	}
+    
+	fileOpen2();
+    }
+    delete cd;
+}
+
+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);
+    bool notadded = true;
+    if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;
+    else
+    {
+	for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
+	{
+	    if (ustrcmp(CFiledata(iter->anno()).name(), fl) == 0)
+	    {
+		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);
+//		getstate(data, dlen);
+		iter->setAnno(data, dlen);
+		notadded = false;
+		delete [] data;
+		break;
+	    }
+	}
+    }
+//    qDebug("Added?:%x", notadded);
+    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);
+	delete [] data;
+    }
+    delete [] nm;
+    delete [] fl;
+}
+
+void QTReaderApp::fileOpen()
+{
+/*
+    menu->hide();
+    fileBar->hide();
+    if (regVisible) regBar->hide();
+    if (searchVisible) searchBar->hide();
+*/
+//    qDebug("fileOpen");
+//    if (!reader->m_lastfile.isEmpty())
+    updatefileinfo();
+    fileOpen2();
+}
+
+void QTReaderApp::fileOpen2()
+{
+    if (pBkmklist != NULL)
+    {
+	if (m_fBkmksChanged)
+	{
+	    if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
+ 		savebkmks();
+	}     
+	delete pBkmklist;
+	reader->pBkmklist = pBkmklist = NULL;
+	m_fBkmksChanged = false;
+    }
+    reader->disableAutoscroll();
+/*
+    editorStack->raiseWidget( fileSelector );
+    fileSelector->reread();
+*/
+    bool usebrowser = true;
+    if (pOpenlist != NULL)
+    {
+	m_nBkmkAction = cOpenFile;
+	if (listbkmk(pOpenlist, "Browse")) usebrowser = false;
+    }
+    if (usebrowser)
+    {
+	QString fn = usefilebrowser();
+//	qApp->processEvents();
+	if (!fn.isEmpty() && QFileInfo(fn).isFile())
+	{
+	    openFile(fn);
+	}
+	reader->setFocus();
+    }
+//    reader->refresh();
+//    qDebug("HEIGHT:%d", reader->m_lastheight);
+}
+
+QString QTReaderApp::usefilebrowser()
+{
+#ifndef USEQPE
+    QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) );
+    return s;
+#else
+    QString fn;
+#ifdef OPIE
+    QMap<QString, QStringList> mimeTypes;
+    QStringList etypes;
+    etypes << "etext/*";
+    mimeTypes.insert( tr("eText"), etypes );
+    QStringList types;
+    types << "text/*";
+    mimeTypes.insert( tr("Text"), types );
+    mimeTypes.insert( tr("All"), "*/*" );
+    fn = OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL, QFileInfo(reader->m_lastfile).dirPath(true), QString::null, mimeTypes, 0, "OpieReader");
+#else
+    fileBrowser* fb = new fileBrowser(false, this,"OpieReader",!m_bFloatingDialog,
+				      0,
+//				      WStyle_Customize | WStyle_NoBorderEx,
+				      "*", QFileInfo(reader->m_lastfile).dirPath(true));
+
+
+    if (fb->exec())
+    {
+	fn = fb->getCurrentFile();
+    }
+//    qDebug("Selected %s", (const char*)fn);
+    delete fb;
+#endif
+    showEditTools();
+    return fn;
+#endif
+}
+
+void QTReaderApp::showgraphic(QImage& pm)
+{
+    m_graphicwin->setImage(pm);
+    editorStack->raiseWidget( m_graphicwin );
+    hidetoolbars();
+    m_graphicwin->setFocus();
+}
+
+void QTReaderApp::showbuttonprefs()
+{
+    editorStack->raiseWidget( m_buttonprefs );
+    hidetoolbars();
+    m_buttonprefs->setFocus();
+    m_kmapchanged = true;
+}
+
+void QTReaderApp::showprefs()
+{
+    CPrefs* prefwin = new CPrefs(reader->width(), !m_bFloatingDialog, this);
+
+    //    prefwin->Debounce(m_debounce);
+    prefwin->bgtype(m_bgtype);
+    prefwin->repalm(reader->brepalm);
+    prefwin->kern(reader->bkern);
+    prefwin->hyphenate(reader->hyphenate);
+    //    prefwin->customhyphen(reader->buffdoc.getCustomHyphen());
+    prefwin->scrolltype(reader->m_scrolltype);
+    prefwin->scrollstep(reader->m_scrollstep);
+    prefwin->scrollcolor(m_scrollcolor);
+    prefwin->minibarcol(m_scrollbarcolor);
+    prefwin->foreground(m_foreground);
+    prefwin->background(m_background);
+    prefwin->twotouch(m_twoTouch); 
+    prefwin->propfontchange(m_propogatefontchange);
+    prefwin->StripCR(reader->bstripcr);
+    prefwin->Dehyphen(reader->bdehyphen);
+    prefwin->SingleSpace(reader->bonespace);
+    prefwin->Unindent(reader->bunindent);
+    prefwin->Reparagraph(reader->brepara);
+    prefwin->DoubleSpace(reader->bdblspce);
+    prefwin->Remap(reader->bremap);
+    prefwin->Embolden(reader->bmakebold);
+    prefwin->FullJustify(reader->bfulljust);
+    //    prefwin->Inverse(reader->bInverse);
+    //    prefwin->Negative(reader->bNegative);
+    prefwin->FixGraphics(reader->m_fontControl.FixGraphics());
+    prefwin->ParaLead(reader->getextraspace());
+    prefwin->LineLead(reader->getlead());
+    prefwin->TopMargin(reader->m_abstopmargin);
+    prefwin->BottomMargin(reader->m_absbottommargin);
+    prefwin->LeftMargin(reader->m_absleft_border);
+    prefwin->RightMargin(reader->m_absright_border);
+    prefwin->Indent(reader->bindenter);
+    if (reader->bautofmt)
+    {
+	prefwin->Markup(0);
+    }
+    else if (reader->btextfmt)
+    {
+	prefwin->Markup(2);
+    }
+    else if (reader->bstriphtml)
+    {
+	prefwin->Markup(3);
+    }
+    else if (reader->bpeanut)
+    {
+	prefwin->Markup(4);
+    }
+    else
+    {
+	prefwin->Markup(1);
+    }
+    prefwin->Depluck(reader->bdepluck);
+    prefwin->Dejpluck(reader->bdejpluck);
+    prefwin->Continuous(reader->m_continuousDocument);
+
+    prefwin->dictApplication(m_targetapp);
+    prefwin->dictMessage(m_targetmsg);
+
+    /*
+    prefwin->leftScroll(m_leftScroll);
+    prefwin->rightScroll(m_rightScroll);
+    prefwin->upScroll(m_upScroll);
+    prefwin->downScroll(m_downScroll);
+    */
+
+    prefwin->miscannotation(m_doAnnotation);
+    prefwin->miscdictionary(m_doDictionary);
+    prefwin->miscclipboard(m_doClipboard);
+
+    prefwin->SwapMouse(reader->m_swapmouse);
+
+    prefwin->Font(reader->m_fontname);
+
+    prefwin->gfxsize(reader->getBaseSize());
+
+    prefwin->pageoverlap(reader->m_overlap);
+
+    prefwin->ideogram(reader->m_bMonoSpaced);
+
+    prefwin->encoding(reader->m_encd);
+
+    prefwin->ideogramwidth(reader->m_charpc);
+
+    if (prefwin->exec())
+    {
+      //      m_debounce = prefwin->Debounce();
+      reader->brepalm = prefwin->repalm();
+      reader->bkern = prefwin->kern();
+      reader->hyphenate = prefwin->hyphenate();
+      //      reader->buffdoc.setCustomHyphen(prefwin->customhyphen());
+      reader->m_scrolltype = prefwin->scrolltype();
+      reader->m_scrollstep = prefwin->scrollstep();
+      m_scrollcolor = prefwin->scrollcolor();
+      setscrollcolour();
+      m_scrollbarcolor = prefwin->minibarcol();
+      setscrollbarcolour();
+      m_foreground = prefwin->foreground();
+      reader->setForeground(getcolour(m_foreground));
+      m_background = prefwin->background();
+      reader->setBackground(getcolour(m_background));
+	m_twoTouch = prefwin->twotouch();
+	reader->setTwoTouch(m_twoTouch);
+	m_touch_action->setOn(m_twoTouch);
+
+	reader->bstripcr = prefwin->StripCR();
+	reader->bdehyphen = prefwin->Dehyphen();
+	reader->bonespace = prefwin->SingleSpace();
+	reader->bunindent = prefwin->Unindent();
+	reader->brepara = prefwin->Reparagraph();
+	reader->bdblspce = prefwin->DoubleSpace();
+	reader->bremap = prefwin->Remap();
+	reader->bmakebold = prefwin->Embolden();
+	reader->bfulljust = prefwin->FullJustify();
+	//	if (reader->bInverse != prefwin->Inverse()) reader->setInverse(prefwin->Inverse());
+	//	if (reader->bNegative != prefwin->Negative()) reader->setNegative();
+	reader->m_fontControl.FixGraphics(prefwin->FixGraphics());
+
+	reader->setextraspace(prefwin->ParaLead());
+	reader->setlead(prefwin->LineLead());
+	reader->m_abstopmargin = prefwin->TopMargin();
+	reader->m_absbottommargin = prefwin->BottomMargin();
+	reader->m_absleft_border = prefwin->LeftMargin();
+	reader->m_absright_border = prefwin->RightMargin();
+	reader->bindenter = prefwin->Indent();
+	reader->bautofmt = reader->btextfmt = reader->bstriphtml = reader->bpeanut = false;
+	switch (prefwin->Markup())
+	{
+	    case 0:
+		reader->bautofmt = true;
+		break;
+	    case 1:
+		break;
+	    case 2:
+		reader->btextfmt = true;
+		break;
+	    case 3:
+		reader->bstriphtml = true;
+		break;
+	    case 4:
+		reader->bpeanut = true;
+		break;
+	    default:
+		qDebug("Format out of range");
+	}
+	reader->bdepluck = prefwin->Depluck();
+	reader->bdejpluck = prefwin->Dejpluck();
+	reader->setContinuous(prefwin->Continuous());
+
+	/*
+	m_leftScroll = prefwin->leftScroll();
+	m_rightScroll = prefwin->rightScroll();
+	m_upScroll = prefwin->upScroll();
+	m_downScroll = prefwin->downScroll();
+	*/
+	m_targetapp = prefwin->dictApplication();
+	m_targetmsg = prefwin->dictMessage();
+
+	m_doAnnotation = prefwin->miscannotation();
+	m_doDictionary = prefwin->miscdictionary();
+	m_doClipboard = prefwin->miscclipboard();
+	reader->m_swapmouse = prefwin->SwapMouse();
+	reader->setBaseSize(prefwin->gfxsize());
+	reader->m_overlap = prefwin->pageoverlap();
+	reader->m_bMonoSpaced = prefwin->ideogram();
+	m_setmono_action->setOn(reader->m_bMonoSpaced);
+	reader->m_encd = prefwin->encoding();
+	reader->m_charpc = prefwin->ideogramwidth();
+
+	if (
+	    reader->m_fontname != prefwin->Font()
+	    ||
+	    m_propogatefontchange != prefwin->propfontchange())
+	{
+	    m_propogatefontchange = prefwin->propfontchange();
+	    setfontHelper(prefwin->Font());
+	}
+	if (m_bgtype != (bground)prefwin->bgtype())
+	  {
+	    m_bgtype = (bground)prefwin->bgtype();
+	    setBackgroundBitmap();
+	  }
+	delete prefwin;
+	reader->setfilter(reader->getfilter());
+	reader->refresh();
+    }
+    else
+    {
+	delete prefwin;
+    }
+}
+
+void QTReaderApp::showtoolbarprefs()
+{
+#ifdef USEQPE
+    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 );
+		d = QDir::home();
+		d.mkdir(APPDIR);
+		d.cd(APPDIR);
+	}
+	fi.setFile(d, INIFILE);
+    CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);
+#endif
+    prefwin->tbpolicy(m_tbpolsave);
+    prefwin->tbposition(m_tbposition-2);
+    prefwin->tbmovable(m_tbmovesave);
+    prefwin->floating(m_bFloatingDialog);
+    prefwin->qtscroll(m_qtscroll);
+    prefwin->localscroll(m_localscroll);
+    if (prefwin->exec())
+    {
+	m_bFloatingDialog = prefwin->floating();
+	if (
+	    m_tbpolsave != (ToolbarPolicy)prefwin->tbpolicy()
+	    ||
+	    m_tbposition != (ToolBarDock)(prefwin->tbposition()+2)
+	    ||
+	    m_tbmovesave != prefwin->tbmovable()
+	    ||
+	    m_qtscroll != prefwin->qtscroll()
+	    //	    ||
+	    //	    m_localscrollbar != prefwin->scrollonleft()
+	    )
+	{
+	    QMessageBox::warning(this, PROGNAME, "Some changes won't take effect\nuntil the next time the\napplication is started");
+	}
+	m_tbpolsave = (ToolbarPolicy)prefwin->tbpolicy();
+	m_tbposition = (ToolBarDock)(prefwin->tbposition()+2);
+	m_tbmovesave = prefwin->tbmovable();
+	reader->m_scrollpos = m_localscroll = prefwin->localscroll();
+	if (m_qtscroll != prefwin->qtscroll())
+	  {
+	    m_qtscroll = prefwin->qtscroll();
+	    setrotated(reader->m_rotated);
+	  }
+	if (m_scrollbar == NULL || m_scrollbar->isHidden())
+	  {
+	    reader->m_scrollpos = m_localscroll;
+	  }
+	else
+	  {
+	    reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;
+	  }
+	bool isChanged = prefwin->isChanged();
+	delete prefwin;
+#ifdef USEQPE
+	Config config( APPDIR );
+#else
+	QFileInfo fi;
+    QDir d = QDir::home();                      // "/"
+	if ( !d.cd(APPDIR) )
+	{                       // "/tmp"
+		qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+		d = QDir::home();
+		d.mkdir(APPDIR);
+		d.cd(APPDIR);
+	}
+	fi.setFile(d, INIFILE);
+	Config config( fi.absFilePath() );
+#endif
+	if (isChanged) addtoolbars(&config);
+    }
+    else
+    {
+	delete prefwin;
+    }
+}
+
+void QTReaderApp::showinfo()
+{
+    unsigned long ds, fs, ts, pl, dl;
+    if (reader->empty())
+    {
+	QMessageBox::information(this, PROGNAME, "No file loaded", 1);
+    }
+    else
+    {
+	reader->sizes(fs,ts);
+	ds = reader->buffdoc.endSection() - reader->buffdoc.startSection();
+	pl = reader->pagelocate();
+	dl = pl - reader->buffdoc.startSection();
+	m_infoWin->setFileSize(fs);
+	m_infoWin->setTextSize(ts);
+	m_infoWin->setRatio(100-(100*fs + (ts >> 1))/ts);
+	m_infoWin->setLocation(pl);
+	m_infoWin->setRead((100*pl + (ts >> 1))/ts);
+	m_infoWin->setDocSize(ds);
+	m_infoWin->setDocLocation(dl);
+	m_infoWin->setDocRead((100*dl + (ds >> 1))/ds);
+	m_infoWin->setZoom(reader->m_fontControl.currentsize()*10);
+	m_infoWin->setAbout(QString("\nApplication (c) Tim Wentford\n")+reader->about());
+	editorStack->raiseWidget( m_infoWin );
+	hidetoolbars();
+	m_infoWin->setFocus();
+    }
+}
+
+void QTReaderApp::addAnno(const QString& name, const QString& text, size_t posn, size_t posn2)
+{
+    if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>;
+#ifdef _UNICODE
+    CBuffer buff(name.length()+1);
+    int i;
+    for (i = 0; i < name.length(); i++)
+    {
+	buff[i] = name[i].unicode();
+    }
+    buff[i] = 0;
+    CBuffer buff2(text.length()+1);
+    for (i = 0; i < text.length(); i++)
+    {
+	buff2[i] = text[i].unicode();
+    }
+    buff2[i] = 0;
+    Bkmk b(buff.data(), buff2.data(), posn, posn2);
+	QColor c = m_annoWin->getColor();
+	int red,green,blue;
+	c.rgb(&red, &green, &blue);
+	b.red(red);
+	b.green(green);
+	b.blue(blue);
+    pBkmklist->push_front(b);
+#else
+    pBkmklist->push_front(Bkmk((const tchar*)text,posn));
+#endif
+    m_fBkmksChanged = true;
+    pBkmklist->sort();
+}
+
+void QTReaderApp::addAnno(const QString& name, const QString& text)
+{
+    if (m_annoIsEditing)
+    {
+	if (name.isEmpty())
+	{
+	    QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nPlease try again", 1);
+	}
+	else
+	{
+	    addAnno(name, text, m_annoWin->getPosn(), m_annoWin->getPosn2());
+	}
+	showEditTools();
+    }
+    else
+    {
+	if (m_annoWin->edited())
+	{
+	    CBuffer buff(text.length()+1);
+	    int i;
+	    for (i = 0; i < text.length(); i++)
+	    {
+		buff[i] = text[i].unicode();
+	    }
+	    buff[i] = 0;
+	    m_fBkmksChanged = true;
+	    m_anno->setAnno(buff.data());
+	}
+	QColor c = m_annoWin->getColor();
+	int red,green,blue;
+	c.rgb(&red, &green, &blue);
+	m_anno->red(red);
+	m_anno->green(green);
+	m_anno->blue(blue);
+	bool found = findNextBookmark(m_anno->value()+1);
+	if (found)
+	{
+	    m_annoWin->setName(toQString(m_anno->name()));
+	    m_annoWin->setAnno(toQString(m_anno->anno()));
+	    m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue()));
+	}
+	else
+	{
+	    showEditTools();
+	}
+    }
+}
+
+bool QTReaderApp::findNextBookmark(size_t start)
+{
+    bool found = false;
+    for (CList<Bkmk>::iterator iter = pBkmklist->begin(); iter != pBkmklist->end(); iter++)
+    {
+	if (iter->value() >= start)
+	{
+	    if (iter->value() < reader->locate())
+	    {
+		found = true;
+		m_anno = iter.pContent();
+	    }
+	    break;
+	}
+    }
+    return found;
+}
+
+void QTReaderApp::addanno()
+{
+    if (reader->empty())
+    {
+	QMessageBox::information(this, PROGNAME, "No file loaded", 1);
+    }
+    else
+    {
+	m_annoWin->setName("");
+	m_annoWin->setAnno("");
+	m_annoWin->setPosn(reader->pagelocate());
+	m_annoIsEditing = true;
+	editorStack->raiseWidget( m_annoWin );
+	hidetoolbars();
+#ifdef USEQPE
+	Global::showInputMethod();
+#endif
+	m_annoWin->setFocus();
+    }
+}
+
+void QTReaderApp::infoClose()
+{
+  m_debounce = m_buttonprefs->Debounce();
+  if (m_kmapchanged)
+    {
+      m_kmapchanged = false;
+#ifndef USEQPE
+      QDir d = QDir::home();                      // "/"
+      d.cd(APPDIR);
+      QFileInfo fi(d, ".keymap");
+      FILE* f = fopen((const char *)fi.absFilePath(), "w");
+#else /* USEQPE */
+      FILE* f = fopen((const char *)Global::applicationFileName(APPDIR,".keymap"), "w");
+#endif /* USEQPE */
+      if (f != NULL)
+	{
+	  uint cnt = KEYMAPVERSION;
+	  fwrite(&cnt, sizeof(cnt), 1, f);
+	  cnt = kmap.count();
+	  fwrite(&cnt, sizeof(cnt), 1, f);
+	  for (QMap<orKey,int>::Iterator i = kmap.begin(); i != kmap.end(); i++)
+	    {
+	      orKey key = i.key();
+	      int data = i.data();
+	      fwrite(&key, sizeof(key), 1, f);
+	      fwrite(&data, sizeof(data), 1, f);
+	      qDebug("Saved %s as %u", (const char*)key.text(), data);
+	    }
+	  fclose(f);
+	}
+    }
+    showEditTools();
+}
+
+/*
+void QTReaderApp::fileRevert()
+{
+    clear();
+    fileOpen();
+}
+
+void QTReaderApp::editCut()
+{
+#ifndef QT_NO_CLIPBOARD
+    editor->cut();
+#endif
+}
+*/
+void QTReaderApp::editMark()
+{
+    m_savedpos = reader->pagelocate();
+}
+
+void QTReaderApp::editCopy()
+{
+	QClipboard* cb = QApplication::clipboard();
+	QString text;
+	int ch;
+	unsigned long currentpos = reader->pagelocate();
+	unsigned long endpos = reader->locate();
+	if (m_savedpos == 0xffffffff)
+	{
+	    m_savedpos = currentpos;
+	}
+	reader->jumpto(m_savedpos);
+	while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)
+	{
+	    text += ch;
+	}
+	cb->setText(text);
+	reader->locate(currentpos);
+	m_savedpos = 0xffffffff;
+}
+
+void QTReaderApp::gotoStart()
+{
+    reader->locate(reader->buffdoc.startSection());
+}
+
+void QTReaderApp::gotoEnd()
+{
+    reader->dopageup(reader->buffdoc.endSection());
+}
+
+void QTReaderApp::pageup()
+{
+    reader->NavUp();
+}
+
+void QTReaderApp::pagedn()
+{
+    reader->NavDown();
+}
+
+void QTReaderApp::pagemode(bool _b)
+{
+    reader->setpagemode(_b);
+}
+
+/*
+void QTReaderApp::setspacing()
+{
+    m_nRegAction = cMonoSpace;
+    char lcn[20];
+    sprintf(lcn, "%lu", reader->m_charpc);
+    regEdit->setText(lcn);
+    do_regedit();
+}
+*/
+void QTReaderApp::settarget()
+{
+    m_nRegAction = cSetTarget;
+    QString text = ((m_targetapp.isEmpty()) ? QString("") : m_targetapp)
+	+ "/"
+	+ ((m_targetmsg.isEmpty()) ? QString("") : m_targetmsg);
+    regEdit->setText(text);
+    do_regedit();
+}
+
+/*
+void QTReaderApp::do_mono(const QString& lcn)
+{
+    bool ok;
+    unsigned long ulcn = lcn.toULong(&ok);
+    if (ok)
+    {
+	reader->m_charpc = ulcn;
+	reader->setfont();
+	reader->refresh();
+//	reader->setmono(true);
+    }
+    else
+	QMessageBox::information(this, PROGNAME, "Must be a number");
+}
+*/
+/*
+void QTReaderApp::editPaste()
+{
+#ifndef QT_NO_CLIPBOARD
+    editor->paste();
+#endif
+}
+*/
+
+void QTReaderApp::editFind()
+{
+  searchStart = reader->pagelocate();
+#ifdef __ISEARCH
+  searchStack = new QStack<searchrecord>;
+#endif
+#ifdef USEQPE
+  Global::showInputMethod();
+#endif
+  searchBar->show();
+  searchVisible = TRUE;
+  searchEdit->setFocus();
+#ifdef __ISEARCH
+  searchStack->push(new searchrecord("",reader->pagelocate()));
+#endif
+}
+
+void QTReaderApp::findNext()
+{
+//  //  qDebug("findNext called\n");
+#ifdef __ISEARCH
+  QString arg = searchEdit->text();
+#else
+  QRegExp arg = searchEdit->text();
+#endif
+  CDrawBuffer test(&(reader->m_fontControl));
+  size_t start = reader->pagelocate();
+  reader->jumpto(start);
+  reader->getline(&test);
+  dosearch(start, test, arg);
+}
+
+void QTReaderApp::findClose()
+{
+  searchVisible = FALSE;
+  searchEdit->setText("");
+#ifdef USEQPE
+  Global::hideInputMethod();
+#endif
+  searchBar->hide();
+#ifdef __ISEARCH
+//  searchStack = new QStack<searchrecord>;
+  while (!searchStack->isEmpty())
+    {
+      delete searchStack->pop();
+    }
+  delete searchStack;
+#endif
+  reader->setFocus();
+}
+
+void QTReaderApp::regClose()
+{
+  regVisible = FALSE;
+  regEdit->setText("");
+  regBar->hide();
+#ifdef USEQPE
+  Global::hideInputMethod();
+#endif
+  reader->setFocus();
+}
+
+#ifdef __ISEARCH
+bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QString& arg)
+#else
+bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
+#endif
+{
+  bool ret = true;
+    unsigned long fs, ts;
+    reader->sizes(fs,ts);
+  size_t pos = reader->locate();
+  pbar->setGeometry(searchBar->x(),searchBar->y(),searchBar->width(), searchBar->height());
+  pbar->show();
+  pbar->raise();
+  pbar->reset();
+  int offset;
+  int lastpc = (100*pos)/ts;
+  pbar->setProgress(lastpc);
+//  qApp->processEvents();
+  if (reader->buffdoc.getpara(test) >= 0)
+  {
+      reader->setFocus();
+#ifdef __ISEARCH
+      while (strstr(test.data(),(const tchar*)arg) == NULL)
+#else
+#ifdef _UNICODE
+      while ((offset = arg.match(toQString(test.data()))) == -1)
+#else
+      while (arg.match(test.data()) == -1)
+#endif
+#endif
+      {
+	  pos = reader->locate();
+	  int pc = (100*pos)/ts;
+	  if (pc != lastpc)
+	  {
+	      pbar->setProgress(pc);
+	      qApp->processEvents();
+	      reader->setFocus();
+	      lastpc = pc;
+	  }
+	  
+	  if (reader->buffdoc.getpara(test) < 0)
+	  {
+	      if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
+		  pos = searchStart;
+	      else
+		  pos = start;
+	      findClose();
+	      pbar->hide();
+	      reader->locate(pos);
+	      return false;
+	  }
+      }
+//      qDebug("Found it at %u:%u", pos, offset);
+      pbar->hide();
+//      qDebug("Hid");
+      reader->locate(pos+offset);
+//      qDebug("Loacted");
+//      qDebug("page up");
+      ret = true;
+  }
+  else
+  {
+	      if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
+		  pos = searchStart;
+	      else
+		  pos = start;
+	      ret = false;
+	      findClose();
+  }
+  return ret;
+}
+
+#ifdef __ISEARCH
+void QTReaderApp::search(const QString & arg)
+{
+  searchrecord* ss = searchStack->top();
+  CBuffer test;
+  size_t start = reader->pagelocate();
+  bool haspopped = false;
+  while (arg.left(ss->s.length()) != ss->s)
+  {
+      haspopped = true;
+      start = ss->pos;
+//      reader->locate(start);
+      searchStack->pop();
+      delete ss;
+  }
+  if (haspopped) reader->locate(start);
+/*
+  if (arg.length() < ss->len)
+    {
+      start = ss->pos;
+      reader->locate(start);
+      searchStack->pop();
+      delete ss;
+    }
+*/
+  else
+    {
+      start = reader->pagelocate();
+      reader->jumpto(start);
+      searchStack->push(new searchrecord(arg,start));
+    }
+    dosearch(start, test, arg);
+}
+#else
+void QTReaderApp::search()
+{
+    findNext();
+}
+#endif
+
+void QTReaderApp::openFile( const QString &f )
+{
+//    qDebug("File:%s", (const char*)f);
+//    openFile(DocLnk(f));
+//}
+//
+//void QTReaderApp::openFile( const DocLnk &f )
+//{
+  clear();
+  QFileInfo fm(f);
+  if ( fm.exists() )
+    {
+//      QMessageBox::information(0, "Progress", "Calling fileNew()");
+#ifdef USEQPE
+	if (fm.extension( FALSE ) == "desktop")
+	{
+	    DocLnk d(f);
+	    QFileInfo fnew(d.file());
+	    fm = fnew;
+	    if (!fm.exists()) return;
+	}
+#endif
+      clear();
+      reader->setText(fm.baseName(), fm.absFilePath());
+      m_loadedconfig = readconfig(APPDIR "/configs", reader->m_string, false);
+      qDebug("Showing tools");
+      showEditTools();
+      qDebug("Shown tools");
+      readbkmks();
+      qDebug("read markss");
+      m_savedpos = 0xffffffff;
+    }
+  else
+    {
+      QString msg = f;
+       msg += "\nFile does not exist";
+      QMessageBox::information(this, PROGNAME, msg);
+      reader->m_lastfile = QString::null;
+    }
+	
+}
+/*
+void QTReaderApp::resizeEvent(QResizeEvent* e)
+{
+    if (m_fullscreen)
+    {
+	showNormal();
+	showFullScreen();
+    }
+}
+*/
+void QTReaderApp::handlekey(QKeyEvent* e)
+{
+//    qDebug("Keypress event");
+    timeb now;
+    ftime(&now);
+    unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;
+    if (etime < m_debounce)
+    {
+	return;
+    }
+    switch(e->key())
+    {
+	case Key_Escape:
+//	    qDebug("escape event");
+	    if (m_disableesckey)
+	    {
+		m_disableesckey = false;
+	    }
+	    else
+	    {
+		m_bcloseDisabled = true;
+		if (m_fullscreen)
+		{
+		    m_actFullscreen->setOn(false);
+		    e->accept();
+		}
+		else
+		{
+//		qDebug("escape action");
+		    doAction(e);
+		}
+	    }
+	    break;
+	    /*
+	case Key_Left:
+	{
+	    if (reader->m_autoScroll)
+	    {
+		reader->reduceScroll();
+	    }
+	    else
+	    {
+		doAction(e);
+	    }
+	}
+	break;
+	case Key_Right:
+	{
+	    if (reader->m_autoScroll)
+	    {
+		reader->increaseScroll();
+	    }
+	    else
+	    {
+		doAction(e);
+	    }
+	}
+	break;
+	case Key_Up:
+	{
+	    if (reader->m_autoScroll)
+	    {
+		reader->increaseScroll();
+	    }
+	    else
+	    {
+		doAction(e);
+	    }
+	}
+	break;
+	case Key_Down:
+	{
+	    if (reader->m_autoScroll)
+	    {
+		reader->reduceScroll();
+	    }
+	    else
+	    {
+		doAction(e);
+	    }
+	}
+	break;
+	    */
+	default:
+	{
+	  doAction(e);
+	}
+	
+/*
+	QString msg("Key press was:");
+	QString key;
+	msg += key.setNum(e->key());
+	QMessageBox::information(this, PROGNAME, msg);
+*/
+    }
+    ftime(&m_lastkeytime);
+}
+
+#ifdef NEWFULLSCREEN
+void QTReaderApp::enableFullscreen()
+{
+    setFixedSize(qApp->desktop()->size());
+    showNormal();
+    reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
+    showFullScreen();
+}
+
+void QTReaderApp::resizeEvent(QResizeEvent *)
+{
+    if (m_fullscreen && (size() != qApp->desktop()->size()))
+    {
+	enableFullscreen();
+    }
+}
+
+void QTReaderApp::focusInEvent(QFocusEvent*)
+{
+    if (m_fullscreen)
+    {
+	enableFullscreen();
+	raise();
+    }
+}
+#endif
+
+void QTReaderApp::showEditTools()
+{
+//    if ( !doc )
+//	close();
+    if (m_fullscreen)
+    {
+#ifdef USEQPE
+	if (menubar != NULL) menubar->hide();
+#endif
+	if (fileBar != NULL) fileBar->hide();
+	if (viewBar != NULL) viewBar->hide();
+	if (navBar != NULL) navBar->hide();
+	if (markBar != NULL) markBar->hide();
+	if (m_prog != NULL) 
+	  {
+	    //	    qDebug("Hiding status");
+	    m_prog->hide();
+	  }
+	searchBar->hide();
+	regBar->hide();
+#ifdef USEQPE
+	Global::hideInputMethod();
+#endif
+	if (m_scrollbar != NULL) m_scrollbar->hide();
+	m_fontBar->hide();
+//	showNormal();
+#ifdef NEWFULLSCREEN
+	enableFullscreen();
+#else
+	showFullScreen();
+#endif
+    }
+    else
+    {
+//	qDebug("him");
+#ifdef USEQPE
+	Global::hideInputMethod();
+#endif
+//	qDebug("eb");
+	if (m_scrollbar != NULL)
+	  {
+	    if (m_scrollishidden)
+	      {
+		m_scrollbar->hide();
+	      }
+	    else
+	      {
+		m_scrollbar->show();
+	      }
+	  }
+	if (!m_hidebars)
+	  {
+#ifdef USEQPE
+	    menubar->show();
+#endif
+	    if (fileBar != NULL) fileBar->show();
+	    if (viewBar != NULL) viewBar->show();
+	    if (navBar != NULL) navBar->show();
+	    if (markBar != NULL) markBar->show();
+	    if (m_prog != NULL && !m_statusishidden) 
+	      {
+		//		qDebug("Showing status");
+		m_prog->show();
+		//		qDebug("Shown status");
+	      }
+	    //	    qDebug("Showing mb");
+	    mb->show();
+	  }
+	if ( searchVisible )
+	{
+#ifdef USEQPE
+	    Global::showInputMethod();
+#endif
+		searchBar->show();
+	}
+	if ( regVisible )
+	{
+#ifdef USEQPE
+	    Global::showInputMethod();
+#endif
+		regBar->show();
+	}
+	if (m_fontVisible) m_fontBar->show();
+//	qDebug("sn");
+	showNormal();
+//	qDebug("sm");
+#ifdef USEQPE
+	showMaximized();
+#endif
+//	setCentralWidget(reader);
+    }
+
+    //    qDebug("uc");
+    updateCaption();
+    //    qDebug("rw");
+    editorStack->raiseWidget( reader );
+    //    qDebug("sf");
+    reader->setFocus();
+    //    qDebug("ref");
+    reader->refresh(true);
+    //    qDebug("done");
+}
+/*
+void QTReaderApp::save()
+{
+    if ( !doc )
+	return;
+    if ( !editor->edited() )
+	return;
+
+    QString rt = editor->text();
+    QString pt = rt;
+
+    if ( doc->name().isEmpty() ) {
+	unsigned ispace = pt.find( ' ' );
+	unsigned ienter = pt.find( '\n' );
+	int i = (ispace < ienter) ? ispace : ienter;
+	QString docname;
+	if ( i == -1 ) {
+	    if ( pt.isEmpty() )
+		docname = "Empty Text";
+	    else
+		docname = pt;
+	} else {
+	    docname = pt.left( i );
+	}
+	doc->setName(docname);
+    }
+    FileManager fm;
+    fm.saveFile( *doc, rt );
+}
+*/
+
+void QTReaderApp::clear()
+{
+//    if (doc != 0)
+//      {
+//  QMessageBox::information(this, PROGNAME, "Deleting doc", 1);
+//	delete doc;
+//  QMessageBox::information(this, PROGNAME, "Deleted doc", 1);
+//	doc = 0;
+    //     }
+    reader->clear();
+}
+
+void QTReaderApp::updateCaption()
+{
+//    if ( !doc )
+//	setCaption( tr("QTReader") );
+//    else {
+//	QString s = doc->name();
+//	if ( s.isEmpty() )
+//	    s = tr( "Unnamed" );
+	setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) );
+//    }
+}
+
+void QTReaderApp::setDocument(const QString& fileref)
+{
+//QMessageBox::information(0, "setDocument", fileref);
+    openFile(fileref);
+//    showEditTools();
+}
+
+void QTReaderApp::closeEvent( QCloseEvent *e )
+{
+//    qDebug("Close event");
+    if (m_fullscreen)
+    {
+	m_fullscreen = false;
+	showEditTools();
+	e->ignore();
+    }
+    else if (editorStack->visibleWidget() == m_buttonprefs)
+      {
+	m_buttonprefs->mapkey(Qt::NoButton, Key_Escape);
+	e->ignore();
+      }
+    else if (m_dontSave)
+    {
+	e->accept();
+    }
+    else
+    {
+	if (editorStack->visibleWidget() == reader)
+	{
+	    if ((kmap.find(orKey(Qt::NoButton,Key_Escape,false)) != kmap.end()) && m_bcloseDisabled)
+	    {
+//	qDebug("Close disabled");
+		m_bcloseDisabled = false;
+		e->ignore();
+	    }
+	    else
+	    {
+		if (m_fontVisible)
+		{
+		    m_fontBar->hide();
+		    m_fontVisible = false;
+		    e->ignore();
+		    return;
+		}
+		if (regVisible)
+		{
+		    regBar->hide();
+#ifdef USEQPE
+		    Global::hideInputMethod();
+#endif
+		    regVisible = false;
+		    e->ignore();
+		    return;
+		}
+		if (searchVisible)
+		{
+		    searchBar->hide();
+#ifdef USEQPE
+		    Global::hideInputMethod();
+#endif
+		    searchVisible = false;
+		    e->ignore();
+		    return;
+		}
+		if (m_fBkmksChanged && pBkmklist != NULL)
+		{
+		    if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
+			savebkmks();
+		    delete pBkmklist;
+		    reader->pBkmklist = pBkmklist = NULL;
+		    m_fBkmksChanged = false;
+		}
+		updatefileinfo();
+		saveprefs();
+		e->accept();
+	    }
+	}
+	else
+	{
+	    showEditTools();
+	    m_disableesckey = true;
+	}
+    }
+}
+
+void QTReaderApp::do_gotomark()
+{
+    m_nBkmkAction = cGotoBkmk;
+    if (!listbkmk(pBkmklist))
+	QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
+}
+
+void QTReaderApp::do_delmark()
+{
+    m_nBkmkAction = cDelBkmk;
+    if (!listbkmk(pBkmklist))
+	QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
+}
+
+bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
+{
+    bkmkselector->clear();
+    if (_lab.isEmpty())
+	bkmkselector->setText("Cancel");
+    else
+	bkmkselector->setText(_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()));
+	    bkmkselector->insertItem(toQString(i->name()));
+#else
+	    bkmkselector->insertItem(i->name());
+#endif
+	    cnt++;
+	  }
+      }
+    if (cnt > 0)
+      {
+	  hidetoolbars();
+        editorStack->raiseWidget( bkmkselector );
+	return true;
+      }
+    else
+	return false;
+}
+
+void QTReaderApp::do_autogen()
+{
+  m_nRegAction = cAutoGen;
+  regEdit->setText(m_autogenstr);
+  do_regedit();
+}
+
+void QTReaderApp::do_regedit()
+{
+//    fileBar->hide();
+    reader->bDoUpdates = false;
+//    qDebug("Showing regbar");
+  regBar->show();
+//    qDebug("Showing kbd");
+#ifdef USEQPE
+  Global::showInputMethod();
+#endif
+  regVisible = true;
+  regEdit->setFocus();
+//  qApp->processEvents();
+    reader->bDoUpdates = true;
+    reader->update();
+}
+
+bool QTReaderApp::openfrombkmk(Bkmk* bk)
+{
+    QString fn = toQString(
+	CFiledata(bk->anno()).name()
+	);
+//	qDebug("fileinfo");
+    if (!fn.isEmpty() && QFileInfo(fn).isFile())
+    {
+//	qDebug("Opening");
+	openFile(fn);
+	struct stat fnstat;
+	stat((const char *)reader->m_lastfile, &fnstat);
+	
+	if (CFiledata(bk->anno()).date()
+	    != fnstat.st_mtime)
+	{
+	    CFiledata fd(bk->anno());
+	    fd.setdate(fnstat.st_mtime);
+	    bk->value(0);
+	}
+	else
+	{
+	    unsigned short svlen = bk->filedatalen();
+	    unsigned char* svdata = bk->filedata();
+	    reader->putSaveData(svdata, svlen);
+//	    setstate(svdata, svlen);
+	    if (svlen != 0)
+	    {
+		QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
+	    }
+//	    qDebug("updating");
+//	    showEditTools();
+	    reader->locate(bk->value());
+	}
+	return true;
+    }
+    else
+    {
+	return false;
+    }
+}
+
+void QTReaderApp::gotobkmk(int ind)
+{
+  qDebug("gbkmk");
+    showEditTools();
+    switch (m_nBkmkAction)
+    {
+	case cOpenFile:
+	{
+//	    qApp->processEvents();
+	    if (!openfrombkmk((*pOpenlist)[ind]))
+	    {
+		pOpenlist->erase(ind);
+		QMessageBox::information(this, PROGNAME, "Can't find file");
+	    }
+	}
+	break;
+	case cGotoBkmk:
+	    reader->buffdoc.saveposn(reader->m_lastfile, reader->pagelocate());
+	    reader->locate((*pBkmklist)[ind]->value());
+	    break;
+	case cDelBkmk:
+////	    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
+	    pBkmklist->erase(ind);
+	    m_fBkmksChanged = true;
+	    reader->refresh(true);
+//	    pBkmklist->sort();
+	    break;
+	case cRmBkmkFile:
+		{
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR);
+		d.remove(bkmkselector->text(ind));
+#else /* USEQPE */
+		unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind)));
+#endif /* USEQPE */
+		}
+	    break;
+	case cLdConfig:
+	    readconfig(APPDIR "/configs", bkmkselector->text(ind), false);
+	    break;
+	case cLdTheme:
+	  m_themename = bkmkselector->text(ind);
+	  readconfig(QString(APPDIR "/Themes/")+m_themename , "config", false);
+	  setBackgroundBitmap();
+	    break;
+	case cRmConfig:
+		{
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR "/configs");
+		d.remove(bkmkselector->text(ind));
+#else /* USEQPE */
+		unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind)));
+#endif /* USEQPE */
+		}
+	    break;
+	case cExportLinks:
+	{
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+	    d.cd(APPDIR "/urls");
+	    QFileInfo fi(d, bkmkselector->text(ind));
+	    if (fi.exists())
+	    {
+		QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) );
+		if (!outfile.isEmpty())
+		{
+		    FILE* fout = fopen((const char *)outfile, "w");
+		    if (fout != NULL)
+		    {
+			FILE* fin = fopen((const char *)fi.absFilePath(), "r");
+			if (fin != NULL)
+			{
+			    fprintf(fout, "<html><body>\n");
+			    int ch = 0;
+			    while ((ch = fgetc(fin)) != EOF)
+			    {
+				fputc(ch, fout);
+			    }
+			    fclose(fin);
+			    fprintf(fout, "</html></body>\n");
+			    d.remove(bkmkselector->text(ind));
+			}
+			fclose(fout);
+		    }
+		    else
+			QMessageBox::information(this, PROGNAME, "Couldn't open output");
+		}
+	    }
+#else /* USEQPE */
+	    FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
+	    if (fin != NULL)
+	    {
+		bool allok = false;
+#ifdef OPIE
+		QString outfile = OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null, QString::null, MimeTypes(), 0, "OpieReader");
+		if (!outfile.isEmpty())
+		{
+		    FILE* fout = fopen((const char *)outfile, "w");
+		    if (fout != NULL)
+		    {
+			fprintf(fout, "<html><body>\n");
+			int ch = 0;
+			while ((ch = fgetc(fin)) != EOF)
+			{
+			    fputc(ch, fout);
+			}
+			fprintf(fout, "</html></body>\n");
+			fclose(fout);
+			allok = true;
+		    }
+		    else
+			QMessageBox::information(this, PROGNAME, "Couldn't open output");
+		}
+		fclose(fin);
+		if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
+#else
+		fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null);
+		if (fb->exec())
+		{
+		    QString outfile = fb->getCurrentFile();
+		    FILE* fout = fopen((const char *)outfile, "w");
+		    if (fout != NULL)
+		    {
+			fprintf(fout, "<html><body>\n");
+			int ch = 0;
+			while ((ch = fgetc(fin)) != EOF)
+			{
+			    fputc(ch, fout);
+			}
+			fprintf(fout, "</html></body>\n");
+			fclose(fout);
+			allok = true;
+		    }
+		    else
+			QMessageBox::information(this, PROGNAME, "Couldn't open output");
+		}
+		delete fb;
+		fclose(fin);
+		if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
+#endif
+	    }
+	    else
+	    {
+		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);
+	    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";
+		int ch = 0;
+		while ((ch = fgetc(fin)) != EOF)
+		{
+		    rt += (char)ch;
+		}
+		fclose(fin);
+		rt += "</html></body>\n";
+		if ( doc->name().isEmpty() )
+		{
+		    doc->setName(bkmkselector->text(ind));
+		}
+		FileManager fm;
+		fm.saveFile( *doc, rt );
+		qDebug("YES");
+	    }
+	    else
+	    {
+		qDebug("NO");
+	    }
+	    delete f;
+*/
+
+#endif /* USEQPE */
+	}
+	break;
+    }
+}
+
+void QTReaderApp::cancelbkmk()
+{
+    if (m_nBkmkAction == cOpenFile)
+    {
+	QString fn = usefilebrowser();
+	if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
+    }
+  showEditTools();
+}
+
+void QTReaderApp::reparastring()
+{
+  m_nRegAction = cRepara;
+  regEdit->setText(reader->m_reparastring);
+  do_regedit();
+}
+
+void QTReaderApp::do_reparastring(const QString& _lcn)
+{
+  reader->m_reparastring = _lcn;
+  if (reader->brepara)
+    {
+      reader->bDoUpdates = true;
+      reader->setfilter(reader->getfilter());
+    }
+}
+
+void QTReaderApp::jump()
+{
+  m_nRegAction = cJump;
+  char lcn[20];
+  sprintf(lcn, "%lu", reader->pagelocate());
+  regEdit->setText(lcn);
+  do_regedit();
+}
+
+void QTReaderApp::do_jump(const QString& _lcn)
+{
+    bool ok;
+    QString lcn = _lcn.stripWhiteSpace();
+    unsigned long ulcn = lcn.toULong(&ok);
+    if (!ok)
+      {
+	double pc = 0.0;
+#ifdef _WINDOWS
+	if (lcn.at(lcn.length()-1) == '%')
+#else
+	if (lcn[lcn.length()-1] == '%')
+#endif
+	{
+	    lcn = lcn.left(lcn.length()-1);
+	    pc = lcn.toDouble(&ok);
+	  }
+	else
+	  {
+	    pc = lcn.toDouble(&ok);
+	  }
+	if (ok && 0 <= pc && pc <= 100)
+	  {
+	    ulcn = (pc*(reader->buffdoc.endSection()-reader->buffdoc.startSection()))/100 + reader->buffdoc.startSection();
+	  }
+	else
+	  {
+	    ok = false;
+	  }
+      }
+    if (ok)
+	reader->locate(ulcn);      
+    else
+	QMessageBox::information(this, PROGNAME, "Must be a number\nor a percentage");
+}
+
+void QTReaderApp::do_regaction()
+{
+    reader->bDoUpdates = false;
+  regBar->hide();
+#ifdef USEQPE
+  Global::hideInputMethod();
+#endif
+  regVisible = false;
+  switch(m_nRegAction)
+  {
+      case cAutoGen:
+	  do_autogen(regEdit->text());
+	  break;
+      case cAddBkmk:
+	  do_addbkmk(regEdit->text());
+	  break;
+      case cRepara:
+	do_reparastring(regEdit->text());
+	break;
+      case cJump:
+	  do_jump(regEdit->text());
+	  break;
+/*
+      case cMonoSpace:
+	  do_mono(regEdit->text());
+	  break;
+*/
+      case cSetTarget:
+	  do_settarget(regEdit->text());
+	  break;
+#ifdef _SCROLLPIPE
+      case cSetPipeTarget:
+	  do_setpipetarget(regEdit->text());
+	  break;
+#endif
+      case cSetConfigName:
+//	  qDebug("Saving config");
+	  do_saveconfig(regEdit->text(), false);
+	  break;
+  }
+//  reader->restore();
+//    fileBar->show();
+  reader->setFocus();
+//    qApp->processEvents();
+    reader->bDoUpdates = true;
+    reader->update();
+}
+
+void QTReaderApp::do_settarget(const QString& _txt)
+{
+    int ind = _txt.find('/');
+    if (ind == -1)
+    {
+	m_targetapp = "";
+	m_targetmsg = "";
+	QMessageBox::information(this, PROGNAME, "Format is\nappname/messagename");
+    }
+    else
+    {
+	m_targetapp = _txt.left(ind);
+	m_targetmsg = _txt.right(_txt.length()-ind-1);
+    }
+}
+
+void QTReaderApp::chooseencoding()
+{
+    m_fontSelector->clear();
+    m_fontSelector->insertItem("Ascii");
+    m_fontSelector->insertItem("UTF-8");
+    m_fontSelector->insertItem("UCS-2(BE)");
+    m_fontSelector->insertItem("USC-2(LE)");
+    m_fontSelector->insertItem("Palm");
+    for (unicodetable::iterator iter = unicodetable::begin(); iter != unicodetable::end(); iter++)
+    {
+	m_fontSelector->insertItem(iter->mime);
+    } // delete the FontDatabase!!!
+    m_fontSelector->setCurrentItem (reader->m_encd);
+    m_fontAction = cChooseEncoding;
+    m_fontBar->show();
+    m_fontVisible = true;
+}
+
+void QTReaderApp::setfont()
+{
+    m_fontSelector->clear();
+    {
+	QFontDatabase f;
+	QStringList flist = f.families();
+	m_fontSelector->insertStringList(flist);
+    } // delete the FontDatabase!!!
+
+    for (int i = 1; i <= m_fontSelector->count(); i++)
+    {
+	if (m_fontSelector->text(i) == reader->m_fontname)
+	{
+	    m_fontSelector->setCurrentItem(i);
+	    break;
+	}
+    }
+    m_fontAction = cChooseFont;
+    m_fontBar->show();
+    m_fontVisible = true;
+}
+
+void QTReaderApp::setfontHelper(const QString& lcn, int size)
+{
+    if (size == 0) size = reader->m_fontControl.currentsize();
+    if (m_propogatefontchange)
+    {
+	QFont f(lcn, 10);
+	bkmkselector->setFont( f );
+	regEdit->setFont( f );
+	searchEdit->setFont( f );
+	m_annoWin->setFont( f );
+    }
+    reader->m_fontname = lcn;
+    if (!reader->ChangeFont(size))
+    {
+	reader->ChangeFont(size);
+    }
+}
+
+void QTReaderApp::do_setencoding(int i)
+{
+    qDebug("setencoding:%d", i);
+    if (m_fontAction == cChooseEncoding)
+    {
+	reader->setencoding(i);
+    }
+    reader->refresh();
+    m_fontBar->hide();
+    m_fontVisible = false;
+//    qDebug("showedit");
+    if (reader->isVisible()) showEditTools();
+//    qDebug("showeditdone");
+}
+
+void QTReaderApp::do_setfont(const QString& lcn)
+{
+    if (m_fontAction == cChooseFont)
+    {
+	setfontHelper(lcn);
+    }
+    reader->refresh();
+    m_fontBar->hide();
+    m_fontVisible = false;
+    //    qDebug("setfont");
+    //if (reader->isVisible())
+    showEditTools();
+//    qDebug("showeditdone");
+}
+
+void QTReaderApp::do_autogen(const QString& regText)
+{
+    unsigned long fs, ts;
+    reader->sizes(fs,ts);
+//  //  qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));
+  m_autogenstr = regText;
+  QRegExp re(regText);
+  CBuffer buff;
+  if (pBkmklist != NULL) delete pBkmklist;
+  reader->pBkmklist = pBkmklist = new CList<Bkmk>;
+  m_fBkmksChanged = true;
+
+  pbar->setGeometry(regBar->x(),regBar->y(),regBar->width(), regBar->height());
+  pbar->show();
+  pbar->raise();
+  pbar->reset();
+  reader->update();
+  qApp->processEvents();
+  reader->setFocus();
+  reader->jumpto(0);
+  int lastpc = 0;
+  int i = 0;
+  while (i >= 0)
+    {
+      unsigned int lcn = reader->locate();
+      int pc = (100*lcn)/ts;
+      if (pc != lastpc)
+      {
+        pbar->setProgress(pc);
+	qApp->processEvents();
+	if (reader->locate() != lcn) reader->jumpto(lcn);
+	reader->setFocus();
+        lastpc = pc;
+      }
+      i = reader->buffdoc.getpara(buff);
+#ifdef _UNICODE
+      if (re.match(toQString(buff.data())) != -1)
+#else
+      if (re.match(buff.data()) != -1)
+#endif
+	pBkmklist->push_back(Bkmk(buff.data(), NULL, lcn));
+    }
+  pBkmklist->sort();
+  pbar->setProgress(100);
+  qApp->processEvents();
+  pbar->hide();
+  reader->refresh();
+}
+
+void QTReaderApp::saveprefs()
+{
+  do_saveconfig( APPDIR, true );
+  savefilelist();
+}
+
+/*
+void QTReaderApp::oldFile()
+{
+//  qDebug("oldFile called");
+  reader->setText(true);
+//  qDebug("settext called");
+  showEditTools();
+//  qDebug("showedit called");
+}
+*/
+
+/*
+void info_cb(Fl_Widget* o, void* _data)
+{
+
+    if (infowin == NULL)
+    {
+	
+	infowin = new Fl_Window(160,240);
+	filename = new Fl_Output(45,5,110,14,"Filename");
+	filesize = new Fl_Output(45,25,110,14,"Filesize");
+	textsize = new Fl_Output(45,45,110,14,"Textsize");
+	comprat = new CBar(45,65,110,14,"Ratio %");
+	posn = new Fl_Output(45,85,110,14,"Location");
+	frcn = new CBar(45,105,110,14,"% Read");
+	about = new Fl_Multiline_Output(5,125,150,90);
+	about->value("TWReader - $Name$\n\nA file reader program for the Agenda\n\nReads text, PalmDoc and ppms format files");
+	Fl_Button *jump_accept = new Fl_Button(62,220,35,14,"Okay");
+	infowin->set_modal();
+    }
+    if (((reader_ui *)_data)->g_filename[0] != '\0')
+    {
+	unsigned long fs,ts;
+	tchar sz[20];
+	((reader_ui *)_data)->input->sizes(fs,ts);
+	unsigned long pl = ((reader_ui *)_data)->input->locate();
+
+	filename->value(((reader_ui *)_data)->g_filename);
+
+	sprintf(sz,"%u",fs);
+	filesize->value(sz);
+
+	sprintf(sz,"%u",ts);
+	textsize->value(sz);
+
+	comprat->value(100-(100*fs + (ts >> 1))/ts);
+
+	sprintf(sz,"%u",pl);
+	posn->value(sz);
+
+	frcn->value((100*pl + (ts >> 1))/ts);
+    }
+    infowin->show();
+}
+*/
+
+void QTReaderApp::savebkmks()
+{
+    if (pBkmklist != NULL)
+    {
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR);
+		QFileInfo fi(d, reader->m_string);
+	BkmkFile bf((const char *)fi.absFilePath(), true, true);
+#else /* USEQPE */
+	BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), true, true);
+#endif /* USEQPE */
+	bf.write(*pBkmklist);
+    }
+	m_fBkmksChanged = false;
+}
+
+void QTReaderApp::readfilelist()
+{
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR);
+		QFileInfo fi(d, ".openfiles");
+    BkmkFile bf((const char *)fi.absFilePath(), false, false);
+#else /* USEQPE */
+    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), false, false);
+#endif /* USEQPE */
+//    qDebug("Reading open files");
+    pOpenlist = bf.readall();
+//    if (pOpenlist != NULL) qDebug("...with success");
+//    else qDebug("...without success!");
+}
+
+void QTReaderApp::savefilelist()
+{
+    if (pOpenlist != NULL)
+    {
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR);
+		QFileInfo fi(d, ".openfiles");
+	BkmkFile bf((const char *)fi.absFilePath(), true, false);
+#else /* USEQPE */
+	BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true, false);
+#endif /* USEQPE */
+//	qDebug("Writing open files");
+	bf.write(*pOpenlist);
+    }
+}
+
+void QTReaderApp::readbkmks()
+{
+    if (pBkmklist != NULL)
+    {
+    	delete pBkmklist;
+    }
+    struct stat fnstat;
+    struct stat bkstat;
+#ifndef USEQPE
+	    QDir d = QDir::home();                      // "/"
+		d.cd(APPDIR);
+		QFileInfo fi(d, reader->m_string);
+#endif /* ! USEQPE */
+    if (
+	stat((const char *)reader->m_lastfile, &fnstat) == 0
+	&&
+#ifndef USEQPE
+	stat((const char *)fi.absFilePath(), &bkstat) == 0
+#else /* USEQPE */
+	stat((const char *)Global::applicationFileName(APPDIR,reader->m_string), &bkstat) == 0
+#endif /* USEQPE */
+	)
+    {
+	if (bkstat.st_mtime < fnstat.st_mtime)
+	{
+#ifndef USEQPE
+	    unlink((const char *)fi.absFilePath());
+#else /* USEQPE */
+	    unlink((const char *)Global::applicationFileName(APPDIR,reader->m_string));
+#endif /* USEQPE */
+	}
+    }
+
+#ifndef USEQPE
+    BkmkFile bf((const char *)fi.absFilePath(), false, true);
+#else /* USEQPE */
+    BkmkFile bf((const char *)Global::applicationFileName(APPDIR,reader->m_string), false, true);
+#endif /* USEQPE */
+
+    reader->pBkmklist = pBkmklist = bf.readall();
+    m_fBkmksChanged = bf.upgraded();
+    if (pBkmklist == NULL)
+    {
+	reader->pBkmklist = pBkmklist = reader->getbkmklist();
+    }
+    if (pBkmklist != NULL)
+	pBkmklist->sort();
+}
+
+void QTReaderApp::addbkmk()
+{
+  m_nRegAction = cAddBkmk;
+  regEdit->setText(reader->firstword());
+  do_regedit();
+}
+
+void QTReaderApp::do_addbkmk(const QString& text)
+{
+	if (text.isEmpty())
+	{
+	  QMessageBox::information(this, PROGNAME, "Need a name for the bookmark\nSelect add again", 1);
+	}
+	else
+	{
+		if (pBkmklist == NULL) reader->pBkmklist = pBkmklist = new CList<Bkmk>;
+#ifdef _UNICODE
+		CBuffer buff;
+		int i = 0;
+		for (i = 0; i < text.length(); i++)
+		{
+		    buff[i] = text[i].unicode();
+		}
+		buff[i] = 0;
+		pBkmklist->push_front(Bkmk(buff.data(), NULL, reader->pagelocate()));
+#else
+		pBkmklist->push_front(Bkmk((const tchar*)text, reader->pagelocate()));
+#endif
+		m_fBkmksChanged = true;
+		pBkmklist->sort();
+		reader->refresh(true);
+	}
+}
+
+void QTReaderApp::UpdateStatus()
+{
+  QString status;
+  for (int i = 0; i < m_statusstring.length(); i++)
+    {
+      if (m_statusstring[i].unicode() == '%')
+	{
+	  i++;
+	  if (i < m_statusstring.length())
+	    {
+	      switch (m_statusstring[i].unicode())
+		{
+		case 'F':
+		  {
+		    unsigned long fs,ts;
+		    reader->sizes(fs,ts);
+		    status += filesize(ts);
+		  }
+		  break;
+		case 'f':
+		  {
+		    status += filesize(reader->pagelocate());
+		  }
+		  break;
+		case 'D':
+		  {
+		    status += filesize(reader->buffdoc.endSection()-reader->buffdoc.startSection());
+		  }
+		  break;
+		case 'd':
+		  {
+		    status += filesize(reader->pagelocate()-reader->buffdoc.startSection());
+		  }
+		  break;
+		case 'P':
+		  {
+		    unsigned long fs,ts;
+		    reader->sizes(fs,ts);
+		    status += percent(reader->pagelocate(),ts);
+		  }
+		  break;
+		case 'p':
+		  {
+		    status += percent(reader->pagelocate()-reader->buffdoc.startSection(),reader->buffdoc.endSection()-reader->buffdoc.startSection());
+		  }
+		  break;
+		case 'z':
+		  {
+		    //	    qDebug("case d");
+		    status += QString().setNum(reader->m_fontControl.currentsize()*10);
+		  }
+		  break;
+		default:
+		  status += m_statusstring[i];
+		}
+	    }
+	}
+      else
+	{
+	  status += m_statusstring[i];
+	}
+    }
+  m_prog->setText(status);
+}
+
+void QTReaderApp::OnRedraw()
+{
+  if ((pBkmklist != NULL) && (m_bkmkAvail != NULL))
+    {
+      bool found = findNextBookmark(reader->pagelocate());
+      m_bkmkAvail->setEnabled(found);
+    }
+  if (m_scrollbar != NULL)
+    {
+      //qDebug("OnRedraw:[%u, %u]", reader->buffdoc.startSection(), reader->buffdoc.endSection());
+      scrollbar->setRange(reader->buffdoc.startSection(), reader->buffdoc.endSection()-1);
+      scrollbar->setPageStep(reader->locate()-reader->pagelocate());
+      scrollbar->setValue((reader->m_rotated) ? 
+			  (reader->buffdoc.endSection() - reader->locate()+reader->buffdoc.startSection()) :
+			  reader->pagelocate());
+    }
+  if (m_prog->isVisible())
+    {
+      //      qDebug("updating status");
+      UpdateStatus();
+      //      qDebug("updated status");
+    }
+}
+
+void QTReaderApp::showAnnotation()
+{
+    m_annoWin->setName(toQString(m_anno->name()));
+    m_annoWin->setAnno(toQString(m_anno->anno()));
+    m_annoWin->setColor(QColor(m_anno->red(), m_anno->green(), m_anno->blue()));
+    m_annoIsEditing = false;
+#ifdef USEQPE
+    Global::showInputMethod();
+#endif
+    editorStack->raiseWidget( m_annoWin );
+    hidetoolbars();
+    m_annoWin->setFocus();
+}
+
+void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, size_t posn2, const QString& line)
+{
+////    qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
+
+    if (m_doClipboard)
+    {
+	QClipboard* cb = QApplication::clipboard();
+	cb->setText(wrd);
+#ifdef USEQPE
+	if (wrd.length() > 10)
+	{
+	    Global::statusMessage(wrd.left(8) + "..");
+	}
+	else
+	{
+	    Global::statusMessage(wrd);
+	}
+#endif
+    }
+    if (m_doAnnotation)
+    {
+//	addAnno(wrd, "Need to be able to edit this", posn);
+	m_annoWin->setName(line);
+	m_annoWin->setAnno("");
+	m_annoWin->setPosn(posn);
+	m_annoWin->setPosn2(posn2);
+	m_annoIsEditing = true;
+#ifdef USEQPE
+	Global::showInputMethod();
+#endif
+	editorStack->raiseWidget( m_annoWin );
+	hidetoolbars();
+    }
+#ifdef USEQPE
+    if (m_doDictionary)
+    {
+	if (!m_targetapp.isEmpty() && !m_targetmsg.isEmpty())
+	{
+	    QCopEnvelope e(("QPE/Application/"+m_targetapp).utf8(), (m_targetmsg+"(QString)").utf8());
+	    e << wrd;
+	}
+    }
+#endif
+}
+
+void QTReaderApp::doAction(QKeyEvent* e)
+{
+  QMap<orKey,int>::Iterator f = kmap.end();
+
+  if (reader->m_autoScroll)
+    {
+      f = kmap.find(orKey(e->state(), e->key(), true));
+    }
+  if (f == kmap.end())
+    {
+      f = kmap.find(orKey(e->state(), e->key(), false));
+    }
+
+    if (f == kmap.end())
+    {
+      qDebug("doaction (no action) : %d %d %d", e->key(), e->state(), f.data());
+	e->ignore();
+    }
+    else
+    {
+      qDebug("doaction (some action) : %d %d %d", e->key(), e->state(), f.data());
+      ActionTypes a = (ActionTypes)f.data();
+	e->accept();
+//	qDebug("Accepted");
+	switch (a)
+	{
+	case cesGotoLink:
+	  {
+	    reader->gotoLink();
+	  }
+	  break;
+	case cesNextLink:
+	  {
+	    reader->getNextLink();
+	  }
+	  break;
+	case cesInvertColours:
+	  m_inverse_action->setOn(!reader->bInverse);
+	  break;
+	case cesToggleBars:
+	  m_hidebars = !m_hidebars;
+	  if (m_hidebars)
+	    {
+#ifdef USEQPE
+	      menubar->hide();
+#endif
+	      if (fileBar != NULL) fileBar->hide();
+	      if (viewBar != NULL) viewBar->hide();
+	      if (navBar != NULL) navBar->hide();
+	      if (markBar != NULL) markBar->hide();
+	      mb->hide();
+	    }
+	  else
+	    {
+#ifdef USEQPE
+	      menubar->show();
+#endif
+	      if (fileBar != NULL) fileBar->show();
+	      if (viewBar != NULL) viewBar->show();
+	      if (navBar != NULL) navBar->show();
+	      if (markBar != NULL) markBar->show();
+	      mb->show();
+	    }
+	  break;
+	case cesToggleScrollBar:
+	  if (m_scrollbar != NULL)
+	    {
+	      if (m_scrollbar->isHidden())
+		{
+		  m_scrollishidden = false;
+		  m_scrollbar->show();
+		  reader->m_scrollpos = (m_qtscroll == 0) ? m_localscroll : 0;
+		}
+	      else
+		{
+		  m_scrollishidden = true;
+		  m_scrollbar->hide();
+		  reader->m_scrollpos = m_localscroll;
+		}
+	    }
+	  break;
+	case cesToggleStatusBar:
+	  if (m_prog != NULL)
+	    {
+	      if (m_prog->isHidden())
+		{
+		  m_statusishidden = false;
+		  m_prog->show();
+		}
+	      else
+		{
+		  m_statusishidden = true;
+		  m_prog->hide();
+		}
+	    }
+	  break;
+	    case cesOpenFile:
+	    {
+	      qDebug("Open file");
+		fileOpen();
+	    }
+	    break;
+	    case cesAutoScroll:
+	    {
+		reader->setautoscroll(!reader->m_autoScroll);
+		setScrollState(reader->m_autoScroll);
+	    }
+	    break;
+	    case cesActionMark:
+	    {
+		addbkmk();
+	    }
+	    break;
+	    case cesFullScreen:
+	    {
+		m_actFullscreen->setOn(!m_fullscreen);
+	    }
+	    break;
+	    case cesRotate:
+	    {
+		m_rotate_action->setOn(!reader->m_rotated);
+	    }
+	    break;
+	    case cesActionAnno:
+	    {
+		addanno();
+	    }
+	    break;
+	    case cesZoomIn:
+		zoomin();
+		break;
+	    case cesZoomOut:
+		zoomout();
+		break;
+	    case cesBack:
+		reader->goBack();
+		break;
+	    case cesForward:
+		reader->goForward();
+		break;
+	    case cesHome:
+		reader->goHome();
+		break;
+	    case cesPageUp:
+		reader->dopageup();
+		/*
+		ftime(&m_lastkeytime);
+		m_fndelay = m_debounce;
+		//
+		{
+		  timeb now;
+		  ftime(&now);
+		  m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+100;
+		}
+		*/
+		break;
+	    case cesPageDown:
+		reader->dopagedn();
+		/*
+		ftime(&m_lastkeytime);
+		m_fndelay = m_debounce;
+		//		
+			if (m_debounce != 0)
+			{
+			timeb now;
+			ftime(&now);
+			m_fndelay = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm+10;
+			}
+		*/
+		break;
+	    case cesLineUp:
+		reader->lineUp();
+		break;
+	    case cesLineDown:
+		reader->lineDown();
+		break;
+	    case cesStartDoc:
+		gotoStart();
+		break;
+	    case cesEndDoc:
+		gotoEnd();
+		break;
+	    case cesScrollMore:
+		reader->increaseScroll();
+		break;
+	    case cesScrollLess:
+		reader->reduceScroll();
+		break;
+	    default:
+		qDebug("Unknown ActionType:%u", a);
+		break;
+	}
+    }
+}
+
+void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }
+void QTReaderApp::restoreFocus() { reader->setFocus(); } 
+
+void QTReaderApp::SaveConfig()
+{
+    m_nRegAction = cSetConfigName;
+    regEdit->setText(reader->m_string);
+    do_regedit();
+}
+
+void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
+{
+//    qDebug("do_saveconfig:%s", (const char*)_txt);
+#ifdef USEQPE
+    QString configname;
+    Config::Domain dom;
+
+    if (full)
+    {
+	configname = _txt;
+	dom = Config::User;
+    }
+    else
+    {
+	configname = Global::applicationFileName(APPDIR "/configs", _txt);
+	dom = Config::File;
+    }
+
+    Config config(configname, dom);
+    config.setGroup( "View" );
+
+#else
+	QFileInfo fi;
+	if (full)
+	{
+//	    qDebug("full:%s", (const char*)_txt);
+	    QDir d = QDir::home();                      // "/"
+		if ( !d.cd(_txt) )
+		{                       // "/tmp"
+			qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+			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" );
+			d = QDir::home();
+			d.mkdir(APPDIR);
+			d.cd(APPDIR);
+		}
+		if ( !d.cd("configs") )
+		{                       // "/tmp"
+			qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+			d = QDir::home();
+			d.cd(APPDIR);
+			d.mkdir("configs");
+			d.cd("configs");
+		}
+		fi.setFile(d, _txt);
+	}
+//	qDebug("Path:%s", (const char*)fi.absFilePath());
+	Config config(fi.absFilePath());
+#endif
+
+
+    config.writeEntry( "StripCr", reader->bstripcr );
+    config.writeEntry( "AutoFmt", reader->bautofmt );
+    config.writeEntry( "TextFmt", reader->btextfmt );
+    config.writeEntry( "StripHtml", reader->bstriphtml );
+    config.writeEntry( "Dehyphen", reader->bdehyphen );
+    config.writeEntry( "Depluck", reader->bdepluck );
+    config.writeEntry( "Dejpluck", reader->bdejpluck );
+    config.writeEntry( "OneSpace", reader->bonespace );
+    config.writeEntry( "Unindent", reader->bunindent );
+    config.writeEntry( "Repara", reader->brepara );
+    config.writeEntry( "ReparaString", reader->m_reparastring);
+    config.writeEntry( "BackgroundType" , (int)m_bgtype );
+    config.writeEntry( "Theme", m_themename );
+    config.writeEntry( "DoubleSpace", reader->bdblspce );
+    config.writeEntry( "Indent", reader->bindenter );
+    config.writeEntry( "FontSize", (int)(reader->m_fontControl.currentsize()) );
+    config.writeEntry( "ScrollDelay", reader->m_delay);
+    config.writeEntry( "ScrollStep", reader->m_scrollstep);
+    config.writeEntry( "ScrollType", reader->m_scrolltype );
+    if (full)
+    {
+	config.writeEntry("Debounce", m_debounce);
+	config.writeEntry("FloatDialogs", m_bFloatingDialog);
+	reader->m_lastposn = reader->pagelocate();
+	config.writeEntry( "LastFile", reader->m_lastfile );
+	config.writeEntry( "LastPosn", (int)(reader->pagelocate()) );
+    }
+    config.writeEntry( "PageMode", reader->m_bpagemode );
+    config.writeEntry( "MonoSpaced", reader->m_bMonoSpaced );
+    config.writeEntry( "SwapMouse", reader->m_swapmouse);
+    config.writeEntry( "IsRotated", reader->m_rotated );
+    config.writeEntry("StatusContent", m_statusstring);
+    config.writeEntry("StatusHidden", m_statusishidden);
+    config.writeEntry( "Background", m_background );
+    config.writeEntry( "Foreground", m_foreground );
+    config.writeEntry( "ScrollColour", m_scrollcolor );
+    config.writeEntry( "ScrollBarColour", m_scrollbarcolor );
+    config.writeEntry( "Hyphenate", reader->hyphenate );
+    //    config.writeEntry( "CustomHyphen", reader->buffdoc.getCustomHyphen() );
+    config.writeEntry( "Fontname", reader->m_fontname );
+    config.writeEntry( "Encoding", reader->m_encd );
+    config.writeEntry( "CharSpacing", reader->m_charpc );
+    config.writeEntry( "Overlap", (int)(reader->m_overlap) );
+    config.writeEntry( "Top Margin", (int)reader->m_abstopmargin );
+    config.writeEntry( "Bottom Margin", (int)reader->m_absbottommargin );
+    config.writeEntry( "Left Margin", (int)reader->m_absleft_border );
+    config.writeEntry( "Right Margin", (int)reader->m_absright_border );
+    config.writeEntry( "TargetApp", m_targetapp );
+    config.writeEntry( "TargetMsg", m_targetmsg );
+#ifdef _SCROLLPIPE
+    config.writeEntry( "PipeTarget", reader->m_pipetarget );
+    config.writeEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );
+#endif
+    config.writeEntry( "TwoTouch", m_twoTouch );
+    config.writeEntry( "Annotation", m_doAnnotation);
+    config.writeEntry( "Dictionary", m_doDictionary);
+    config.writeEntry( "Clipboard", m_doClipboard);
+    /*
+    config.writeEntry( "SpaceTarget", m_spaceTarget);
+    config.writeEntry( "EscapeTarget", m_escapeTarget);
+    config.writeEntry( "ReturnTarget", m_returnTarget);
+    config.writeEntry( "LeftTarget", m_leftTarget);
+    config.writeEntry( "RightTarget", m_rightTarget);
+    config.writeEntry( "UpTarget", m_upTarget);
+    config.writeEntry( "DownTarget", m_downTarget);
+    config.writeEntry("LeftScroll", m_leftScroll);
+    config.writeEntry("RightScroll", m_rightScroll);
+    config.writeEntry("UpScroll", m_upScroll);
+    config.writeEntry("DownScroll", m_downScroll);
+    */
+    config.writeEntry( "Repalm", reader->brepalm );
+    config.writeEntry( "HideScrollBar", m_scrollishidden );
+    config.writeEntry( "Kern", reader->bkern );
+    config.writeEntry( "Remap", reader->bremap );
+    config.writeEntry( "Peanut", reader->bpeanut );
+    config.writeEntry( "MakeBold", reader->bmakebold );
+    config.writeEntry( "Continuous", reader->m_continuousDocument );
+    config.writeEntry( "FullJust", reader->bfulljust );
+    //    config.writeEntry( "Negative", reader->bNegative );
+    config.writeEntry( "Inverse", reader->bInverse );
+    config.writeEntry( "FixGraphics", reader->m_fontControl.FixGraphics());
+    config.writeEntry( "ExtraSpace", reader->getextraspace() );
+    config.writeEntry( "ExtraLead", reader->getlead() );
+    config.writeEntry( "Basesize",  (int)reader->getBaseSize());
+    config.writeEntry( "RequestorFontChange", m_propogatefontchange);
+#ifdef USEQPE
+    config.writeEntry( "GrabKeyboard", m_grabkeyboard );
+#endif
+    if (full)
+    {
+	config.setGroup( "Toolbar" );
+	config.writeEntry("QTScrollBar", m_qtscroll);
+	config.writeEntry("LocalScrollBar", m_localscroll);
+	config.writeEntry("Movable", m_tbmovesave);
+	config.writeEntry("Policy", m_tbpolsave);
+	config.writeEntry("Position", m_tbposition);
+#ifndef USEQPE
+	if (!isMaximized() && !isMinimized())
+	  {
+	    config.setGroup( "Geometry" );
+	    config.writeEntry( "x", x() );
+	    config.writeEntry( "y", y() );
+	    config.writeEntry( "width", width() );
+	    config.writeEntry( "height", height() );
+	  }
+#endif
+    }
+}
+
+#ifdef _SCROLLPIPE
+void QTReaderApp::setpipetarget()
+{
+    m_nRegAction = cSetPipeTarget;
+    QString text = (reader->m_pipetarget.isEmpty()) ? QString("") : reader->m_pipetarget;
+    regEdit->setText(text);
+    do_regedit();
+}
+
+void QTReaderApp::do_setpipetarget(const QString& _txt)
+{
+    reader->m_pipetarget = _txt;
+}
+
+void QTReaderApp::setpause(bool sfs)
+{
+    reader->m_pauseAfterEachPara = sfs;
+}
+#endif
+
+void QTReaderApp::monospace(bool _b)
+{
+    reader->setmono(_b);
+}
+
+bool QTReaderApp::readconfig(const QString& dirname, const QString& _txt, bool full=false)
+{
+#ifdef USEQPE
+    QString configname;
+    Config::Domain dom;
+
+    if (full)
+    {
+	configname = _txt;
+	dom = Config::User;
+    }
+    else
+    {
+	configname = Global::applicationFileName(dirname, _txt);
+	QFileInfo fm(configname);
+	if ( !fm.exists() ) return false;
+	dom = Config::File;
+    }
+
+    Config config(configname, dom);
+    config.setGroup( "View" );
+
+#else
+	QString fullname;
+	if (full)
+	{
+	  fullname = QDir::homeDirPath() + "/" + _txt + "/" + INIFILE;
+	}
+	else
+	{
+	  fullname = QDir::homeDirPath() + "/" + dirname + "/" + _txt;
+	}
+    if (!QFile::exists(fullname)) return false;
+
+    Config config(fullname);
+#endif
+    if (full)
+    {
+	config.setGroup("Toolbar");
+	m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", m_tbmovesave);
+	m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", m_tbpolsave);
+	m_tbposition = (ToolBarDock)config.readNumEntry("Position", m_tbposition);
+    }
+    config.setGroup( "View" );
+    m_bFloatingDialog = config.readBoolEntry("FloatDialogs", m_bFloatingDialog);
+    reader->bstripcr = config.readBoolEntry( "StripCr", reader->bstripcr );
+    reader->bfulljust = config.readBoolEntry( "FullJust", reader->bfulljust );
+    reader->bInverse = config.readBoolEntry( "Inverse", reader->bInverse );
+    //    reader->bNegative = config.readBoolEntry( "Negative", false );
+    reader->m_fontControl.FixGraphics(config.readBoolEntry( "FixGraphics", reader->m_fontControl.FixGraphics() ));
+    reader->setextraspace(config.readNumEntry( "ExtraSpace", reader->getextraspace() ));
+    reader->setlead(config.readNumEntry( "ExtraLead", reader->getlead() ));
+    reader->btextfmt = config.readBoolEntry( "TextFmt", reader->btextfmt );
+    reader->bautofmt = config.readBoolEntry( "AutoFmt", reader->bautofmt );
+    reader->bstriphtml = config.readBoolEntry( "StripHtml", reader->bstriphtml );
+    reader->bpeanut = config.readBoolEntry( "Peanut", reader->bpeanut );
+    reader->bdehyphen = config.readBoolEntry( "Dehyphen", reader->bdehyphen );
+    reader->bdepluck = config.readBoolEntry( "Depluck", reader->bdepluck );
+    reader->bdejpluck = config.readBoolEntry( "Dejpluck", reader->bdejpluck );
+    reader->bonespace = config.readBoolEntry( "OneSpace", reader->bonespace );
+    reader->bunindent = config.readBoolEntry( "Unindent", reader->bunindent );
+    reader->brepara = config.readBoolEntry( "Repara", reader->brepara );
+    reader->m_reparastring = config.readEntry( "ReparaString", reader->m_reparastring);
+    m_bgtype = (bground)config.readNumEntry( "BackgroundType" , m_bgtype );
+    m_themename = config.readEntry("Theme", m_themename );
+    reader->bdblspce = config.readBoolEntry( "DoubleSpace", reader->bdblspce );
+    reader->bindenter = config.readNumEntry( "Indent", reader->bindenter );
+    reader->m_textsize = config.readNumEntry( "FontSize", reader->m_textsize );
+    reader->m_delay = config.readNumEntry( "ScrollDelay", reader->m_delay);
+    reader->m_scrollstep = config.readNumEntry( "ScrollStep", reader->m_scrollstep);
+    reader->m_scrolltype = config.readNumEntry( "ScrollType", reader->m_scrolltype);
+    if (full)
+    {
+      reader->m_lastfile = config.readEntry( "LastFile", reader->m_lastfile );
+      reader->m_lastposn = config.readNumEntry( "LastPosn", reader->m_lastposn );
+    }
+    reader->m_bpagemode = config.readBoolEntry( "PageMode", reader->m_bpagemode );
+    reader->m_bMonoSpaced = config.readBoolEntry( "MonoSpaced", reader->m_bMonoSpaced);
+    reader->m_rotated = config.readBoolEntry( "IsRotated", reader->m_rotated );
+    m_statusstring = config.readEntry("StatusContent", m_statusstring);
+    m_statusishidden = config.readBoolEntry("StatusHidden", m_statusishidden);
+    m_background = config.readNumEntry( "Background", m_background );
+    reader->setBackground(getcolour(m_background));
+    m_foreground = config.readNumEntry( "Foreground", m_foreground );
+    reader->setForeground(getcolour(m_foreground));
+    m_scrollcolor = config.readNumEntry( "ScrollColour", m_scrollcolor);
+    setscrollcolour();
+    m_scrollbarcolor = config.readNumEntry( "ScrollBarColour", m_scrollbarcolor);
+    setscrollbarcolour();
+    reader->hyphenate = config.readBoolEntry( "Hyphenate", reader->hyphenate );
+    //  reader->buffdoc.setCustomHyphen(config.readBoolEntry( "CustomHyphen", false ));
+    reader->m_swapmouse = config.readBoolEntry( "SwapMouse", reader->m_swapmouse);
+    reader->m_fontname = config.readEntry( "Fontname", reader->m_fontname );
+    reader->m_encd = config.readNumEntry( "Encoding", reader->m_encd );
+    reader->m_charpc = config.readNumEntry( "CharSpacing", reader->m_charpc );
+    reader->m_overlap = config.readNumEntry( "Overlap", reader->m_overlap );
+    reader->m_abstopmargin = config.readNumEntry( "Top Margin", reader->m_abstopmargin );
+    reader->m_absbottommargin = config.readNumEntry( "Bottom Margin", reader->m_absbottommargin );
+    reader->m_absleft_border = config.readNumEntry( "Left Margin", reader->m_absleft_border );
+    reader->m_absright_border = config.readNumEntry( "Right Margin", reader->m_absright_border );
+    m_scrollishidden = config.readBoolEntry( "HideScrollBar", m_scrollishidden );
+    reader->brepalm = config.readBoolEntry( "Repalm", reader->brepalm );
+    reader->bkern = config.readBoolEntry( "Kern", reader->bkern );
+    reader->bremap = config.readBoolEntry( "Remap", reader->bremap );
+    reader->bmakebold = config.readBoolEntry( "MakeBold", reader->bmakebold );
+    reader->setContinuous(config.readBoolEntry( "Continuous", reader->m_continuousDocument ));
+    m_targetapp = config.readEntry( "TargetApp", m_targetapp );
+    m_targetmsg = config.readEntry( "TargetMsg", m_targetmsg );
+#ifdef _SCROLLPIPE
+    reader->m_pipetarget = config.readEntry( "PipeTarget", reader->m_pipetarget );
+    reader->m_pauseAfterEachPara = config.readBoolEntry( "PauseAfterPara", reader->m_pauseAfterEachPara );
+#endif
+    m_twoTouch = config.readBoolEntry( "TwoTouch", m_twoTouch);
+    m_doAnnotation = config.readBoolEntry( "Annotation", m_doAnnotation);
+    m_doDictionary = config.readBoolEntry( "Dictionary", m_doDictionary);
+    m_doClipboard = config.readBoolEntry( "Clipboard", m_doClipboard);
+#ifdef USEQPE
+    m_grabkeyboard = config.readBoolEntry( "GrabKeyboard", m_grabkeyboard);
+#endif
+    m_propogatefontchange = config.readBoolEntry( "RequestorFontChange", m_propogatefontchange);
+    reader->setBaseSize(config.readNumEntry( "Basesize", reader->getBaseSize() ));
+    reader->setTwoTouch(m_twoTouch);
+
+    m_touch_action->setOn(m_twoTouch);
+    m_setmono_action->setOn(reader->m_bMonoSpaced);
+    setfontHelper(reader->m_fontname);
+    if (full)
+    {
+	addtoolbars(&config);
+    }
+    reader->setfilter(reader->getfilter());
+    reader->refresh();
+    return true;
+}
+
+bool QTReaderApp::PopulateConfig(const char* tgtdir, bool usedirs)
+{
+    bkmkselector->clear();
+    bkmkselector->setText("Cancel");
+#ifndef USEQPE
+    int cnt = 0;
+
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+	d = QDir::home();
+	d.mkdir(APPDIR);
+	d.cd(APPDIR);
+    }
+    if ( !d.cd(tgtdir) ) {                       // "/tmp"
+        qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );
+	d = QDir::home();
+	d.mkdir(tgtdir);
+	d.cd(tgtdir);
+    }
+    d.setFilter( ((usedirs) ? QDir::Dirs : QDir::Files) | QDir::NoSymLinks );
+//        d.setSorting( QDir::Size | QDir::Reversed );
+
+    const QFileInfoList *list = d.entryInfoList();
+    QFileInfoListIterator it( *list );      // create list iterator
+    QFileInfo *fi;                          // pointer for traversing
+
+    while ( (fi=it.current()) ) {           // for each file...
+  
+	bkmkselector->insertItem(fi->fileName());
+	cnt++;
+			
+	//qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+	++it;                               // goto next list element
+    }
+ 
+#else /* USEQPE */
+    int cnt = 0;
+    DIR *d;
+    char* finaldir;
+    finaldir = new char[strlen(APPDIR)+1+strlen(tgtdir)+1];
+    strcpy(finaldir, APPDIR);
+    strcat(finaldir, "/");
+    strcat(finaldir, tgtdir);
+    d = opendir((const char *)Global::applicationFileName(finaldir,""));
+
+    while(1)
+    {
+	struct dirent* de;
+	struct stat buf;
+	de = readdir(d);
+	if (de == NULL) break;
+
+	if (lstat((const char *)Global::applicationFileName(finaldir,de->d_name),&buf) == 0 && ((usedirs && S_ISDIR(buf.st_mode)) || (!usedirs && S_ISREG(buf.st_mode))))
+	{
+	    bkmkselector->insertItem(de->d_name);
+	    cnt++;
+	}
+    }
+    delete [] finaldir;
+    closedir(d);
+#endif
+    return (cnt > 0);
+}
+
+void QTReaderApp::LoadTheme()
+{
+    if (PopulateConfig("Themes", true))
+      {
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+	m_nBkmkAction = cLdTheme;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No config files");
+}
+
+void QTReaderApp::LoadConfig()
+{
+    if (PopulateConfig("configs"))
+      {
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+	m_nBkmkAction = cLdConfig;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No config files");
+}
+
+void QTReaderApp::TidyConfig()
+{
+    if (PopulateConfig("configs"))
+      {
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+	m_nBkmkAction = cRmConfig;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No config files");
+}
+
+void QTReaderApp::ExportLinks()
+{
+    if (PopulateConfig("urls"))
+      {
+        editorStack->raiseWidget( bkmkselector );
+        hidetoolbars();
+	m_nBkmkAction = cExportLinks;
+      }
+    else
+      QMessageBox::information(this, PROGNAME, "No url files");
+}
+
+void QTReaderApp::OnURLSelected(const QString& href, const size_t tgt)
+{
+#ifndef USEQPE
+  qDebug("URL:%s", (const char*)href);
+  int col = href.find(':');
+  if (col > 0)
+    {
+      QString type = href.left(col);
+      qDebug("Type:%s", (const char*)type);
+    }
+  else
+    {
+      qDebug("No type");
+    }
+#else
+  if (href.isEmpty())
+    {
+      QMessageBox::information(this, PROGNAME, "No URL information supplied");
+    }
+  else
+    {
+      CURLDialog* urld = new CURLDialog(href, false, this);
+      urld->clipboard(m_url_clipboard);
+      urld->localfile(m_url_localfile);
+      urld->globalfile(m_url_globalfile);
+      if (urld->exec())
+	{
+	  m_url_clipboard = urld->clipboard();
+	  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);
+	    }
+	  if (m_url_localfile)
+	    {
+	      writeUrl(reader->m_string, href);
+	    }
+	  if (m_url_globalfile)
+	    {
+	      writeUrl("GlobalURLFile", href);
+	    }
+	}
+      delete urld;
+    }
+#endif
+}
+
+void QTReaderApp::writeUrl(const QString& file, const QString& href)
+{
+    QString filename;
+#ifdef USEQPE
+    filename = Global::applicationFileName(APPDIR "/urls", file);
+#else
+    QFileInfo fi;
+    QDir d = QDir::home();                      // "/"
+    if ( !d.cd(APPDIR) )
+    {                       // "/tmp"
+	qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+	d = QDir::home();
+	d.mkdir(APPDIR);
+	d.cd(APPDIR);
+    }
+    if ( !d.cd("urls") )
+    {                       // "/tmp"
+	qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );
+	d = QDir::home();
+	d.cd(APPDIR);
+	d.mkdir("urls");
+	d.cd("urls");
+    }
+    fi.setFile(d, file);
+    filename = fi.absFilePath();
+#endif
+    FILE* fout = fopen(filename, "a");
+    if (fout != NULL)
+    {
+	fprintf(fout, "<p><a href=\"%s\">%s</a>\n", (const char*)href, (const char*)href);
+	fclose(fout);
+    }
+    else
+    {
+	QMessageBox::warning(this, PROGNAME, "Problem with writing URL");
+    }
+}
+
+QColor QTReaderApp::getcolour(int _c)
+{
+  QColor c = white;
+  switch (_c)
+    {
+    case 0:
+      c = white;
+      break;
+    case 1:
+      c = black;
+      break;
+    case 2:
+      c = darkGray;
+      break;
+    case 3:
+      c = gray;
+      break;
+    case 4:
+      c = lightGray;
+      break;
+    case 5:
+      c = red;
+      break;
+    case 6:
+      c = green;
+      break;
+    case 7:
+      c = blue;
+      break;
+    case 8:
+      c = cyan;
+      break;
+    case 9:
+      c = magenta;
+      break;
+    case 10:
+      c = yellow;
+      break;
+    case 11:
+      c = darkRed;
+      break;
+    case 12:
+      c = darkGreen;
+      break;
+    case 13:
+      c = darkBlue;
+      break;
+    case 14:
+      c = darkCyan;
+      break;
+    case 15:
+      c = darkMagenta;
+      break;
+    case 16:
+      c = darkYellow;
+      break;
+    default:
+      c = lightGray;
+      break;
+    }
+  return c;
+}
+
+void QTReaderApp::setscrollcolour()
+{
+  /*
+  QColor xc = getcolour(m_scrollcolor);
+  int r,g,b;
+  xc.rgb(&r,&g,&b);
+  reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b);
+  */
+  reader->m_scrollcolor = getcolour(m_scrollcolor);
+}
+
+void QTReaderApp::setscrollbarcolour()
+{
+  /*
+  QColor xc = getcolour(m_scrollcolor);
+  int r,g,b;
+  xc.rgb(&r,&g,&b);
+  reader->m_scrollcolor.setRgb(255^r, 255^g, 255^b);
+  */
+  reader->m_scrollbarcolor = getcolour(m_scrollbarcolor);
+}
+
+void QTReaderApp::forceopen(const QString& filename)
+{
+  /*
+    QFileInfo fi(reader->m_lastfile);
+    fi = QFileInfo(filename);
+    QString flnm = fi.absFilePath();
+  */
+  if (!filename.isEmpty())
+    {
+      updatefileinfo();
+      if (pBkmklist != NULL)
+	{
+	  if (m_fBkmksChanged)
+	    {
+	      savebkmks();
+	    }     
+	  delete pBkmklist;
+	  pBkmklist = NULL;
+	  m_fBkmksChanged = false;
+	}
+      reader->disableAutoscroll();
+      openFile(filename);
+      reader->setFocus();
+    }
+}
+
+void QTReaderApp::actionscroll(int v)
+{
+  if (reader->m_rotated)
+    {
+      reader->dopageup(reader->buffdoc.startSection()+reader->buffdoc.endSection()-v);
+    }
+  else
+    {
+      /*
+      if (reader->pagelocate() < v)
+	{
+	  while (reader->pagelocate() < v) reader->lineDown();
+	}
+      else
+      */
+	reader->locate(v);
+    }
+}
+
+void QTReaderApp::setBackgroundBitmap()
+{
+#ifdef USEQPE
+  QString file = APPDIR "/Themes/";
+  file += m_themename;
+    QString tgt = Global::applicationFileName(file,"background");
+#else
+    QString tgt(QDir::homeDirPath());
+    tgt += QString("/" APPDIR "/Themes/") + m_themename + "/background";
+#endif
+    qDebug("Trying to load %s", (const char *)tgt);
+    QPixmap pm(tgt);
+    reader->setBackgroundBitmap(pm, m_bgtype);
+}
+
+/*
+
+     myChannel = new QCopChannel( "QPE/FooBar", this );
+      connect( myChannel, SIGNAL(received(const QCString &, const QByteArray &)),
+               this, SLOT(fooBarMessage( const QCString &, const QByteArray &)) );
+  
+*/
diff --git a/noncore/apps/opie-reader/WeaselCodec.mak b/noncore/apps/opie-reader/WeaselCodec.mak
deleted file mode 100644
index 3bac5b9..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.mak
+++ b/dev/null
@@ -1,166 +0,0 @@
-#############################################################################
-# Makefile for building: libWeasel.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:43:37 2004
-# Project:  WeaselCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libWeasel.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = ztxt.h
-SOURCES = ztxt.cpp
-OBJECTS = QREADEROBJS/ztxt.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = WeaselCodec.pro
-QMAKE_TARGET = Weasel
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libWeasel.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libWeasel.a
-TARGETD	= libWeasel.so.1.0.0
-TARGET0	= libWeasel.so
-TARGET1	= libWeasel.so.1
-TARGET2	= libWeasel.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: WeaselCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-WeaselCodec.mak: WeaselCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
-qmake: 
-	@$(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/Weasel && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Weasel/ && ( cd `dirname QREADEROBJS/Weasel` && $(TAR) Weasel.tar Weasel && $(GZIP) Weasel.tar ) && $(MOVE) `dirname QREADEROBJS/Weasel`/Weasel.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Weasel
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/ztxt.o: ztxt.cpp ztxt.h \
-		my_list.h \
-		Bkmks.h \
-		QREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ztxt.o ztxt.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.omak b/noncore/apps/opie-reader/WeaselCodec.omak
deleted file mode 100644
index c3976c7..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.omak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libWeasel.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: WeaselCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libWeasel.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	ztxt.h
-SOURCES =	ztxt.cpp
-OBJECTS =	OREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libWeasel.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libWeasel.a
-TARGETD	=	libWeasel.so.1.0.0
-TARGET0	=	libWeasel.so
-TARGET1	=	libWeasel.so.1
-TARGET2	=	libWeasel.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: WeaselCodec.omak
-
-WeaselCodec.omak: WeaselCodec.opro
-	tmake WeaselCodec.opro -o WeaselCodec.omak
-
-dist:
-	$(TAR) WeaselCodec.opro.tar WeaselCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) WeaselCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ztxt.o ztxt.cpp
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.wmak b/noncore/apps/opie-reader/WeaselCodec.wmak
deleted file mode 100644
index fd41b8a..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.wmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libWeasel.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: WeaselCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libWeasel.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	ztxt.h
-SOURCES =	ztxt.cpp
-OBJECTS =	WSREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libWeasel.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libWeasel.a
-TARGETD	=	libWeasel.so.1.0.0
-TARGET0	=	libWeasel.so
-TARGET1	=	libWeasel.so.1
-TARGET2	=	libWeasel.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: WeaselCodec.wmak
-
-WeaselCodec.wmak: WeaselCodec.wpro
-	tmake WeaselCodec.wpro -o WeaselCodec.wmak
-
-dist:
-	$(TAR) WeaselCodec.wpro.tar WeaselCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) WeaselCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		WSREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ztxt.o ztxt.cpp
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.wpro b/noncore/apps/opie-reader/WeaselCodec.wpro
deleted file mode 100644
index b71eefb..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.wpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= ztxt.h
-
-SOURCES		= ztxt.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Weasel
-LIBS            += -lreader_pdb -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/WeaselCodec.zmak b/noncore/apps/opie-reader/WeaselCodec.zmak
deleted file mode 100644
index 50a54f7..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.zmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libWeasel.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: WeaselCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libWeasel.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	ztxt.h
-SOURCES =	ztxt.cpp
-OBJECTS =	ZREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libWeasel.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libWeasel.a
-TARGETD	=	libWeasel.so.1.0.0
-TARGET0	=	libWeasel.so
-TARGET1	=	libWeasel.so.1
-TARGET2	=	libWeasel.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: WeaselCodec.zmak
-
-WeaselCodec.zmak: WeaselCodec.zpro
-	tmake WeaselCodec.zpro -o WeaselCodec.zmak
-
-dist:
-	$(TAR) WeaselCodec.zpro.tar WeaselCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) WeaselCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ztxt.o ztxt.cpp
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.zpro b/noncore/apps/opie-reader/WeaselCodec.zpro
deleted file mode 100644
index 1ab1553..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.zpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= ztxt.h
-
-SOURCES		= ztxt.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Weasel
-LIBS            += -lreader_pdb -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/codeclib.mak b/noncore/apps/opie-reader/codeclib.mak
deleted file mode 100644
index bfdd7bb..0000000
--- a/noncore/apps/opie-reader/codeclib.mak
+++ b/dev/null
@@ -1,195 +0,0 @@
-#############################################################################
-# Makefile for building: libreader_codec.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:37:45 2004
-# Project:  codeclib.pro
-# Template: lib
-# Command: $(QMAKE) -o codeclib.mak codeclib.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libreader_codec.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = pdb.h
-SOURCES = CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS = QREADEROBJS/CExpander.o \
-		QREADEROBJS/CBuffer.o \
-		QREADEROBJS/StyleConsts.o \
-		QREADEROBJS/hrule.o \
-		QREADEROBJS/Navigation.o \
-		QREADEROBJS/Bkmks.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = codeclib.pro
-QMAKE_TARGET = reader_codec
-DESTDIR  = $(READERDIR)/lib/
-TARGET   = libreader_codec.so.1.0.0
-TARGETA	= $(READERDIR)/lib/libreader_codec.a
-TARGETD	= libreader_codec.so.1.0.0
-TARGET0	= libreader_codec.so
-TARGET1	= libreader_codec.so.1
-TARGET2	= libreader_codec.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: codeclib.mak  $(READERDIR)/lib/$(TARGET)
-
-$(READERDIR)/lib/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-codeclib.mak: codeclib.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o codeclib.mak codeclib.pro
-qmake: 
-	@$(QMAKE) -o codeclib.mak codeclib.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/reader_codec && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_codec/ && ( cd `dirname QREADEROBJS/reader_codec` && $(TAR) reader_codec.tar reader_codec && $(GZIP) reader_codec.tar ) && $(MOVE) `dirname QREADEROBJS/reader_codec`/reader_codec.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_codec
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/CExpander.o: CExpander.cpp CExpander.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CExpander.o CExpander.cpp
-
-QREADEROBJS/CBuffer.o: CBuffer.cpp CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CBuffer.o CBuffer.cpp
-
-QREADEROBJS/StyleConsts.o: StyleConsts.cpp StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-QREADEROBJS/hrule.o: hrule.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/hrule.o hrule.cpp
-
-QREADEROBJS/Navigation.o: Navigation.cpp Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Navigation.o Navigation.cpp
-
-QREADEROBJS/Bkmks.o: Bkmks.cpp Bkmks.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h \
-		config.h \
-		Filedata.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Bkmks.o Bkmks.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/codeclib.omak b/noncore/apps/opie-reader/codeclib.omak
deleted file mode 100644
index 1ea5fbc..0000000
--- a/noncore/apps/opie-reader/codeclib.omak
+++ b/dev/null
@@ -1,160 +0,0 @@
-#############################################################################
-# Makefile for building libreader_codec.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: codeclib.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_codec.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS =	OREADEROBJS/CExpander.o \
-		OREADEROBJS/CBuffer.o \
-		OREADEROBJS/StyleConsts.o \
-		OREADEROBJS/hrule.o \
-		OREADEROBJS/Navigation.o \
-		OREADEROBJS/Bkmks.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_codec.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_codec.a
-TARGETD	=	libreader_codec.so.1.0.0
-TARGET0	=	libreader_codec.so
-TARGET1	=	libreader_codec.so.1
-TARGET2	=	libreader_codec.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_codec.so.1.0.0
-
-$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: codeclib.omak
-
-codeclib.omak: codeclib.opro
-	tmake codeclib.opro -o codeclib.omak
-
-dist:
-	$(TAR) codeclib.opro.tar codeclib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) codeclib.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CExpander.o CExpander.cpp
-
-OREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CBuffer.o CBuffer.cpp
-
-OREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-OREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/hrule.o hrule.cpp
-
-OREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Navigation.o Navigation.cpp
-
-OREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Bkmks.o Bkmks.cpp
-
diff --git a/noncore/apps/opie-reader/codeclib.wmak b/noncore/apps/opie-reader/codeclib.wmak
deleted file mode 100644
index ea09e49..0000000
--- a/noncore/apps/opie-reader/codeclib.wmak
+++ b/dev/null
@@ -1,160 +0,0 @@
-#############################################################################
-# Makefile for building libreader_codec.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: codeclib.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libreader_codec.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS =	WSREADEROBJS/CExpander.o \
-		WSREADEROBJS/CBuffer.o \
-		WSREADEROBJS/StyleConsts.o \
-		WSREADEROBJS/hrule.o \
-		WSREADEROBJS/Navigation.o \
-		WSREADEROBJS/Bkmks.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_codec.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_codec.a
-TARGETD	=	libreader_codec.so.1.0.0
-TARGET0	=	libreader_codec.so
-TARGET1	=	libreader_codec.so.1
-TARGET2	=	libreader_codec.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_codec.so.1.0.0
-
-$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: codeclib.wmak
-
-codeclib.wmak: codeclib.wpro
-	tmake codeclib.wpro -o codeclib.wmak
-
-dist:
-	$(TAR) codeclib.wpro.tar codeclib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) codeclib.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CExpander.o CExpander.cpp
-
-WSREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CBuffer.o CBuffer.cpp
-
-WSREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-WSREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/hrule.o hrule.cpp
-
-WSREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Navigation.o Navigation.cpp
-
-WSREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Bkmks.o Bkmks.cpp
-
diff --git a/noncore/apps/opie-reader/codeclib.wpro b/noncore/apps/opie-reader/codeclib.wpro
deleted file mode 100644
index f4a467a..0000000
--- a/noncore/apps/opie-reader/codeclib.wpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= CExpander.cpp CBuffer.cpp StyleConsts.cpp \
-		  hrule.cpp Navigation.cpp Bkmks.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/codeclib.zmak b/noncore/apps/opie-reader/codeclib.zmak
deleted file mode 100644
index d81d347..0000000
--- a/noncore/apps/opie-reader/codeclib.zmak
+++ b/dev/null
@@ -1,160 +0,0 @@
-#############################################################################
-# Makefile for building libreader_codec.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: codeclib.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_codec.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS =	ZREADEROBJS/CExpander.o \
-		ZREADEROBJS/CBuffer.o \
-		ZREADEROBJS/StyleConsts.o \
-		ZREADEROBJS/hrule.o \
-		ZREADEROBJS/Navigation.o \
-		ZREADEROBJS/Bkmks.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_codec.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_codec.a
-TARGETD	=	libreader_codec.so.1.0.0
-TARGET0	=	libreader_codec.so
-TARGET1	=	libreader_codec.so.1
-TARGET2	=	libreader_codec.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_codec.so.1.0.0
-
-$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: codeclib.zmak
-
-codeclib.zmak: codeclib.zpro
-	tmake codeclib.zpro -o codeclib.zmak
-
-dist:
-	$(TAR) codeclib.zpro.tar codeclib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) codeclib.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CExpander.o CExpander.cpp
-
-ZREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CBuffer.o CBuffer.cpp
-
-ZREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-ZREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/hrule.o hrule.cpp
-
-ZREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Navigation.o Navigation.cpp
-
-ZREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Bkmks.o Bkmks.cpp
-
diff --git a/noncore/apps/opie-reader/codeclib.zpro b/noncore/apps/opie-reader/codeclib.zpro
deleted file mode 100644
index 93908c6..0000000
--- a/noncore/apps/opie-reader/codeclib.zpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= CExpander.cpp CBuffer.cpp StyleConsts.cpp \
-		  hrule.cpp Navigation.cpp Bkmks.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/iSiloCodec.mak b/noncore/apps/opie-reader/iSiloCodec.mak
deleted file mode 100644
index d0ef46e..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.mak
+++ b/dev/null
@@ -1,162 +0,0 @@
-#############################################################################
-# Makefile for building: libiSilo.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:39:31 2004
-# Project:  iSiloCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libiSilo.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = 
-SOURCES = iSilo.cpp
-OBJECTS = QREADEROBJS/iSilo.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = iSiloCodec.pro
-QMAKE_TARGET = iSilo
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libiSilo.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libiSilo.a
-TARGETD	= libiSilo.so.1.0.0
-TARGET0	= libiSilo.so
-TARGET1	= libiSilo.so.1
-TARGET2	= libiSilo.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: iSiloCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-iSiloCodec.mak: iSiloCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
-qmake: 
-	@$(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/iSilo && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/iSilo/ && ( cd `dirname QREADEROBJS/iSilo` && $(TAR) iSilo.tar iSilo && $(GZIP) iSilo.tar ) && $(MOVE) `dirname QREADEROBJS/iSilo`/iSilo.tar.gz . && $(DEL_FILE) -r QREADEROBJS/iSilo
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/iSilo.o: iSilo.cpp iSilo.h \
-		pdb.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/iSilo.o iSilo.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.omak b/noncore/apps/opie-reader/iSiloCodec.omak
deleted file mode 100644
index a3f1d90..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.omak
+++ b/dev/null
@@ -1,123 +0,0 @@
-#############################################################################
-# Makefile for building libiSilo.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: iSiloCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libiSilo.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	
-SOURCES =	iSilo.cpp
-OBJECTS =	OREADEROBJS/iSilo.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libiSilo.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libiSilo.a
-TARGETD	=	libiSilo.so.1.0.0
-TARGET0	=	libiSilo.so
-TARGET1	=	libiSilo.so.1
-TARGET2	=	libiSilo.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: iSiloCodec.omak
-
-iSiloCodec.omak: iSiloCodec.opro
-	tmake iSiloCodec.opro -o iSiloCodec.omak
-
-dist:
-	$(TAR) iSiloCodec.opro.tar iSiloCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) iSiloCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/iSilo.o iSilo.cpp
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.wmak b/noncore/apps/opie-reader/iSiloCodec.wmak
deleted file mode 100644
index 452b220..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.wmak
+++ b/dev/null
@@ -1,123 +0,0 @@
-#############################################################################
-# Makefile for building libiSilo.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: iSiloCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libiSilo.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	
-SOURCES =	iSilo.cpp
-OBJECTS =	WSREADEROBJS/iSilo.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libiSilo.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libiSilo.a
-TARGETD	=	libiSilo.so.1.0.0
-TARGET0	=	libiSilo.so
-TARGET1	=	libiSilo.so.1
-TARGET2	=	libiSilo.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: iSiloCodec.wmak
-
-iSiloCodec.wmak: iSiloCodec.wpro
-	tmake iSiloCodec.wpro -o iSiloCodec.wmak
-
-dist:
-	$(TAR) iSiloCodec.wpro.tar iSiloCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) iSiloCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/iSilo.o iSilo.cpp
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.wpro b/noncore/apps/opie-reader/iSiloCodec.wpro
deleted file mode 100644
index 4967689..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-#HEADERS		= Aportis.h
-
-SOURCES		= iSilo.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= iSilo
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/iSiloCodec.zmak b/noncore/apps/opie-reader/iSiloCodec.zmak
deleted file mode 100644
index c6c9ed6..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.zmak
+++ b/dev/null
@@ -1,123 +0,0 @@
-#############################################################################
-# Makefile for building libiSilo.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: iSiloCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libiSilo.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	
-SOURCES =	iSilo.cpp
-OBJECTS =	ZREADEROBJS/iSilo.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libiSilo.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libiSilo.a
-TARGETD	=	libiSilo.so.1.0.0
-TARGET0	=	libiSilo.so
-TARGET1	=	libiSilo.so.1
-TARGET2	=	libiSilo.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: iSiloCodec.zmak
-
-iSiloCodec.zmak: iSiloCodec.zpro
-	tmake iSiloCodec.zpro -o iSiloCodec.zmak
-
-dist:
-	$(TAR) iSiloCodec.zpro.tar iSiloCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) iSiloCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/iSilo.o iSilo.cpp
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.zpro b/noncore/apps/opie-reader/iSiloCodec.zpro
deleted file mode 100644
index 525b044..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-#HEADERS		= Aportis.h
-
-SOURCES		= iSilo.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= iSilo
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index bf8e8f2..fc1d721 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -1,16 +1,16 @@
 TEMPLATE        = subdirs
 SUBDIRS         = pluckerbaselib \
                   codeclib \
+                  pdblib \
                   PluckerCodec \
                   AportisCodec \
                   CHM \
                   HTMLFilter \
                   WeaselCodec \
                   iSiloCodec \
-                  pdblib \
                   ppmsCodec \
                   reader
 
 include ( $(OPIEDIR)/include.pro )
 
 
diff --git a/noncore/apps/opie-reader/pdblib.mak b/noncore/apps/opie-reader/pdblib.mak
deleted file mode 100644
index 8174309..0000000
--- a/noncore/apps/opie-reader/pdblib.mak
+++ b/dev/null
@@ -1,161 +0,0 @@
-#############################################################################
-# Makefile for building: libreader_pdb.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:39:56 2004
-# Project:  pdblib.pro
-# Template: lib
-# Command: $(QMAKE) -o pdblib.mak pdblib.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libreader_pdb.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = pdb.h
-SOURCES = pdb.cpp
-OBJECTS = QREADEROBJS/pdb.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = pdblib.pro
-QMAKE_TARGET = reader_pdb
-DESTDIR  = $(READERDIR)/lib/
-TARGET   = libreader_pdb.so.1.0.0
-TARGETA	= $(READERDIR)/lib/libreader_pdb.a
-TARGETD	= libreader_pdb.so.1.0.0
-TARGET0	= libreader_pdb.so
-TARGET1	= libreader_pdb.so.1
-TARGET2	= libreader_pdb.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: pdblib.mak  $(READERDIR)/lib/$(TARGET)
-
-$(READERDIR)/lib/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-pdblib.mak: pdblib.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o pdblib.mak pdblib.pro
-qmake: 
-	@$(QMAKE) -o pdblib.mak pdblib.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/reader_pdb && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_pdb/ && ( cd `dirname QREADEROBJS/reader_pdb` && $(TAR) reader_pdb.tar reader_pdb && $(GZIP) reader_pdb.tar ) && $(MOVE) `dirname QREADEROBJS/reader_pdb`/reader_pdb.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_pdb
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/pdb.o: pdb.cpp pdb.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/pdb.o pdb.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/pdblib.omak b/noncore/apps/opie-reader/pdblib.omak
deleted file mode 100644
index b3a67c7..0000000
--- a/noncore/apps/opie-reader/pdblib.omak
+++ b/dev/null
@@ -1,122 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pdb.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: pdblib.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pdb.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	pdb.cpp
-OBJECTS =	OREADEROBJS/pdb.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pdb.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pdb.a
-TARGETD	=	libreader_pdb.so.1.0.0
-TARGET0	=	libreader_pdb.so
-TARGET1	=	libreader_pdb.so.1
-TARGET2	=	libreader_pdb.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_pdb.so.1.0.0
-
-$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pdblib.omak
-
-pdblib.omak: pdblib.opro
-	tmake pdblib.opro -o pdblib.omak
-
-dist:
-	$(TAR) pdblib.opro.tar pdblib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pdblib.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/pdb.o pdb.cpp
-
diff --git a/noncore/apps/opie-reader/pdblib.wmak b/noncore/apps/opie-reader/pdblib.wmak
deleted file mode 100644
index f06f05ad..0000000
--- a/noncore/apps/opie-reader/pdblib.wmak
+++ b/dev/null
@@ -1,122 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pdb.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: pdblib.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libreader_pdb.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	pdb.cpp
-OBJECTS =	WSREADEROBJS/pdb.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pdb.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pdb.a
-TARGETD	=	libreader_pdb.so.1.0.0
-TARGET0	=	libreader_pdb.so
-TARGET1	=	libreader_pdb.so.1
-TARGET2	=	libreader_pdb.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_pdb.so.1.0.0
-
-$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pdblib.wmak
-
-pdblib.wmak: pdblib.wpro
-	tmake pdblib.wpro -o pdblib.wmak
-
-dist:
-	$(TAR) pdblib.wpro.tar pdblib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pdblib.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/pdb.o pdb.cpp
-
diff --git a/noncore/apps/opie-reader/pdblib.wpro b/noncore/apps/opie-reader/pdblib.wpro
deleted file mode 100644
index d78cc29..0000000
--- a/noncore/apps/opie-reader/pdblib.wpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= pdb.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pdb
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/pdblib.zmak b/noncore/apps/opie-reader/pdblib.zmak
deleted file mode 100644
index 2ee26d4..0000000
--- a/noncore/apps/opie-reader/pdblib.zmak
+++ b/dev/null
@@ -1,122 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pdb.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: pdblib.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pdb.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	pdb.cpp
-OBJECTS =	ZREADEROBJS/pdb.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pdb.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pdb.a
-TARGETD	=	libreader_pdb.so.1.0.0
-TARGET0	=	libreader_pdb.so
-TARGET1	=	libreader_pdb.so.1
-TARGET2	=	libreader_pdb.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_pdb.so.1.0.0
-
-$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pdblib.zmak
-
-pdblib.zmak: pdblib.zpro
-	tmake pdblib.zpro -o pdblib.zmak
-
-dist:
-	$(TAR) pdblib.zpro.tar pdblib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pdblib.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/pdb.o pdb.cpp
-
diff --git a/noncore/apps/opie-reader/pdblib.zpro b/noncore/apps/opie-reader/pdblib.zpro
deleted file mode 100644
index 94d3910..0000000
--- a/noncore/apps/opie-reader/pdblib.zpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= pdb.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pdb
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/pluckerbaselib.mak b/noncore/apps/opie-reader/pluckerbaselib.mak
deleted file mode 100644
index 325f3c3..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.mak
+++ b/dev/null
@@ -1,169 +0,0 @@
-#############################################################################
-# Makefile for building: libreader_pluckerbase.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:40:18 2004
-# Project:  pluckerbaselib.pro
-# Template: lib
-# Command: $(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = pdb.h
-SOURCES = plucker_base.cpp
-OBJECTS = QREADEROBJS/plucker_base.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = pluckerbaselib.pro
-QMAKE_TARGET = reader_pluckerbase
-DESTDIR  = $(READERDIR)/lib/
-TARGET   = libreader_pluckerbase.so.1.0.0
-TARGETA	= $(READERDIR)/lib/libreader_pluckerbase.a
-TARGETD	= libreader_pluckerbase.so.1.0.0
-TARGET0	= libreader_pluckerbase.so
-TARGET1	= libreader_pluckerbase.so.1
-TARGET2	= libreader_pluckerbase.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: pluckerbaselib.mak  $(READERDIR)/lib/$(TARGET)
-
-$(READERDIR)/lib/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-pluckerbaselib.mak: pluckerbaselib.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
-qmake: 
-	@$(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/reader_pluckerbase && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_pluckerbase/ && ( cd `dirname QREADEROBJS/reader_pluckerbase` && $(TAR) reader_pluckerbase.tar reader_pluckerbase && $(GZIP) reader_pluckerbase.tar ) && $(MOVE) `dirname QREADEROBJS/reader_pluckerbase`/reader_pluckerbase.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_pluckerbase
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/plucker_base.o: plucker_base.cpp QREADERINC/useqpe.h \
-		QREADERINC/static.h \
-		plucker_base.h \
-		Aportis.h \
-		hrule.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/plucker_base.o plucker_base.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.omak b/noncore/apps/opie-reader/pluckerbaselib.omak
deleted file mode 100644
index 605eabd..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.omak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pluckerbase.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: pluckerbaselib.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	plucker_base.cpp
-OBJECTS =	OREADEROBJS/plucker_base.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pluckerbase.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pluckerbase.a
-TARGETD	=	libreader_pluckerbase.so.1.0.0
-TARGET0	=	libreader_pluckerbase.so
-TARGET1	=	libreader_pluckerbase.so.1
-TARGET2	=	libreader_pluckerbase.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
-
-$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pluckerbaselib.omak
-
-pluckerbaselib.omak: pluckerbaselib.opro
-	tmake pluckerbaselib.opro -o pluckerbaselib.omak
-
-dist:
-	$(TAR) pluckerbaselib.opro.tar pluckerbaselib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pluckerbaselib.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/plucker_base.o: plucker_base.cpp \
-		OREADERINC/useqpe.h \
-		OREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Model.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/plucker_base.o plucker_base.cpp
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.wmak b/noncore/apps/opie-reader/pluckerbaselib.wmak
deleted file mode 100644
index 3cc63a4..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.wmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pluckerbase.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: pluckerbaselib.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	plucker_base.cpp
-OBJECTS =	WSREADEROBJS/plucker_base.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pluckerbase.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pluckerbase.a
-TARGETD	=	libreader_pluckerbase.so.1.0.0
-TARGET0	=	libreader_pluckerbase.so
-TARGET1	=	libreader_pluckerbase.so.1
-TARGET2	=	libreader_pluckerbase.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
-
-$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pluckerbaselib.wmak
-
-pluckerbaselib.wmak: pluckerbaselib.wpro
-	tmake pluckerbaselib.wpro -o pluckerbaselib.wmak
-
-dist:
-	$(TAR) pluckerbaselib.wpro.tar pluckerbaselib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pluckerbaselib.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/plucker_base.o: plucker_base.cpp \
-		WSREADERINC/useqpe.h \
-		WSREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Model.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/plucker_base.o plucker_base.cpp
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.wpro b/noncore/apps/opie-reader/pluckerbaselib.wpro
deleted file mode 100644
index 6798c0d..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.wpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= plucker_base.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pluckerbase
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/pluckerbaselib.zmak b/noncore/apps/opie-reader/pluckerbaselib.zmak
deleted file mode 100644
index 16dd6e4..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.zmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pluckerbase.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: pluckerbaselib.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	plucker_base.cpp
-OBJECTS =	ZREADEROBJS/plucker_base.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pluckerbase.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pluckerbase.a
-TARGETD	=	libreader_pluckerbase.so.1.0.0
-TARGET0	=	libreader_pluckerbase.so
-TARGET1	=	libreader_pluckerbase.so.1
-TARGET2	=	libreader_pluckerbase.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
-
-$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pluckerbaselib.zmak
-
-pluckerbaselib.zmak: pluckerbaselib.zpro
-	tmake pluckerbaselib.zpro -o pluckerbaselib.zmak
-
-dist:
-	$(TAR) pluckerbaselib.zpro.tar pluckerbaselib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pluckerbaselib.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/plucker_base.o: plucker_base.cpp \
-		ZREADERINC/useqpe.h \
-		ZREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Model.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/plucker_base.o plucker_base.cpp
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.zpro b/noncore/apps/opie-reader/pluckerbaselib.zpro
deleted file mode 100644
index 006aa07..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.zpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= plucker_base.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pluckerbase
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/ppmsCodec.mak b/noncore/apps/opie-reader/ppmsCodec.mak
deleted file mode 100644
index 19d3a2c..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.mak
+++ b/dev/null
@@ -1,178 +0,0 @@
-#############################################################################
-# Makefile for building: libppms.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:41:16 2004
-# Project:  ppmsCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libppms.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h
-SOURCES = ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS = QREADEROBJS/ppm_expander.o \
-		QREADEROBJS/ppm.o \
-		QREADEROBJS/arith_d.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = ppmsCodec.pro
-QMAKE_TARGET = ppms
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libppms.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libppms.a
-TARGETD	= libppms.so.1.0.0
-TARGET0	= libppms.so
-TARGET1	= libppms.so.1
-TARGET2	= libppms.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: ppmsCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-ppmsCodec.mak: ppmsCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
-qmake: 
-	@$(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/ppms && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/ppms/ && ( cd `dirname QREADEROBJS/ppms` && $(TAR) ppms.tar ppms && $(GZIP) ppms.tar ) && $(MOVE) `dirname QREADEROBJS/ppms`/ppms.tar.gz . && $(DEL_FILE) -r QREADEROBJS/ppms
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/ppm_expander.o: ppm_expander.cpp QREADERINC/static.h \
-		ppm_expander.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-QREADEROBJS/ppm.o: ppm.cpp arith.h \
-		ppm.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ppm.o ppm.cpp
-
-QREADEROBJS/arith_d.o: arith_d.cpp arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/arith_d.o arith_d.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.omak b/noncore/apps/opie-reader/ppmsCodec.omak
deleted file mode 100644
index c974898..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.omak
+++ b/dev/null
@@ -1,141 +0,0 @@
-#############################################################################
-# Makefile for building libppms.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: ppmsCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libppms.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS =	OREADEROBJS/ppm_expander.o \
-		OREADEROBJS/ppm.o \
-		OREADEROBJS/arith_d.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libppms.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libppms.a
-TARGETD	=	libppms.so.1.0.0
-TARGET0	=	libppms.so
-TARGET1	=	libppms.so.1
-TARGET2	=	libppms.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: ppmsCodec.omak
-
-ppmsCodec.omak: ppmsCodec.opro
-	tmake ppmsCodec.opro -o ppmsCodec.omak
-
-dist:
-	$(TAR) ppmsCodec.opro.tar ppmsCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) ppmsCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		OREADERINC/static.h \
-		ppm_expander.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-OREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ppm.o ppm.cpp
-
-OREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/arith_d.o arith_d.cpp
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.wmak b/noncore/apps/opie-reader/ppmsCodec.wmak
deleted file mode 100644
index 5d8d4a7..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.wmak
+++ b/dev/null
@@ -1,141 +0,0 @@
-#############################################################################
-# Makefile for building libppms.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: ppmsCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libppms.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS =	WSREADEROBJS/ppm_expander.o \
-		WSREADEROBJS/ppm.o \
-		WSREADEROBJS/arith_d.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libppms.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libppms.a
-TARGETD	=	libppms.so.1.0.0
-TARGET0	=	libppms.so
-TARGET1	=	libppms.so.1
-TARGET2	=	libppms.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: ppmsCodec.wmak
-
-ppmsCodec.wmak: ppmsCodec.wpro
-	tmake ppmsCodec.wpro -o ppmsCodec.wmak
-
-dist:
-	$(TAR) ppmsCodec.wpro.tar ppmsCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) ppmsCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		WSREADERINC/static.h \
-		ppm_expander.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-WSREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ppm.o ppm.cpp
-
-WSREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/arith_d.o arith_d.cpp
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.wpro b/noncore/apps/opie-reader/ppmsCodec.wpro
deleted file mode 100644
index f250d90..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= ppm_expander.cpp \
-                  ppm.cpp \
-                  arith_d.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= ppms
-LIBS            += -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/ppmsCodec.zmak b/noncore/apps/opie-reader/ppmsCodec.zmak
deleted file mode 100644
index df92c50..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.zmak
+++ b/dev/null
@@ -1,141 +0,0 @@
-#############################################################################
-# Makefile for building libppms.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: ppmsCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libppms.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS =	ZREADEROBJS/ppm_expander.o \
-		ZREADEROBJS/ppm.o \
-		ZREADEROBJS/arith_d.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libppms.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libppms.a
-TARGETD	=	libppms.so.1.0.0
-TARGET0	=	libppms.so
-TARGET1	=	libppms.so.1
-TARGET2	=	libppms.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: ppmsCodec.zmak
-
-ppmsCodec.zmak: ppmsCodec.zpro
-	tmake ppmsCodec.zpro -o ppmsCodec.zmak
-
-dist:
-	$(TAR) ppmsCodec.zpro.tar ppmsCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) ppmsCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		ZREADERINC/static.h \
-		ppm_expander.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-ZREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ppm.o ppm.cpp
-
-ZREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/arith_d.o arith_d.cpp
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.zpro b/noncore/apps/opie-reader/ppmsCodec.zpro
deleted file mode 100644
index f758118..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= ppm_expander.cpp \
-                  ppm.cpp \
-                  arith_d.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= ppms
-LIBS            += -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/reader.mak b/noncore/apps/opie-reader/reader.mak
deleted file mode 100644
index 4bc2eec..0000000
--- a/noncore/apps/opie-reader/reader.mak
+++ b/dev/null
@@ -1,591 +0,0 @@
-#############################################################################
-# Makefile for building: ../bin/uqtreader
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:41:42 2004
-# Project:  reader.pro
-# Template: app
-# Command: $(QMAKE) -o reader.mak reader.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro  -DQT_NO_DEBUG
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro  -DQT_NO_DEBUG
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = 
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StyleConsts.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		cbkmkselector.h \
-		config.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		QREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		preferences.h \
-		usenef.h \
-		QREADERINC/useqpe.h \
-		ustring.h \
-		util.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES = BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		GraphicWin.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		preferences.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS = QREADEROBJS/BuffDoc.o \
-		QREADEROBJS/ButtonPrefs.o \
-		QREADEROBJS/CAnnoEdit.o \
-		QREADEROBJS/CDrawBuffer.o \
-		QREADEROBJS/CEncoding.o \
-		QREADEROBJS/CEncoding_tables.o \
-		QREADEROBJS/CFilter.o \
-		QREADEROBJS/CRegExp.o \
-		QREADEROBJS/CloseDialog.o \
-		QREADEROBJS/FontControl.o \
-		QREADEROBJS/GraphicWin.o \
-		QREADEROBJS/Prefs.o \
-		QREADEROBJS/QTReader.o \
-		QREADEROBJS/QTReaderApp.o \
-		QREADEROBJS/QtrListView.o \
-		QREADEROBJS/ToolbarPrefs.o \
-		QREADEROBJS/URLDialog.o \
-		QREADEROBJS/infowin.o \
-		QREADEROBJS/main.o \
-		QREADEROBJS/orkey.o \
-		QREADEROBJS/preferences.o \
-		QREADEROBJS/util.o \
-		QREADEROBJS/version.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = QREADERMOCS/moc_ButtonPrefs.cpp \
-		QREADERMOCS/moc_CAnnoEdit.cpp \
-		QREADERMOCS/moc_CloseDialog.cpp \
-		QREADERMOCS/moc_GraphicWin.cpp \
-		QREADERMOCS/moc_Prefs.cpp \
-		QREADERMOCS/moc_QFloatBar.cpp \
-		QREADERMOCS/moc_QTReader.cpp \
-		QREADERMOCS/moc_QTReaderApp.cpp \
-		QREADERMOCS/moc_QtrListView.cpp \
-		QREADERMOCS/moc_ToolbarPrefs.cpp \
-		QREADERMOCS/moc_URLDialog.cpp \
-		QREADERMOCS/moc_cbkmkselector.cpp \
-		QREADERMOCS/moc_infowin.cpp
-OBJMOC = QREADEROBJS/moc_ButtonPrefs.o \
-		QREADEROBJS/moc_CAnnoEdit.o \
-		QREADEROBJS/moc_CloseDialog.o \
-		QREADEROBJS/moc_GraphicWin.o \
-		QREADEROBJS/moc_Prefs.o \
-		QREADEROBJS/moc_QFloatBar.o \
-		QREADEROBJS/moc_QTReader.o \
-		QREADEROBJS/moc_QTReaderApp.o \
-		QREADEROBJS/moc_QtrListView.o \
-		QREADEROBJS/moc_ToolbarPrefs.o \
-		QREADEROBJS/moc_URLDialog.o \
-		QREADEROBJS/moc_cbkmkselector.o \
-		QREADEROBJS/moc_infowin.o
-DIST	   = reader.pro
-QMAKE_TARGET = uqtreader
-DESTDIR  = ../bin/
-TARGET   = ../bin/uqtreader
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: reader.mak $(TARGET)
-
-$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
-	test -d ../bin/ || mkdir -p ../bin/
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-reader.mak: reader.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o reader.mak reader.pro
-qmake: 
-	@$(QMAKE) -o reader.mak reader.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/uqtreader && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/uqtreader/ && ( cd `dirname QREADEROBJS/uqtreader` && $(TAR) uqtreader.tar uqtreader && $(GZIP) uqtreader.tar ) && $(MOVE) `dirname QREADEROBJS/uqtreader`/uqtreader.tar.gz . && $(DEL_FILE) -r QREADEROBJS/uqtreader
-
-mocclean:
-	-$(DEL_FILE) $(OBJMOC)
-	-$(DEL_FILE) $(SRCMOC)
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean: mocclean
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) ../bin/$(TARGET) $(TARGET)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/BuffDoc.o: BuffDoc.cpp QREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		config.h \
-		CDrawBuffer.h \
-		ZText.h \
-		ebookcodec.h \
-		QREADERINC/useqpe.h \
-		Aportis.h \
-		CHM.h \
-		ppm_expander.h \
-		ztxt.h \
-		plucker.h \
-		iSilo.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		CEncoding_tables.h \
-		pdb.h \
-		chm_lib.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-QREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-QREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-QREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp CDrawBuffer.h \
-		FontControl.h \
-		QREADERINC/useqpe.h \
-		QREADERINC/opie.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-QREADEROBJS/CEncoding.o: CEncoding.cpp CEncoding.h \
-		CExpander.h \
-		CEncoding_tables.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CEncoding.o CEncoding.cpp
-
-QREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-QREADEROBJS/CFilter.o: CFilter.cpp QREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		hrule.h \
-		Bkmks.h \
-		QTReader.h \
-		CRegExp.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CExpander.h \
-		CEncoding.h \
-		QREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Filedata.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CFilter.o CFilter.cpp
-
-QREADEROBJS/CRegExp.o: CRegExp.cpp CRegExp.h \
-		config.h \
-		hash.h \
-		Queue.h \
-		ustring.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CRegExp.o CRegExp.cpp
-
-QREADEROBJS/CloseDialog.o: CloseDialog.cpp CloseDialog.h \
-		QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-QREADEROBJS/FontControl.o: FontControl.cpp QREADERINC/opie.h \
-		QREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/FontControl.o FontControl.cpp
-
-QREADEROBJS/GraphicWin.o: GraphicWin.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/GraphicWin.o GraphicWin.cpp
-
-QREADEROBJS/Prefs.o: Prefs.cpp Prefs.h \
-		CEncoding_tables.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Prefs.o Prefs.cpp
-
-QREADEROBJS/QTReader.o: QTReader.cpp QREADERINC/useqpe.h \
-		config.h \
-		QTReader.h \
-		CDrawBuffer.h \
-		ustring.h \
-		QREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QTReader.o QTReader.cpp
-
-QREADEROBJS/QTReaderApp.o: QTReaderApp.cpp QREADERINC/useqpe.h \
-		QTReader.h \
-		GraphicWin.h \
-		Bkmks.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		Prefs.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		QREADERINC/opie.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CDrawBuffer.h \
-		Filedata.h \
-		names.h \
-		CEncoding_tables.h \
-		CloseDialog.h \
-		ButtonPrefs.h \
-		QREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		Navigation.h \
-		preferences.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-QREADEROBJS/QtrListView.o: QtrListView.cpp QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QtrListView.o QtrListView.cpp
-
-QREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp QREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-QREADEROBJS/URLDialog.o: URLDialog.cpp URLDialog.h \
-		QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/URLDialog.o URLDialog.cpp
-
-QREADEROBJS/infowin.o: infowin.cpp infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/infowin.o infowin.cpp
-
-QREADEROBJS/main.o: main.cpp QREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/main.o main.cpp
-
-QREADEROBJS/orkey.o: orkey.cpp orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/orkey.o orkey.cpp
-
-QREADEROBJS/preferences.o: preferences.cpp QREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/preferences.o preferences.cpp
-
-QREADEROBJS/util.o: util.cpp util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/util.o util.cpp
-
-QREADEROBJS/version.o: version.cpp version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/version.o version.cpp
-
-QREADEROBJS/moc_ButtonPrefs.o: QREADERMOCS/moc_ButtonPrefs.cpp ButtonPrefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_ButtonPrefs.o QREADERMOCS/moc_ButtonPrefs.cpp
-
-QREADEROBJS/moc_CAnnoEdit.o: QREADERMOCS/moc_CAnnoEdit.cpp CAnnoEdit.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_CAnnoEdit.o QREADERMOCS/moc_CAnnoEdit.cpp
-
-QREADEROBJS/moc_CloseDialog.o: QREADERMOCS/moc_CloseDialog.cpp CloseDialog.h QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_CloseDialog.o QREADERMOCS/moc_CloseDialog.cpp
-
-QREADEROBJS/moc_GraphicWin.o: QREADERMOCS/moc_GraphicWin.cpp GraphicWin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_GraphicWin.o QREADERMOCS/moc_GraphicWin.cpp
-
-QREADEROBJS/moc_Prefs.o: QREADERMOCS/moc_Prefs.cpp Prefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_Prefs.o QREADERMOCS/moc_Prefs.cpp
-
-QREADEROBJS/moc_QFloatBar.o: QREADERMOCS/moc_QFloatBar.cpp QFloatBar.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QFloatBar.o QREADERMOCS/moc_QFloatBar.cpp
-
-QREADEROBJS/moc_QTReader.o: QREADERMOCS/moc_QTReader.cpp QTReader.h QREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		QREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QTReader.o QREADERMOCS/moc_QTReader.cpp
-
-QREADEROBJS/moc_QTReaderApp.o: QREADERMOCS/moc_QTReaderApp.cpp QTReaderApp.h QREADERINC/useqpe.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QTReaderApp.o QREADERMOCS/moc_QTReaderApp.cpp
-
-QREADEROBJS/moc_QtrListView.o: QREADERMOCS/moc_QtrListView.cpp QtrListView.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QtrListView.o QREADERMOCS/moc_QtrListView.cpp
-
-QREADEROBJS/moc_ToolbarPrefs.o: QREADERMOCS/moc_ToolbarPrefs.cpp ToolbarPrefs.h QREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_ToolbarPrefs.o QREADERMOCS/moc_ToolbarPrefs.cpp
-
-QREADEROBJS/moc_URLDialog.o: QREADERMOCS/moc_URLDialog.cpp URLDialog.h QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_URLDialog.o QREADERMOCS/moc_URLDialog.cpp
-
-QREADEROBJS/moc_cbkmkselector.o: QREADERMOCS/moc_cbkmkselector.cpp cbkmkselector.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_cbkmkselector.o QREADERMOCS/moc_cbkmkselector.cpp
-
-QREADEROBJS/moc_infowin.o: QREADERMOCS/moc_infowin.cpp infowin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_infowin.o QREADERMOCS/moc_infowin.cpp
-
-QREADERMOCS/moc_ButtonPrefs.cpp: $(MOC) ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o QREADERMOCS/moc_ButtonPrefs.cpp
-
-QREADERMOCS/moc_CAnnoEdit.cpp: $(MOC) CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o QREADERMOCS/moc_CAnnoEdit.cpp
-
-QREADERMOCS/moc_CloseDialog.cpp: $(MOC) CloseDialog.h
-	$(MOC) CloseDialog.h -o QREADERMOCS/moc_CloseDialog.cpp
-
-QREADERMOCS/moc_GraphicWin.cpp: $(MOC) GraphicWin.h
-	$(MOC) GraphicWin.h -o QREADERMOCS/moc_GraphicWin.cpp
-
-QREADERMOCS/moc_Prefs.cpp: $(MOC) Prefs.h
-	$(MOC) Prefs.h -o QREADERMOCS/moc_Prefs.cpp
-
-QREADERMOCS/moc_QFloatBar.cpp: $(MOC) QFloatBar.h
-	$(MOC) QFloatBar.h -o QREADERMOCS/moc_QFloatBar.cpp
-
-QREADERMOCS/moc_QTReader.cpp: $(MOC) QTReader.h
-	$(MOC) QTReader.h -o QREADERMOCS/moc_QTReader.cpp
-
-QREADERMOCS/moc_QTReaderApp.cpp: $(MOC) QTReaderApp.h
-	$(MOC) QTReaderApp.h -o QREADERMOCS/moc_QTReaderApp.cpp
-
-QREADERMOCS/moc_QtrListView.cpp: $(MOC) QtrListView.h
-	$(MOC) QtrListView.h -o QREADERMOCS/moc_QtrListView.cpp
-
-QREADERMOCS/moc_ToolbarPrefs.cpp: $(MOC) ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o QREADERMOCS/moc_ToolbarPrefs.cpp
-
-QREADERMOCS/moc_URLDialog.cpp: $(MOC) URLDialog.h
-	$(MOC) URLDialog.h -o QREADERMOCS/moc_URLDialog.cpp
-
-QREADERMOCS/moc_cbkmkselector.cpp: $(MOC) cbkmkselector.h
-	$(MOC) cbkmkselector.h -o QREADERMOCS/moc_cbkmkselector.cpp
-
-QREADERMOCS/moc_infowin.cpp: $(MOC) infowin.h
-	$(MOC) infowin.h -o QREADERMOCS/moc_infowin.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/reader.omak b/noncore/apps/opie-reader/reader.omak
deleted file mode 100644
index e4553ee..0000000
--- a/noncore/apps/opie-reader/reader.omak
+++ b/dev/null
@@ -1,605 +0,0 @@
-#############################################################################
-# Makefile for building $(QPEDIR)/bin/reader
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: reader.opro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lpng12 -ljpeg -lz -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Coder.h \
-		CSource.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		PPMd.h \
-		PPMdType.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		SubAlloc.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		arrierego.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		nef.h \
-		OREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		usenef.h \
-		OREADERINC/useqpe.h \
-		ustring.h \
-		util.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		fileBrowser.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS =	OREADEROBJS/BuffDoc.o \
-		OREADEROBJS/ButtonPrefs.o \
-		OREADEROBJS/CAnnoEdit.o \
-		OREADEROBJS/CDrawBuffer.o \
-		OREADEROBJS/CEncoding.o \
-		OREADEROBJS/CEncoding_tables.o \
-		OREADEROBJS/CFilter.o \
-		OREADEROBJS/CRegExp.o \
-		OREADEROBJS/CloseDialog.o \
-		OREADEROBJS/FontControl.o \
-		OREADEROBJS/Prefs.o \
-		OREADEROBJS/QTReader.o \
-		OREADEROBJS/QTReaderApp.o \
-		OREADEROBJS/QtrListView.o \
-		OREADEROBJS/ToolbarPrefs.o \
-		OREADEROBJS/URLDialog.o \
-		OREADEROBJS/fileBrowser.o \
-		OREADEROBJS/infowin.o \
-		OREADEROBJS/main.o \
-		OREADEROBJS/orkey.o \
-		OREADEROBJS/util.o \
-		OREADEROBJS/version.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	OREADERMOCS/moc_ButtonPrefs.cpp \
-		OREADERMOCS/moc_CAnnoEdit.cpp \
-		OREADERMOCS/moc_CloseDialog.cpp \
-		OREADERMOCS/moc_GraphicWin.cpp \
-		OREADERMOCS/moc_Prefs.cpp \
-		OREADERMOCS/moc_QFloatBar.cpp \
-		OREADERMOCS/moc_QTReader.cpp \
-		OREADERMOCS/moc_QTReaderApp.cpp \
-		OREADERMOCS/moc_QtrListView.cpp \
-		OREADERMOCS/moc_ToolbarPrefs.cpp \
-		OREADERMOCS/moc_URLDialog.cpp \
-		OREADERMOCS/moc_cbkmkselector.cpp \
-		OREADERMOCS/moc_fileBrowser.cpp \
-		OREADERMOCS/moc_infowin.cpp
-OBJMOC	=	OREADEROBJS/moc_ButtonPrefs.o \
-		OREADEROBJS/moc_CAnnoEdit.o \
-		OREADEROBJS/moc_CloseDialog.o \
-		OREADEROBJS/moc_GraphicWin.o \
-		OREADEROBJS/moc_Prefs.o \
-		OREADEROBJS/moc_QFloatBar.o \
-		OREADEROBJS/moc_QTReader.o \
-		OREADEROBJS/moc_QTReaderApp.o \
-		OREADEROBJS/moc_QtrListView.o \
-		OREADEROBJS/moc_ToolbarPrefs.o \
-		OREADEROBJS/moc_URLDialog.o \
-		OREADEROBJS/moc_cbkmkselector.o \
-		OREADEROBJS/moc_fileBrowser.o \
-		OREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	$(QPEDIR)/bin/reader
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.omak
-
-reader.omak: reader.opro
-	tmake reader.opro -o reader.omak
-
-dist:
-	$(TAR) reader.opro.tar reader.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		OREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		nef.h \
-		usenef.h \
-		arrierego.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-OREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-OREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-OREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		OREADERINC/useqpe.h \
-		OREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-OREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CEncoding.o CEncoding.cpp
-
-OREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-OREADEROBJS/CFilter.o: CFilter.cpp \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		OREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CFilter.o CFilter.cpp
-
-OREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CRegExp.o CRegExp.cpp
-
-OREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-OREADEROBJS/FontControl.o: FontControl.cpp \
-		OREADERINC/opie.h \
-		OREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/FontControl.o FontControl.cpp
-
-OREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Prefs.o Prefs.cpp
-
-OREADEROBJS/QTReader.o: QTReader.cpp \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		OREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QTReader.o QTReader.cpp
-
-OREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		OREADERINC/useqpe.h \
-		QTReader.h \
-		OREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-OREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QtrListView.o QtrListView.cpp
-
-OREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		OREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-OREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/URLDialog.o URLDialog.cpp
-
-OREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-OREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/infowin.o infowin.cpp
-
-OREADEROBJS/main.o: main.cpp \
-		OREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/main.o main.cpp
-
-OREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/orkey.o orkey.cpp
-
-OREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/util.o util.cpp
-
-OREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/version.o version.cpp
-
-OREADEROBJS/moc_ButtonPrefs.o: OREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_ButtonPrefs.o OREADERMOCS/moc_ButtonPrefs.cpp
-
-OREADEROBJS/moc_CAnnoEdit.o: OREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_CAnnoEdit.o OREADERMOCS/moc_CAnnoEdit.cpp
-
-OREADEROBJS/moc_CloseDialog.o: OREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_CloseDialog.o OREADERMOCS/moc_CloseDialog.cpp
-
-OREADEROBJS/moc_GraphicWin.o: OREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_GraphicWin.o OREADERMOCS/moc_GraphicWin.cpp
-
-OREADEROBJS/moc_Prefs.o: OREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_Prefs.o OREADERMOCS/moc_Prefs.cpp
-
-OREADEROBJS/moc_QFloatBar.o: OREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QFloatBar.o OREADERMOCS/moc_QFloatBar.cpp
-
-OREADEROBJS/moc_QTReader.o: OREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		OREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QTReader.o OREADERMOCS/moc_QTReader.cpp
-
-OREADEROBJS/moc_QTReaderApp.o: OREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QTReaderApp.o OREADERMOCS/moc_QTReaderApp.cpp
-
-OREADEROBJS/moc_QtrListView.o: OREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QtrListView.o OREADERMOCS/moc_QtrListView.cpp
-
-OREADEROBJS/moc_ToolbarPrefs.o: OREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		OREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_ToolbarPrefs.o OREADERMOCS/moc_ToolbarPrefs.cpp
-
-OREADEROBJS/moc_URLDialog.o: OREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_URLDialog.o OREADERMOCS/moc_URLDialog.cpp
-
-OREADEROBJS/moc_cbkmkselector.o: OREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_cbkmkselector.o OREADERMOCS/moc_cbkmkselector.cpp
-
-OREADEROBJS/moc_fileBrowser.o: OREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_fileBrowser.o OREADERMOCS/moc_fileBrowser.cpp
-
-OREADEROBJS/moc_infowin.o: OREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_infowin.o OREADERMOCS/moc_infowin.cpp
-
-OREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o OREADERMOCS/moc_ButtonPrefs.cpp
-
-OREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o OREADERMOCS/moc_CAnnoEdit.cpp
-
-OREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o OREADERMOCS/moc_CloseDialog.cpp
-
-OREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o OREADERMOCS/moc_GraphicWin.cpp
-
-OREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o OREADERMOCS/moc_Prefs.cpp
-
-OREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o OREADERMOCS/moc_QFloatBar.cpp
-
-OREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o OREADERMOCS/moc_QTReader.cpp
-
-OREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o OREADERMOCS/moc_QTReaderApp.cpp
-
-OREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o OREADERMOCS/moc_QtrListView.cpp
-
-OREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o OREADERMOCS/moc_ToolbarPrefs.cpp
-
-OREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o OREADERMOCS/moc_URLDialog.cpp
-
-OREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o OREADERMOCS/moc_cbkmkselector.cpp
-
-OREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o OREADERMOCS/moc_fileBrowser.cpp
-
-OREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o OREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.staticmak b/noncore/apps/opie-reader/reader.staticmak
deleted file mode 100644
index eab8857..0000000
--- a/noncore/apps/opie-reader/reader.staticmak
+++ b/dev/null
@@ -1,846 +0,0 @@
-#############################################################################
-# Makefile for building: QSTATICREADEROBJS/uqtreader
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 09:15:20 2004
-# Project:  reader.staticpro
-# Template: app
-# Command: $(QMAKE) -o reader.staticmak reader.staticpro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -w -g  
-CXXFLAGS = -pipe -w -g  
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQSTATICREADERINC -I$(QTDIR)/include -IQSTATICREADERMOCS/
-LINK     = g++
-LFLAGS   = 
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QSTATICREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StyleConsts.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		QSTATICREADERINC/opie.h \
-		pdb.h \
-		plucker_base.h \
-		plucker.h \
-		ppm.h \
-		ppm_expander.h \
-		preferences.h \
-		QSTATICREADERINC/static.h \
-		usenef.h \
-		QSTATICREADERINC/useqpe.h \
-		ustring.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES = Aportis.cpp \
-		Bkmks.cpp \
-		BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CBuffer.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CExpander.cpp \
-		CFilter.cpp \
-		CHM.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		GraphicWin.cpp \
-		Navigation.cpp \
-		Palm2QImage.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		StyleConsts.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		arith_d.cpp \
-		chm_lib.c \
-		fileBrowser.cpp \
-		hrule.cpp \
-		infowin.cpp \
-		iSilo.cpp \
-		lzx.c \
-		main.cpp \
-		orkey.cpp \
-		pdb.cpp \
-		plucker.cpp \
-		plucker_base.cpp \
-		ppm.cpp \
-		ppm_expander.cpp \
-		preferences.cpp \
-		striphtml.cpp \
-		util.cpp \
-		version.cpp \
-		ztxt.cpp
-OBJECTS = QSTATICREADEROBJS/Aportis.o \
-		QSTATICREADEROBJS/Bkmks.o \
-		QSTATICREADEROBJS/BuffDoc.o \
-		QSTATICREADEROBJS/ButtonPrefs.o \
-		QSTATICREADEROBJS/CAnnoEdit.o \
-		QSTATICREADEROBJS/CBuffer.o \
-		QSTATICREADEROBJS/CDrawBuffer.o \
-		QSTATICREADEROBJS/CEncoding.o \
-		QSTATICREADEROBJS/CEncoding_tables.o \
-		QSTATICREADEROBJS/CExpander.o \
-		QSTATICREADEROBJS/CFilter.o \
-		QSTATICREADEROBJS/CHM.o \
-		QSTATICREADEROBJS/CRegExp.o \
-		QSTATICREADEROBJS/CloseDialog.o \
-		QSTATICREADEROBJS/FontControl.o \
-		QSTATICREADEROBJS/GraphicWin.o \
-		QSTATICREADEROBJS/Navigation.o \
-		QSTATICREADEROBJS/Palm2QImage.o \
-		QSTATICREADEROBJS/Prefs.o \
-		QSTATICREADEROBJS/QTReader.o \
-		QSTATICREADEROBJS/QTReaderApp.o \
-		QSTATICREADEROBJS/QtrListView.o \
-		QSTATICREADEROBJS/StyleConsts.o \
-		QSTATICREADEROBJS/ToolbarPrefs.o \
-		QSTATICREADEROBJS/URLDialog.o \
-		QSTATICREADEROBJS/arith_d.o \
-		QSTATICREADEROBJS/chm_lib.o \
-		QSTATICREADEROBJS/fileBrowser.o \
-		QSTATICREADEROBJS/hrule.o \
-		QSTATICREADEROBJS/infowin.o \
-		QSTATICREADEROBJS/iSilo.o \
-		QSTATICREADEROBJS/lzx.o \
-		QSTATICREADEROBJS/main.o \
-		QSTATICREADEROBJS/orkey.o \
-		QSTATICREADEROBJS/pdb.o \
-		QSTATICREADEROBJS/plucker.o \
-		QSTATICREADEROBJS/plucker_base.o \
-		QSTATICREADEROBJS/ppm.o \
-		QSTATICREADEROBJS/ppm_expander.o \
-		QSTATICREADEROBJS/preferences.o \
-		QSTATICREADEROBJS/striphtml.o \
-		QSTATICREADEROBJS/util.o \
-		QSTATICREADEROBJS/version.o \
-		QSTATICREADEROBJS/ztxt.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = QSTATICREADERMOCS/moc_ButtonPrefs.cpp \
-		QSTATICREADERMOCS/moc_CAnnoEdit.cpp \
-		QSTATICREADERMOCS/moc_CloseDialog.cpp \
-		QSTATICREADERMOCS/moc_GraphicWin.cpp \
-		QSTATICREADERMOCS/moc_Prefs.cpp \
-		QSTATICREADERMOCS/moc_QFloatBar.cpp \
-		QSTATICREADERMOCS/moc_QTReader.cpp \
-		QSTATICREADERMOCS/moc_QTReaderApp.cpp \
-		QSTATICREADERMOCS/moc_QtrListView.cpp \
-		QSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
-		QSTATICREADERMOCS/moc_URLDialog.cpp \
-		QSTATICREADERMOCS/moc_cbkmkselector.cpp \
-		QSTATICREADERMOCS/moc_fileBrowser.cpp \
-		QSTATICREADERMOCS/moc_infowin.cpp
-OBJMOC = QSTATICREADEROBJS/moc_ButtonPrefs.o \
-		QSTATICREADEROBJS/moc_CAnnoEdit.o \
-		QSTATICREADEROBJS/moc_CloseDialog.o \
-		QSTATICREADEROBJS/moc_GraphicWin.o \
-		QSTATICREADEROBJS/moc_Prefs.o \
-		QSTATICREADEROBJS/moc_QFloatBar.o \
-		QSTATICREADEROBJS/moc_QTReader.o \
-		QSTATICREADEROBJS/moc_QTReaderApp.o \
-		QSTATICREADEROBJS/moc_QtrListView.o \
-		QSTATICREADEROBJS/moc_ToolbarPrefs.o \
-		QSTATICREADEROBJS/moc_URLDialog.o \
-		QSTATICREADEROBJS/moc_cbkmkselector.o \
-		QSTATICREADEROBJS/moc_fileBrowser.o \
-		QSTATICREADEROBJS/moc_infowin.o
-DIST	   = reader.staticpro
-QMAKE_TARGET = uqtreader
-DESTDIR  = QSTATICREADEROBJS/
-TARGET   = QSTATICREADEROBJS/uqtreader
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: reader.staticmak $(TARGET)
-
-$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
-	test -d QSTATICREADEROBJS/ || mkdir -p QSTATICREADEROBJS/
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-reader.staticmak: reader.staticpro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o reader.staticmak reader.staticpro
-qmake: 
-	@$(QMAKE) -o reader.staticmak reader.staticpro
-
-dist: 
-	@mkdir -p QSTATICREADEROBJS/uqtreader && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QSTATICREADEROBJS/uqtreader/ && ( cd `dirname QSTATICREADEROBJS/uqtreader` && $(TAR) uqtreader.tar uqtreader && $(GZIP) uqtreader.tar ) && $(MOVE) `dirname QSTATICREADEROBJS/uqtreader`/uqtreader.tar.gz . && $(DEL_FILE) -r QSTATICREADEROBJS/uqtreader
-
-mocclean:
-	-$(DEL_FILE) $(OBJMOC)
-	-$(DEL_FILE) $(SRCMOC)
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean: mocclean
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) QSTATICREADEROBJS/$(TARGET) $(TARGET)
-
-
-FORCE:
-
-####### Compile
-
-QSTATICREADEROBJS/Aportis.o: Aportis.cpp Aportis.h \
-		my_list.h \
-		Bkmks.h \
-		QSTATICREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Aportis.o Aportis.cpp
-
-QSTATICREADEROBJS/Bkmks.o: Bkmks.cpp Bkmks.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h \
-		config.h \
-		Filedata.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Bkmks.o Bkmks.cpp
-
-QSTATICREADEROBJS/BuffDoc.o: BuffDoc.cpp QSTATICREADERINC/static.h \
-		names.h \
-		QSTATICREADERINC/useqpe.h \
-		usenef.h \
-		BuffDoc.h \
-		config.h \
-		CDrawBuffer.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		CHM.h \
-		ppm_expander.h \
-		ztxt.h \
-		plucker.h \
-		iSilo.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		CEncoding_tables.h \
-		pdb.h \
-		chm_lib.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-QSTATICREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-QSTATICREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-QSTATICREADEROBJS/CBuffer.o: CBuffer.cpp CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CBuffer.o CBuffer.cpp
-
-QSTATICREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp CDrawBuffer.h \
-		FontControl.h \
-		QSTATICREADERINC/useqpe.h \
-		QSTATICREADERINC/opie.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-QSTATICREADEROBJS/CEncoding.o: CEncoding.cpp CEncoding.h \
-		CExpander.h \
-		CEncoding_tables.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CEncoding.o CEncoding.cpp
-
-QSTATICREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-QSTATICREADEROBJS/CExpander.o: CExpander.cpp CExpander.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CExpander.o CExpander.cpp
-
-QSTATICREADEROBJS/CFilter.o: CFilter.cpp QSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		hrule.h \
-		Bkmks.h \
-		QTReader.h \
-		CRegExp.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CExpander.h \
-		CEncoding.h \
-		QSTATICREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Filedata.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CFilter.o CFilter.cpp
-
-QSTATICREADEROBJS/CHM.o: CHM.cpp CHM.h \
-		chm_lib.h \
-		QSTATICREADERINC/static.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		my_list.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CHM.o CHM.cpp
-
-QSTATICREADEROBJS/CRegExp.o: CRegExp.cpp CRegExp.h \
-		config.h \
-		hash.h \
-		Queue.h \
-		ustring.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CRegExp.o CRegExp.cpp
-
-QSTATICREADEROBJS/CloseDialog.o: CloseDialog.cpp CloseDialog.h \
-		QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-QSTATICREADEROBJS/FontControl.o: FontControl.cpp QSTATICREADERINC/opie.h \
-		QSTATICREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/FontControl.o FontControl.cpp
-
-QSTATICREADEROBJS/GraphicWin.o: GraphicWin.cpp GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/GraphicWin.o GraphicWin.cpp
-
-QSTATICREADEROBJS/Navigation.o: Navigation.cpp Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Navigation.o Navigation.cpp
-
-QSTATICREADEROBJS/Palm2QImage.o: Palm2QImage.cpp QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
-QSTATICREADEROBJS/Prefs.o: Prefs.cpp Prefs.h \
-		CEncoding_tables.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Prefs.o Prefs.cpp
-
-QSTATICREADEROBJS/QTReader.o: QTReader.cpp QSTATICREADERINC/useqpe.h \
-		config.h \
-		QTReader.h \
-		CDrawBuffer.h \
-		ustring.h \
-		QSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QTReader.o QTReader.cpp
-
-QSTATICREADEROBJS/QTReaderApp.o: QTReaderApp.cpp QSTATICREADERINC/useqpe.h \
-		QTReader.h \
-		GraphicWin.h \
-		Bkmks.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		Prefs.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		QSTATICREADERINC/opie.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CDrawBuffer.h \
-		Filedata.h \
-		names.h \
-		CEncoding_tables.h \
-		CloseDialog.h \
-		ButtonPrefs.h \
-		QSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		Navigation.h \
-		preferences.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-QSTATICREADEROBJS/QtrListView.o: QtrListView.cpp QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QtrListView.o QtrListView.cpp
-
-QSTATICREADEROBJS/StyleConsts.o: StyleConsts.cpp StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-QSTATICREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp QSTATICREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-QSTATICREADEROBJS/URLDialog.o: URLDialog.cpp URLDialog.h \
-		QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/URLDialog.o URLDialog.cpp
-
-QSTATICREADEROBJS/arith_d.o: arith_d.cpp arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/arith_d.o arith_d.cpp
-
-QSTATICREADEROBJS/chm_lib.o: chm_lib.c chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QSTATICREADEROBJS/chm_lib.o chm_lib.c
-
-QSTATICREADEROBJS/fileBrowser.o: fileBrowser.cpp fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-QSTATICREADEROBJS/hrule.o: hrule.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/hrule.o hrule.cpp
-
-QSTATICREADEROBJS/infowin.o: infowin.cpp infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/infowin.o infowin.cpp
-
-QSTATICREADEROBJS/iSilo.o: iSilo.cpp iSilo.h \
-		pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/iSilo.o iSilo.cpp
-
-QSTATICREADEROBJS/lzx.o: lzx.c lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QSTATICREADEROBJS/lzx.o lzx.c
-
-QSTATICREADEROBJS/main.o: main.cpp QSTATICREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/main.o main.cpp
-
-QSTATICREADEROBJS/orkey.o: orkey.cpp orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/orkey.o orkey.cpp
-
-QSTATICREADEROBJS/pdb.o: pdb.cpp pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/pdb.o pdb.cpp
-
-QSTATICREADEROBJS/plucker.o: plucker.cpp QSTATICREADERINC/useqpe.h \
-		plucker.h \
-		Aportis.h \
-		Palm2QImage.h \
-		QSTATICREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/plucker.o plucker.cpp
-
-QSTATICREADEROBJS/plucker_base.o: plucker_base.cpp QSTATICREADERINC/useqpe.h \
-		usenef.h \
-		QSTATICREADERINC/static.h \
-		plucker_base.h \
-		Aportis.h \
-		hrule.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/plucker_base.o plucker_base.cpp
-
-QSTATICREADEROBJS/ppm.o: ppm.cpp arith.h \
-		ppm.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ppm.o ppm.cpp
-
-QSTATICREADEROBJS/ppm_expander.o: ppm_expander.cpp QSTATICREADERINC/static.h \
-		ppm_expander.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-QSTATICREADEROBJS/preferences.o: preferences.cpp QSTATICREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/preferences.o preferences.cpp
-
-QSTATICREADEROBJS/striphtml.o: striphtml.cpp QSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		striphtml.h \
-		hrule.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CFilter.h \
-		Navigation.h \
-		CExpander.h \
-		CEncoding.h \
-		QSTATICREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/striphtml.o striphtml.cpp
-
-QSTATICREADEROBJS/util.o: util.cpp util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/util.o util.cpp
-
-QSTATICREADEROBJS/version.o: version.cpp version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/version.o version.cpp
-
-QSTATICREADEROBJS/ztxt.o: ztxt.cpp ztxt.h \
-		my_list.h \
-		Bkmks.h \
-		QSTATICREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ztxt.o ztxt.cpp
-
-QSTATICREADEROBJS/moc_ButtonPrefs.o: QSTATICREADERMOCS/moc_ButtonPrefs.cpp ButtonPrefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_ButtonPrefs.o QSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-QSTATICREADEROBJS/moc_CAnnoEdit.o: QSTATICREADERMOCS/moc_CAnnoEdit.cpp CAnnoEdit.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_CAnnoEdit.o QSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-QSTATICREADEROBJS/moc_CloseDialog.o: QSTATICREADERMOCS/moc_CloseDialog.cpp CloseDialog.h QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_CloseDialog.o QSTATICREADERMOCS/moc_CloseDialog.cpp
-
-QSTATICREADEROBJS/moc_GraphicWin.o: QSTATICREADERMOCS/moc_GraphicWin.cpp GraphicWin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_GraphicWin.o QSTATICREADERMOCS/moc_GraphicWin.cpp
-
-QSTATICREADEROBJS/moc_Prefs.o: QSTATICREADERMOCS/moc_Prefs.cpp Prefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_Prefs.o QSTATICREADERMOCS/moc_Prefs.cpp
-
-QSTATICREADEROBJS/moc_QFloatBar.o: QSTATICREADERMOCS/moc_QFloatBar.cpp QFloatBar.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QFloatBar.o QSTATICREADERMOCS/moc_QFloatBar.cpp
-
-QSTATICREADEROBJS/moc_QTReader.o: QSTATICREADERMOCS/moc_QTReader.cpp QTReader.h QSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		QSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QTReader.o QSTATICREADERMOCS/moc_QTReader.cpp
-
-QSTATICREADEROBJS/moc_QTReaderApp.o: QSTATICREADERMOCS/moc_QTReaderApp.cpp QTReaderApp.h QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QTReaderApp.o QSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-QSTATICREADEROBJS/moc_QtrListView.o: QSTATICREADERMOCS/moc_QtrListView.cpp QtrListView.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QtrListView.o QSTATICREADERMOCS/moc_QtrListView.cpp
-
-QSTATICREADEROBJS/moc_ToolbarPrefs.o: QSTATICREADERMOCS/moc_ToolbarPrefs.cpp ToolbarPrefs.h QSTATICREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_ToolbarPrefs.o QSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-QSTATICREADEROBJS/moc_URLDialog.o: QSTATICREADERMOCS/moc_URLDialog.cpp URLDialog.h QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_URLDialog.o QSTATICREADERMOCS/moc_URLDialog.cpp
-
-QSTATICREADEROBJS/moc_cbkmkselector.o: QSTATICREADERMOCS/moc_cbkmkselector.cpp cbkmkselector.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_cbkmkselector.o QSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-QSTATICREADEROBJS/moc_fileBrowser.o: QSTATICREADERMOCS/moc_fileBrowser.cpp fileBrowser.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_fileBrowser.o QSTATICREADERMOCS/moc_fileBrowser.cpp
-
-QSTATICREADEROBJS/moc_infowin.o: QSTATICREADERMOCS/moc_infowin.cpp infowin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_infowin.o QSTATICREADERMOCS/moc_infowin.cpp
-
-QSTATICREADERMOCS/moc_ButtonPrefs.cpp: $(MOC) ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o QSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-QSTATICREADERMOCS/moc_CAnnoEdit.cpp: $(MOC) CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o QSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-QSTATICREADERMOCS/moc_CloseDialog.cpp: $(MOC) CloseDialog.h
-	$(MOC) CloseDialog.h -o QSTATICREADERMOCS/moc_CloseDialog.cpp
-
-QSTATICREADERMOCS/moc_GraphicWin.cpp: $(MOC) GraphicWin.h
-	$(MOC) GraphicWin.h -o QSTATICREADERMOCS/moc_GraphicWin.cpp
-
-QSTATICREADERMOCS/moc_Prefs.cpp: $(MOC) Prefs.h
-	$(MOC) Prefs.h -o QSTATICREADERMOCS/moc_Prefs.cpp
-
-QSTATICREADERMOCS/moc_QFloatBar.cpp: $(MOC) QFloatBar.h
-	$(MOC) QFloatBar.h -o QSTATICREADERMOCS/moc_QFloatBar.cpp
-
-QSTATICREADERMOCS/moc_QTReader.cpp: $(MOC) QTReader.h
-	$(MOC) QTReader.h -o QSTATICREADERMOCS/moc_QTReader.cpp
-
-QSTATICREADERMOCS/moc_QTReaderApp.cpp: $(MOC) QTReaderApp.h
-	$(MOC) QTReaderApp.h -o QSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-QSTATICREADERMOCS/moc_QtrListView.cpp: $(MOC) QtrListView.h
-	$(MOC) QtrListView.h -o QSTATICREADERMOCS/moc_QtrListView.cpp
-
-QSTATICREADERMOCS/moc_ToolbarPrefs.cpp: $(MOC) ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o QSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-QSTATICREADERMOCS/moc_URLDialog.cpp: $(MOC) URLDialog.h
-	$(MOC) URLDialog.h -o QSTATICREADERMOCS/moc_URLDialog.cpp
-
-QSTATICREADERMOCS/moc_cbkmkselector.cpp: $(MOC) cbkmkselector.h
-	$(MOC) cbkmkselector.h -o QSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-QSTATICREADERMOCS/moc_fileBrowser.cpp: $(MOC) fileBrowser.h
-	$(MOC) fileBrowser.h -o QSTATICREADERMOCS/moc_fileBrowser.cpp
-
-QSTATICREADERMOCS/moc_infowin.cpp: $(MOC) infowin.h
-	$(MOC) infowin.h -o QSTATICREADERMOCS/moc_infowin.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/reader.staticzmak b/noncore/apps/opie-reader/reader.staticzmak
deleted file mode 100644
index f9315c1..0000000
--- a/noncore/apps/opie-reader/reader.staticzmak
+++ b/dev/null
@@ -1,862 +0,0 @@
-#############################################################################
-# Makefile for building ZSTATICREADEROBJS/uqtreader
-# Generated by tmake at 09:24, 2004/07/25
-#     Project: reader.staticzpro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-IZSTATICREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		ZSTATICREADERINC/opie.h \
-		pdb.h \
-		plucker_base.h \
-		plucker.h \
-		ppm.h \
-		ppm_expander.h \
-		preferences.h \
-		ZSTATICREADERINC/static.h \
-		usenef.h \
-		ZSTATICREADERINC/useqpe.h \
-		ustring.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	Aportis.cpp \
-		Bkmks.cpp \
-		BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CBuffer.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CExpander.cpp \
-		CFilter.cpp \
-		CHM.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		GraphicWin.cpp \
-		Navigation.cpp \
-		Palm2QImage.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		StyleConsts.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		arith_d.cpp \
-		chm_lib.c \
-		fileBrowser.cpp \
-		hrule.cpp \
-		infowin.cpp \
-		iSilo.cpp \
-		lzx.c \
-		main.cpp \
-		orkey.cpp \
-		pdb.cpp \
-		plucker.cpp \
-		plucker_base.cpp \
-		ppm.cpp \
-		ppm_expander.cpp \
-		striphtml.cpp \
-		util.cpp \
-		version.cpp \
-		ztxt.cpp
-OBJECTS =	ZSTATICREADEROBJS/Aportis.o \
-		ZSTATICREADEROBJS/Bkmks.o \
-		ZSTATICREADEROBJS/BuffDoc.o \
-		ZSTATICREADEROBJS/ButtonPrefs.o \
-		ZSTATICREADEROBJS/CAnnoEdit.o \
-		ZSTATICREADEROBJS/CBuffer.o \
-		ZSTATICREADEROBJS/CDrawBuffer.o \
-		ZSTATICREADEROBJS/CEncoding.o \
-		ZSTATICREADEROBJS/CEncoding_tables.o \
-		ZSTATICREADEROBJS/CExpander.o \
-		ZSTATICREADEROBJS/CFilter.o \
-		ZSTATICREADEROBJS/CHM.o \
-		ZSTATICREADEROBJS/CRegExp.o \
-		ZSTATICREADEROBJS/CloseDialog.o \
-		ZSTATICREADEROBJS/FontControl.o \
-		ZSTATICREADEROBJS/GraphicWin.o \
-		ZSTATICREADEROBJS/Navigation.o \
-		ZSTATICREADEROBJS/Palm2QImage.o \
-		ZSTATICREADEROBJS/Prefs.o \
-		ZSTATICREADEROBJS/QTReader.o \
-		ZSTATICREADEROBJS/QTReaderApp.o \
-		ZSTATICREADEROBJS/QtrListView.o \
-		ZSTATICREADEROBJS/StyleConsts.o \
-		ZSTATICREADEROBJS/ToolbarPrefs.o \
-		ZSTATICREADEROBJS/URLDialog.o \
-		ZSTATICREADEROBJS/arith_d.o \
-		ZSTATICREADEROBJS/chm_lib.o \
-		ZSTATICREADEROBJS/fileBrowser.o \
-		ZSTATICREADEROBJS/hrule.o \
-		ZSTATICREADEROBJS/infowin.o \
-		ZSTATICREADEROBJS/iSilo.o \
-		ZSTATICREADEROBJS/lzx.o \
-		ZSTATICREADEROBJS/main.o \
-		ZSTATICREADEROBJS/orkey.o \
-		ZSTATICREADEROBJS/pdb.o \
-		ZSTATICREADEROBJS/plucker.o \
-		ZSTATICREADEROBJS/plucker_base.o \
-		ZSTATICREADEROBJS/ppm.o \
-		ZSTATICREADEROBJS/ppm_expander.o \
-		ZSTATICREADEROBJS/striphtml.o \
-		ZSTATICREADEROBJS/util.o \
-		ZSTATICREADEROBJS/version.o \
-		ZSTATICREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	ZSTATICREADERMOCS/moc_ButtonPrefs.cpp \
-		ZSTATICREADERMOCS/moc_CAnnoEdit.cpp \
-		ZSTATICREADERMOCS/moc_CloseDialog.cpp \
-		ZSTATICREADERMOCS/moc_GraphicWin.cpp \
-		ZSTATICREADERMOCS/moc_Prefs.cpp \
-		ZSTATICREADERMOCS/moc_QFloatBar.cpp \
-		ZSTATICREADERMOCS/moc_QTReader.cpp \
-		ZSTATICREADERMOCS/moc_QTReaderApp.cpp \
-		ZSTATICREADERMOCS/moc_QtrListView.cpp \
-		ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
-		ZSTATICREADERMOCS/moc_URLDialog.cpp \
-		ZSTATICREADERMOCS/moc_cbkmkselector.cpp \
-		ZSTATICREADERMOCS/moc_fileBrowser.cpp \
-		ZSTATICREADERMOCS/moc_infowin.cpp
-OBJMOC	=	ZSTATICREADEROBJS/moc_ButtonPrefs.o \
-		ZSTATICREADEROBJS/moc_CAnnoEdit.o \
-		ZSTATICREADEROBJS/moc_CloseDialog.o \
-		ZSTATICREADEROBJS/moc_GraphicWin.o \
-		ZSTATICREADEROBJS/moc_Prefs.o \
-		ZSTATICREADEROBJS/moc_QFloatBar.o \
-		ZSTATICREADEROBJS/moc_QTReader.o \
-		ZSTATICREADEROBJS/moc_QTReaderApp.o \
-		ZSTATICREADEROBJS/moc_QtrListView.o \
-		ZSTATICREADEROBJS/moc_ToolbarPrefs.o \
-		ZSTATICREADEROBJS/moc_URLDialog.o \
-		ZSTATICREADEROBJS/moc_cbkmkselector.o \
-		ZSTATICREADEROBJS/moc_fileBrowser.o \
-		ZSTATICREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	ZSTATICREADEROBJS/uqtreader
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.staticzmak
-
-reader.staticzmak: reader.staticzpro
-	tmake reader.staticzpro -o reader.staticzmak
-
-dist:
-	$(TAR) reader.staticzpro.tar reader.staticzpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.staticzpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZSTATICREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Aportis.o Aportis.cpp
-
-ZSTATICREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Bkmks.o Bkmks.cpp
-
-ZSTATICREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		ZSTATICREADERINC/static.h \
-		names.h \
-		ZSTATICREADERINC/useqpe.h \
-		usenef.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-ZSTATICREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-ZSTATICREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-ZSTATICREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CBuffer.o CBuffer.cpp
-
-ZSTATICREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		ZSTATICREADERINC/useqpe.h \
-		ZSTATICREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-ZSTATICREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CEncoding.o CEncoding.cpp
-
-ZSTATICREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-ZSTATICREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CExpander.o CExpander.cpp
-
-ZSTATICREADEROBJS/CFilter.o: CFilter.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZSTATICREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CFilter.o CFilter.cpp
-
-ZSTATICREADEROBJS/CHM.o: CHM.cpp \
-		CHM.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		chm_lib.h \
-		my_list.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CHM.o CHM.cpp
-
-ZSTATICREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CRegExp.o CRegExp.cpp
-
-ZSTATICREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-ZSTATICREADEROBJS/FontControl.o: FontControl.cpp \
-		ZSTATICREADERINC/opie.h \
-		ZSTATICREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/FontControl.o FontControl.cpp
-
-ZSTATICREADEROBJS/GraphicWin.o: GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/GraphicWin.o GraphicWin.cpp
-
-ZSTATICREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Navigation.o Navigation.cpp
-
-ZSTATICREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
-ZSTATICREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Prefs.o Prefs.cpp
-
-ZSTATICREADEROBJS/QTReader.o: QTReader.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		ZSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QTReader.o QTReader.cpp
-
-ZSTATICREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		QTReader.h \
-		ZSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		ZSTATICREADERINC/opie.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-ZSTATICREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QtrListView.o QtrListView.cpp
-
-ZSTATICREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-ZSTATICREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-ZSTATICREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/URLDialog.o URLDialog.cpp
-
-ZSTATICREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/arith_d.o arith_d.cpp
-
-ZSTATICREADEROBJS/chm_lib.o: chm_lib.c \
-		chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/chm_lib.o chm_lib.c
-
-ZSTATICREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-ZSTATICREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/hrule.o hrule.cpp
-
-ZSTATICREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/infowin.o infowin.cpp
-
-ZSTATICREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/iSilo.o iSilo.cpp
-
-ZSTATICREADEROBJS/lzx.o: lzx.c \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/lzx.o lzx.c
-
-ZSTATICREADEROBJS/main.o: main.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/main.o main.cpp
-
-ZSTATICREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/orkey.o orkey.cpp
-
-ZSTATICREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/pdb.o pdb.cpp
-
-ZSTATICREADEROBJS/plucker.o: plucker.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/plucker.o plucker.cpp
-
-ZSTATICREADEROBJS/plucker_base.o: plucker_base.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		usenef.h \
-		ZSTATICREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/plucker_base.o plucker_base.cpp
-
-ZSTATICREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ppm.o ppm.cpp
-
-ZSTATICREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		ZSTATICREADERINC/static.h \
-		ppm_expander.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-ZSTATICREADEROBJS/striphtml.o: striphtml.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZSTATICREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/striphtml.o striphtml.cpp
-
-ZSTATICREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/util.o util.cpp
-
-ZSTATICREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/version.o version.cpp
-
-ZSTATICREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ztxt.o ztxt.cpp
-
-ZSTATICREADEROBJS/moc_ButtonPrefs.o: ZSTATICREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_ButtonPrefs.o ZSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-ZSTATICREADEROBJS/moc_CAnnoEdit.o: ZSTATICREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_CAnnoEdit.o ZSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-ZSTATICREADEROBJS/moc_CloseDialog.o: ZSTATICREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_CloseDialog.o ZSTATICREADERMOCS/moc_CloseDialog.cpp
-
-ZSTATICREADEROBJS/moc_GraphicWin.o: ZSTATICREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_GraphicWin.o ZSTATICREADERMOCS/moc_GraphicWin.cpp
-
-ZSTATICREADEROBJS/moc_Prefs.o: ZSTATICREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_Prefs.o ZSTATICREADERMOCS/moc_Prefs.cpp
-
-ZSTATICREADEROBJS/moc_QFloatBar.o: ZSTATICREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QFloatBar.o ZSTATICREADERMOCS/moc_QFloatBar.cpp
-
-ZSTATICREADEROBJS/moc_QTReader.o: ZSTATICREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		ZSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		ZSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QTReader.o ZSTATICREADERMOCS/moc_QTReader.cpp
-
-ZSTATICREADEROBJS/moc_QTReaderApp.o: ZSTATICREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QTReaderApp.o ZSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-ZSTATICREADEROBJS/moc_QtrListView.o: ZSTATICREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QtrListView.o ZSTATICREADERMOCS/moc_QtrListView.cpp
-
-ZSTATICREADEROBJS/moc_ToolbarPrefs.o: ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		ZSTATICREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_ToolbarPrefs.o ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZSTATICREADEROBJS/moc_URLDialog.o: ZSTATICREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_URLDialog.o ZSTATICREADERMOCS/moc_URLDialog.cpp
-
-ZSTATICREADEROBJS/moc_cbkmkselector.o: ZSTATICREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_cbkmkselector.o ZSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-ZSTATICREADEROBJS/moc_fileBrowser.o: ZSTATICREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_fileBrowser.o ZSTATICREADERMOCS/moc_fileBrowser.cpp
-
-ZSTATICREADEROBJS/moc_infowin.o: ZSTATICREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_infowin.o ZSTATICREADERMOCS/moc_infowin.cpp
-
-ZSTATICREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o ZSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-ZSTATICREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o ZSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-ZSTATICREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o ZSTATICREADERMOCS/moc_CloseDialog.cpp
-
-ZSTATICREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o ZSTATICREADERMOCS/moc_GraphicWin.cpp
-
-ZSTATICREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o ZSTATICREADERMOCS/moc_Prefs.cpp
-
-ZSTATICREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o ZSTATICREADERMOCS/moc_QFloatBar.cpp
-
-ZSTATICREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o ZSTATICREADERMOCS/moc_QTReader.cpp
-
-ZSTATICREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o ZSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-ZSTATICREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o ZSTATICREADERMOCS/moc_QtrListView.cpp
-
-ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZSTATICREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o ZSTATICREADERMOCS/moc_URLDialog.cpp
-
-ZSTATICREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o ZSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-ZSTATICREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o ZSTATICREADERMOCS/moc_fileBrowser.cpp
-
-ZSTATICREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o ZSTATICREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.wmak b/noncore/apps/opie-reader/reader.wmak
deleted file mode 100644
index dda01c1..0000000
--- a/noncore/apps/opie-reader/reader.wmak
+++ b/dev/null
@@ -1,604 +0,0 @@
-#############################################################################
-# Makefile for building $(QPEDIR)/bin/uqtreader
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: reader.wpro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Coder.h \
-		CSource.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		PPMd.h \
-		PPMdType.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		SubAlloc.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		arrierego.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		nef.h \
-		WSREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		usenef.h \
-		WSREADERINC/useqpe.h \
-		ustring.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		fileBrowser.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS =	WSREADEROBJS/BuffDoc.o \
-		WSREADEROBJS/ButtonPrefs.o \
-		WSREADEROBJS/CAnnoEdit.o \
-		WSREADEROBJS/CDrawBuffer.o \
-		WSREADEROBJS/CEncoding.o \
-		WSREADEROBJS/CEncoding_tables.o \
-		WSREADEROBJS/CFilter.o \
-		WSREADEROBJS/CRegExp.o \
-		WSREADEROBJS/CloseDialog.o \
-		WSREADEROBJS/FontControl.o \
-		WSREADEROBJS/Prefs.o \
-		WSREADEROBJS/QTReader.o \
-		WSREADEROBJS/QTReaderApp.o \
-		WSREADEROBJS/QtrListView.o \
-		WSREADEROBJS/ToolbarPrefs.o \
-		WSREADEROBJS/URLDialog.o \
-		WSREADEROBJS/fileBrowser.o \
-		WSREADEROBJS/infowin.o \
-		WSREADEROBJS/main.o \
-		WSREADEROBJS/orkey.o \
-		WSREADEROBJS/util.o \
-		WSREADEROBJS/version.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	WSREADERMOCS/moc_ButtonPrefs.cpp \
-		WSREADERMOCS/moc_CAnnoEdit.cpp \
-		WSREADERMOCS/moc_CloseDialog.cpp \
-		WSREADERMOCS/moc_GraphicWin.cpp \
-		WSREADERMOCS/moc_Prefs.cpp \
-		WSREADERMOCS/moc_QFloatBar.cpp \
-		WSREADERMOCS/moc_QTReader.cpp \
-		WSREADERMOCS/moc_QTReaderApp.cpp \
-		WSREADERMOCS/moc_QtrListView.cpp \
-		WSREADERMOCS/moc_ToolbarPrefs.cpp \
-		WSREADERMOCS/moc_URLDialog.cpp \
-		WSREADERMOCS/moc_cbkmkselector.cpp \
-		WSREADERMOCS/moc_fileBrowser.cpp \
-		WSREADERMOCS/moc_infowin.cpp
-OBJMOC	=	WSREADEROBJS/moc_ButtonPrefs.o \
-		WSREADEROBJS/moc_CAnnoEdit.o \
-		WSREADEROBJS/moc_CloseDialog.o \
-		WSREADEROBJS/moc_GraphicWin.o \
-		WSREADEROBJS/moc_Prefs.o \
-		WSREADEROBJS/moc_QFloatBar.o \
-		WSREADEROBJS/moc_QTReader.o \
-		WSREADEROBJS/moc_QTReaderApp.o \
-		WSREADEROBJS/moc_QtrListView.o \
-		WSREADEROBJS/moc_ToolbarPrefs.o \
-		WSREADEROBJS/moc_URLDialog.o \
-		WSREADEROBJS/moc_cbkmkselector.o \
-		WSREADEROBJS/moc_fileBrowser.o \
-		WSREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	$(QPEDIR)/bin/uqtreader
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.wmak
-
-reader.wmak: reader.wpro
-	tmake reader.wpro -o reader.wmak
-
-dist:
-	$(TAR) reader.wpro.tar reader.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		WSREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		nef.h \
-		usenef.h \
-		arrierego.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-WSREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-WSREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-WSREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		WSREADERINC/useqpe.h \
-		WSREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-WSREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CEncoding.o CEncoding.cpp
-
-WSREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-WSREADEROBJS/CFilter.o: CFilter.cpp \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		WSREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CFilter.o CFilter.cpp
-
-WSREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CRegExp.o CRegExp.cpp
-
-WSREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-WSREADEROBJS/FontControl.o: FontControl.cpp \
-		WSREADERINC/opie.h \
-		WSREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/FontControl.o FontControl.cpp
-
-WSREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Prefs.o Prefs.cpp
-
-WSREADEROBJS/QTReader.o: QTReader.cpp \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		WSREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QTReader.o QTReader.cpp
-
-WSREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		WSREADERINC/useqpe.h \
-		QTReader.h \
-		WSREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-WSREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QtrListView.o QtrListView.cpp
-
-WSREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		WSREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-WSREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/URLDialog.o URLDialog.cpp
-
-WSREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-WSREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/infowin.o infowin.cpp
-
-WSREADEROBJS/main.o: main.cpp \
-		WSREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/main.o main.cpp
-
-WSREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/orkey.o orkey.cpp
-
-WSREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/util.o util.cpp
-
-WSREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/version.o version.cpp
-
-WSREADEROBJS/moc_ButtonPrefs.o: WSREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_ButtonPrefs.o WSREADERMOCS/moc_ButtonPrefs.cpp
-
-WSREADEROBJS/moc_CAnnoEdit.o: WSREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_CAnnoEdit.o WSREADERMOCS/moc_CAnnoEdit.cpp
-
-WSREADEROBJS/moc_CloseDialog.o: WSREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_CloseDialog.o WSREADERMOCS/moc_CloseDialog.cpp
-
-WSREADEROBJS/moc_GraphicWin.o: WSREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_GraphicWin.o WSREADERMOCS/moc_GraphicWin.cpp
-
-WSREADEROBJS/moc_Prefs.o: WSREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_Prefs.o WSREADERMOCS/moc_Prefs.cpp
-
-WSREADEROBJS/moc_QFloatBar.o: WSREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QFloatBar.o WSREADERMOCS/moc_QFloatBar.cpp
-
-WSREADEROBJS/moc_QTReader.o: WSREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		WSREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QTReader.o WSREADERMOCS/moc_QTReader.cpp
-
-WSREADEROBJS/moc_QTReaderApp.o: WSREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QTReaderApp.o WSREADERMOCS/moc_QTReaderApp.cpp
-
-WSREADEROBJS/moc_QtrListView.o: WSREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QtrListView.o WSREADERMOCS/moc_QtrListView.cpp
-
-WSREADEROBJS/moc_ToolbarPrefs.o: WSREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		WSREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_ToolbarPrefs.o WSREADERMOCS/moc_ToolbarPrefs.cpp
-
-WSREADEROBJS/moc_URLDialog.o: WSREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_URLDialog.o WSREADERMOCS/moc_URLDialog.cpp
-
-WSREADEROBJS/moc_cbkmkselector.o: WSREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_cbkmkselector.o WSREADERMOCS/moc_cbkmkselector.cpp
-
-WSREADEROBJS/moc_fileBrowser.o: WSREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_fileBrowser.o WSREADERMOCS/moc_fileBrowser.cpp
-
-WSREADEROBJS/moc_infowin.o: WSREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_infowin.o WSREADERMOCS/moc_infowin.cpp
-
-WSREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o WSREADERMOCS/moc_ButtonPrefs.cpp
-
-WSREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o WSREADERMOCS/moc_CAnnoEdit.cpp
-
-WSREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o WSREADERMOCS/moc_CloseDialog.cpp
-
-WSREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o WSREADERMOCS/moc_GraphicWin.cpp
-
-WSREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o WSREADERMOCS/moc_Prefs.cpp
-
-WSREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o WSREADERMOCS/moc_QFloatBar.cpp
-
-WSREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o WSREADERMOCS/moc_QTReader.cpp
-
-WSREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o WSREADERMOCS/moc_QTReaderApp.cpp
-
-WSREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o WSREADERMOCS/moc_QtrListView.cpp
-
-WSREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o WSREADERMOCS/moc_ToolbarPrefs.cpp
-
-WSREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o WSREADERMOCS/moc_URLDialog.cpp
-
-WSREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o WSREADERMOCS/moc_cbkmkselector.cpp
-
-WSREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o WSREADERMOCS/moc_fileBrowser.cpp
-
-WSREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o WSREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.wpro b/noncore/apps/opie-reader/reader.wpro
deleted file mode 100644
index 3e4f345..0000000
--- a/noncore/apps/opie-reader/reader.wpro
+++ b/dev/null
@@ -1,93 +0,0 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on release
-HEADERS		= Aportis.h \
-                  Bkmks.h \
-                  BuffDoc.h \
-		  ButtonPrefs.h \
-                  CAnnoEdit.h \
-                  CBuffer.h \
-                  CDrawBuffer.h \
-                  CEncoding.h \
-                  CEncoding_tables.h \
-                  CExpander.h \
-                  CFilter.h \
-                  CloseDialog.h \
-                  Coder.h \
-                  CSource.h \
-                  Filedata.h \
-                  FixedFont.h \
-                  FontControl.h \
-                  GraphicWin.h \
-                  Markups.h \
-                  Navigation.h \
-                  Palm2QImage.h \
-                  Prefs.h \
-                  PPMd.h \
-                  PPMdType.h \
-                  QFloatBar.h \
-                  QTReader.h \
-                  QTReaderApp.h \
-                  QtrListView.h \
-                  Queue.h \
-                  StateData.h \
-                  StyleConsts.h \
-                  SubAlloc.h \
-                  ToolbarPrefs.h \
-                  URLDialog.h \
-                  ZText.h \
-                  arith.h \
-                  arrierego.h \
-                  cbkmkselector.h \
-                  config.h \
-                  fileBrowser.h \
-                  infowin.h \
-                  linktype.h \
-                  my_list.h \
-                  names.h \
-                  nef.h \
-                  WSREADERINC/opie.h \
-                  pdb.h \
-                  plucker.h \
-                  plucker_base.h \
-                  ppm.h \
-                  ppm_expander.h \
-                  usenef.h \
-                  WSREADERINC/useqpe.h \
-                  ustring.h \
-                  utypes.h \
-                  version.h \
-                  ztxt.h
-
-SOURCES		= BuffDoc.cpp \
-                  ButtonPrefs.cpp \
-                  CAnnoEdit.cpp \
-                  CDrawBuffer.cpp \
-                  CEncoding.cpp \
-                  CEncoding_tables.cpp \
-                  CFilter.cpp \
-		  CRegExp.cpp \
-                  CloseDialog.cpp \
-                  FontControl.cpp \
-                  Prefs.cpp \
-                  QTReader.cpp \
-                  QTReaderApp.cpp \
-                  QtrListView.cpp \
-                  ToolbarPrefs.cpp \
-                  URLDialog.cpp \
-                  fileBrowser.cpp \
-                  infowin.cpp \
-                  main.cpp \
-		  orkey.cpp \
-		  util.cpp \
-                  version.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QPEDIR)/bin
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
-TARGET		= uqtreader
-LIBS		+= -lqpe -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
diff --git a/noncore/apps/opie-reader/reader.zmak b/noncore/apps/opie-reader/reader.zmak
deleted file mode 100644
index bb697f4..0000000
--- a/noncore/apps/opie-reader/reader.zmak
+++ b/dev/null
@@ -1,605 +0,0 @@
-#############################################################################
-# Makefile for building $(QPEDIR)/bin/uqtreader
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: reader.zpro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Coder.h \
-		CSource.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		PPMd.h \
-		PPMdType.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		SubAlloc.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		arrierego.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		nef.h \
-		ZREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		usenef.h \
-		ZREADERINC/useqpe.h \
-		ustring.h \
-		util.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		fileBrowser.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS =	ZREADEROBJS/BuffDoc.o \
-		ZREADEROBJS/ButtonPrefs.o \
-		ZREADEROBJS/CAnnoEdit.o \
-		ZREADEROBJS/CDrawBuffer.o \
-		ZREADEROBJS/CEncoding.o \
-		ZREADEROBJS/CEncoding_tables.o \
-		ZREADEROBJS/CFilter.o \
-		ZREADEROBJS/CRegExp.o \
-		ZREADEROBJS/CloseDialog.o \
-		ZREADEROBJS/FontControl.o \
-		ZREADEROBJS/Prefs.o \
-		ZREADEROBJS/QTReader.o \
-		ZREADEROBJS/QTReaderApp.o \
-		ZREADEROBJS/QtrListView.o \
-		ZREADEROBJS/ToolbarPrefs.o \
-		ZREADEROBJS/URLDialog.o \
-		ZREADEROBJS/fileBrowser.o \
-		ZREADEROBJS/infowin.o \
-		ZREADEROBJS/main.o \
-		ZREADEROBJS/orkey.o \
-		ZREADEROBJS/util.o \
-		ZREADEROBJS/version.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	ZREADERMOCS/moc_ButtonPrefs.cpp \
-		ZREADERMOCS/moc_CAnnoEdit.cpp \
-		ZREADERMOCS/moc_CloseDialog.cpp \
-		ZREADERMOCS/moc_GraphicWin.cpp \
-		ZREADERMOCS/moc_Prefs.cpp \
-		ZREADERMOCS/moc_QFloatBar.cpp \
-		ZREADERMOCS/moc_QTReader.cpp \
-		ZREADERMOCS/moc_QTReaderApp.cpp \
-		ZREADERMOCS/moc_QtrListView.cpp \
-		ZREADERMOCS/moc_ToolbarPrefs.cpp \
-		ZREADERMOCS/moc_URLDialog.cpp \
-		ZREADERMOCS/moc_cbkmkselector.cpp \
-		ZREADERMOCS/moc_fileBrowser.cpp \
-		ZREADERMOCS/moc_infowin.cpp
-OBJMOC	=	ZREADEROBJS/moc_ButtonPrefs.o \
-		ZREADEROBJS/moc_CAnnoEdit.o \
-		ZREADEROBJS/moc_CloseDialog.o \
-		ZREADEROBJS/moc_GraphicWin.o \
-		ZREADEROBJS/moc_Prefs.o \
-		ZREADEROBJS/moc_QFloatBar.o \
-		ZREADEROBJS/moc_QTReader.o \
-		ZREADEROBJS/moc_QTReaderApp.o \
-		ZREADEROBJS/moc_QtrListView.o \
-		ZREADEROBJS/moc_ToolbarPrefs.o \
-		ZREADEROBJS/moc_URLDialog.o \
-		ZREADEROBJS/moc_cbkmkselector.o \
-		ZREADEROBJS/moc_fileBrowser.o \
-		ZREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	$(QPEDIR)/bin/uqtreader
-INTERFACE_DECL_PATH = .
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.zmak
-
-reader.zmak: reader.zpro
-	tmake reader.zpro -o reader.zmak
-
-dist:
-	$(TAR) reader.zpro.tar reader.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		ZREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		nef.h \
-		usenef.h \
-		arrierego.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-ZREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-ZREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-ZREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		ZREADERINC/useqpe.h \
-		ZREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-ZREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CEncoding.o CEncoding.cpp
-
-ZREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-ZREADEROBJS/CFilter.o: CFilter.cpp \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CFilter.o CFilter.cpp
-
-ZREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CRegExp.o CRegExp.cpp
-
-ZREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-ZREADEROBJS/FontControl.o: FontControl.cpp \
-		ZREADERINC/opie.h \
-		ZREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/FontControl.o FontControl.cpp
-
-ZREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Prefs.o Prefs.cpp
-
-ZREADEROBJS/QTReader.o: QTReader.cpp \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		ZREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QTReader.o QTReader.cpp
-
-ZREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		ZREADERINC/useqpe.h \
-		QTReader.h \
-		ZREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-ZREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QtrListView.o QtrListView.cpp
-
-ZREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		ZREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-ZREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/URLDialog.o URLDialog.cpp
-
-ZREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-ZREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/infowin.o infowin.cpp
-
-ZREADEROBJS/main.o: main.cpp \
-		ZREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/main.o main.cpp
-
-ZREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/orkey.o orkey.cpp
-
-ZREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/util.o util.cpp
-
-ZREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/version.o version.cpp
-
-ZREADEROBJS/moc_ButtonPrefs.o: ZREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_ButtonPrefs.o ZREADERMOCS/moc_ButtonPrefs.cpp
-
-ZREADEROBJS/moc_CAnnoEdit.o: ZREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_CAnnoEdit.o ZREADERMOCS/moc_CAnnoEdit.cpp
-
-ZREADEROBJS/moc_CloseDialog.o: ZREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_CloseDialog.o ZREADERMOCS/moc_CloseDialog.cpp
-
-ZREADEROBJS/moc_GraphicWin.o: ZREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_GraphicWin.o ZREADERMOCS/moc_GraphicWin.cpp
-
-ZREADEROBJS/moc_Prefs.o: ZREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_Prefs.o ZREADERMOCS/moc_Prefs.cpp
-
-ZREADEROBJS/moc_QFloatBar.o: ZREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QFloatBar.o ZREADERMOCS/moc_QFloatBar.cpp
-
-ZREADEROBJS/moc_QTReader.o: ZREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		ZREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QTReader.o ZREADERMOCS/moc_QTReader.cpp
-
-ZREADEROBJS/moc_QTReaderApp.o: ZREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QTReaderApp.o ZREADERMOCS/moc_QTReaderApp.cpp
-
-ZREADEROBJS/moc_QtrListView.o: ZREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QtrListView.o ZREADERMOCS/moc_QtrListView.cpp
-
-ZREADEROBJS/moc_ToolbarPrefs.o: ZREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		ZREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_ToolbarPrefs.o ZREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZREADEROBJS/moc_URLDialog.o: ZREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_URLDialog.o ZREADERMOCS/moc_URLDialog.cpp
-
-ZREADEROBJS/moc_cbkmkselector.o: ZREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_cbkmkselector.o ZREADERMOCS/moc_cbkmkselector.cpp
-
-ZREADEROBJS/moc_fileBrowser.o: ZREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_fileBrowser.o ZREADERMOCS/moc_fileBrowser.cpp
-
-ZREADEROBJS/moc_infowin.o: ZREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_infowin.o ZREADERMOCS/moc_infowin.cpp
-
-ZREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o ZREADERMOCS/moc_ButtonPrefs.cpp
-
-ZREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o ZREADERMOCS/moc_CAnnoEdit.cpp
-
-ZREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o ZREADERMOCS/moc_CloseDialog.cpp
-
-ZREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o ZREADERMOCS/moc_GraphicWin.cpp
-
-ZREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o ZREADERMOCS/moc_Prefs.cpp
-
-ZREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o ZREADERMOCS/moc_QFloatBar.cpp
-
-ZREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o ZREADERMOCS/moc_QTReader.cpp
-
-ZREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o ZREADERMOCS/moc_QTReaderApp.cpp
-
-ZREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o ZREADERMOCS/moc_QtrListView.cpp
-
-ZREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o ZREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o ZREADERMOCS/moc_URLDialog.cpp
-
-ZREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o ZREADERMOCS/moc_cbkmkselector.cpp
-
-ZREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o ZREADERMOCS/moc_fileBrowser.cpp
-
-ZREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o ZREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.zpro b/noncore/apps/opie-reader/reader.zpro
deleted file mode 100644
index 32deb2b..0000000
--- a/noncore/apps/opie-reader/reader.zpro
+++ b/dev/null
@@ -1,95 +0,0 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on release
-HEADERS		= Aportis.h \
-                  Bkmks.h \
-                  BuffDoc.h \
-                  ButtonPrefs.h \
-                  CAnnoEdit.h \
-                  CBuffer.h \
-                  CDrawBuffer.h \
-                  CEncoding.h \
-                  CEncoding_tables.h \
-                  CExpander.h \
-                  CFilter.h \
-                  CloseDialog.h \
-                  Coder.h \
-                  CSource.h \
-                  Filedata.h \
-                  FixedFont.h \
-                  FontControl.h \
-                  GraphicWin.h \
-                  Markups.h \
-                  Navigation.h \
-                  Palm2QImage.h \
-                  Prefs.h \
-                  PPMd.h \
-                  PPMdType.h \
-                  QFloatBar.h \
-                  QTReader.h \
-                  QTReaderApp.h \
-                  QtrListView.h \
-                  Queue.h \
-                  StateData.h \
-                  StyleConsts.h \
-                  SubAlloc.h \
-                  ToolbarPrefs.h \
-                  URLDialog.h \
-                  ZText.h \
-                  arith.h \
-                  arrierego.h \
-                  cbkmkselector.h \
-                  config.h \
-                  fileBrowser.h \
-                  infowin.h \
-                  linktype.h \
-                  my_list.h \
-                  names.h \
-                  nef.h \
-                  ZREADERINC/opie.h \
-                  pdb.h \
-                  plucker.h \
-                  plucker_base.h \
-                  ppm.h \
-                  ppm_expander.h \
-                  usenef.h \
-                  ZREADERINC/useqpe.h \
-                  ustring.h \
-		  util.h \
-                  utypes.h \
-                  version.h \
-                  ztxt.h
-
-SOURCES		= BuffDoc.cpp \
-                  ButtonPrefs.cpp \
-                  CAnnoEdit.cpp \
-                  CDrawBuffer.cpp \
-                  CEncoding.cpp \
-                  CEncoding_tables.cpp \
-                  CFilter.cpp \
-		  CRegExp.cpp \
-                  CloseDialog.cpp \
-                  FontControl.cpp \
-		  GraphicWin.cpp \
-                  Prefs.cpp \
-                  QTReader.cpp \
-                  QTReaderApp.cpp \
-                  QtrListView.cpp \
-                  ToolbarPrefs.cpp \
-                  URLDialog.cpp \
-                  fileBrowser.cpp \
-                  infowin.cpp \
-                  main.cpp \
-		  orkey.cpp \
-		  util.cpp \
-                  version.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QPEDIR)/bin
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
-TARGET		= uqtreader
-LIBS		+= -lqpe -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
diff --git a/noncore/apps/opie-reader/reader/reader.pro b/noncore/apps/opie-reader/reader/reader.pro
index 3f56da9..33975ee 100644
--- a/noncore/apps/opie-reader/reader/reader.pro
+++ b/noncore/apps/opie-reader/reader/reader.pro
@@ -1,91 +1,87 @@
 DEFINES += OPIE USEQPE
 VPATH = ..
 TEMPLATE	= app
 CONFIG		= qt warn_on release
 HEADERS		= Aportis.h \
                   Bkmks.h \
                   BuffDoc.h \
                   ButtonPrefs.h \
                   CAnnoEdit.h \
                   CBuffer.h \
                   CDrawBuffer.h \
                   CEncoding.h \
                   CEncoding_tables.h \
                   CExpander.h \
                   CFilter.h \
                   CloseDialog.h \
                   Filedata.h \
                   FixedFont.h \
                   FontControl.h \
                   GraphicWin.h \
                   Markups.h \
                   Navigation.h \
                   Palm2QImage.h \
                   Prefs.h \
                   PPMd.h \
                   PPMdType.h \
                   QFloatBar.h \
                   QTReader.h \
                   QTReaderApp.h \
                   QtrListView.h \
                   Queue.h \
                   StyleConsts.h \
                   ToolbarPrefs.h \
                   URLDialog.h \
                   ZText.h \
                   arith.h \
                   cbkmkselector.h \
                   config.h \
                   fileBrowser.h \
                   infowin.h \
                   linktype.h \
                   my_list.h \
                   names.h \
-                  ../OREADERINC/opie.h \
                   pdb.h \
                   plucker.h \
                   plucker_base.h \
                   ppm.h \
                   ppm_expander.h \
                   usenef.h \
-                  ../OREADERINC/useqpe.h \
                   ustring.h \
 		  util.h \
                   utypes.h \
                   version.h \
                   ztxt.h
 
 SOURCES		= BuffDoc.cpp \
                   ButtonPrefs.cpp \
                   CAnnoEdit.cpp \
                   CDrawBuffer.cpp \
                   CEncoding.cpp \
                   CEncoding_tables.cpp \
                   CFilter.cpp \
 		  CRegExp.cpp \
                   CloseDialog.cpp \
                   FontControl.cpp \
 		  GraphicWin.cpp \
                   Prefs.cpp \
                   QTReader.cpp \
                   QTReaderApp.cpp \
                   QtrListView.cpp \
                   ToolbarPrefs.cpp \
                   URLDialog.cpp \
                   fileBrowser.cpp \
                   infowin.cpp \
                   main.cpp \
 		  orkey.cpp \
 		  util.cpp \
                   version.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/bin
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
-TARGET		= reader
-LIBS		+= -lopieui2 -lqpe -lreader_codec
-
-DEPENDPATH += ../OREADERINC
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
+TARGET		= opie-reader
+LIBS		+= -lopiecore2 -lopieui2 -lqpe -lreader_codec
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/static.h b/noncore/apps/opie-reader/static.h
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/apps/opie-reader/static.h
diff --git a/noncore/apps/opie-reader/useqpe.h b/noncore/apps/opie-reader/useqpe.h
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/apps/opie-reader/useqpe.h