Imported Upstream version 1.5

author: Roberto C. Sanchez <roberto@connexer.com> 2014-10-21 22:48:14 -0400
committer: Roberto C. Sanchez <roberto@connexer.com> 2014-10-21 22:48:14 -0400
commit: 3edaf04fe3c966997d7c84a8973c62ab5df500bb (patch)
tree: 46865fe911db1fca1c6a8678795bae46a19d9f1b /bibletime
parent: 472963ff3697fb12af111e4a8fa2b985216826d5 (diff)
281 files changed, 0 insertions, 47289 deletions
diff --git a/bibletime/Makefile.am b/bibletime/Makefile.am
deleted file mode 100644
index 681152f..0000000
--- a/bibletime/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-bibletime_SOURCES = \
-bibletime_init.cpp \
-bibletime_slots.cpp \
-bibletime.cpp \
-bibletimeapp.cpp \
-main.cpp
-
-bibletime_LDADD   = \
-./printing/libprinting.a \
-./frontend/displaywindow/libdisplaywindow.a \
-./frontend/display/libdisplay.a \
-./frontend/keychooser/libkeychooser.a \
-./frontend/mainindex/libmainindex.a \
-./frontend/searchdialog/libsearchdialog.a \
-./frontend/libfrontend.a \
-./backend/libbackend.a \
-./util/libutil.a \
--lXext \
-$(LIB_QT) \
-$(LIB_KDECORE) \
-$(LIB_KDEUI) \
--lkdeprint \
-$(LIB_KFILE) \
-$(LIB_KHTML) \
-$(LIB_X11) \
-$(LIB_SWORD) \
-$(LIBSOCKET)
-
-SUBDIRS = backend printing frontend xml pics util
-
-all_headers = bibletime.h bibletimeapp.h
-
-EXTRA_DIST = $(bibletime_SOURCES) $(all_headers)
-
-# this 10 paths are KDE specific. Use them:
-# kde_htmldir       Where your docs should go to. (contains lang subdirs)
-# kde_appsdir       Where your application file (.kdelnk) should go to. 
-# kde_icondir       Where your icon should go to.
-# kde_minidir       Where your mini icon should go to.
-# kde_datadir       Where you install application data. (Use a subdir)
-# kde_locale        Where translation files should go to.(contains lang subdirs)
-# kde_cgidir        Where cgi-bin executables should go to.
-# kde_confdir       Where config files should go to.
-# kde_mimedir       Where mimetypes should go to.
-# kde_toolbardir    Where general toolbar icons should go to.
-# kde_wallpaperdir  Where general wallpapers should go to.
-
-# set the include path for X, qt, KDE and Sword
-INCLUDES = $(all_includes)
-
-# claim, which subdirectories you want to install
-# you can add here more. This one gets installed 
-bin_PROGRAMS = bibletime 
-
-bibletime_METASOURCES = AUTO
-
-# the library search path. 
-bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-
-# them while "make clean", use CLEANFILES
-DISTCLEANFILES = $(bibletime_METASOURCES)
-
-# make messages.po. Move this one to ../po/ and "make merge" in po
-# the -x is for skipping messages already translated in kdelibs
-#messages:
-#	$(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
-
-rpm: dist
-	
-
-
diff --git a/bibletime/Makefile.in b/bibletime/Makefile.in
deleted file mode 100644
index f02672a..0000000
--- a/bibletime/Makefile.in
+++ /dev/null
@@ -1,894 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-bibletime_SOURCES = \
-bibletime_init.cpp \
-bibletime_slots.cpp \
-bibletime.cpp \
-bibletimeapp.cpp \
-main.cpp
-
-
-bibletime_LDADD = \
-./printing/libprinting.a \
-./frontend/displaywindow/libdisplaywindow.a \
-./frontend/display/libdisplay.a \
-./frontend/keychooser/libkeychooser.a \
-./frontend/mainindex/libmainindex.a \
-./frontend/searchdialog/libsearchdialog.a \
-./frontend/libfrontend.a \
-./backend/libbackend.a \
-./util/libutil.a \
--lXext \
-$(LIB_QT) \
-$(LIB_KDECORE) \
-$(LIB_KDEUI) \
--lkdeprint \
-$(LIB_KFILE) \
-$(LIB_KHTML) \
-$(LIB_X11) \
-$(LIB_SWORD) \
-$(LIBSOCKET)
-
-
-SUBDIRS = backend printing frontend xml pics util
-
-all_headers = bibletime.h bibletimeapp.h
-
-EXTRA_DIST = $(bibletime_SOURCES) $(all_headers)
-
-# this 10 paths are KDE specific. Use them:
-# kde_htmldir       Where your docs should go to. (contains lang subdirs)
-# kde_appsdir       Where your application file (.kdelnk) should go to. 
-# kde_icondir       Where your icon should go to.
-# kde_minidir       Where your mini icon should go to.
-# kde_datadir       Where you install application data. (Use a subdir)
-# kde_locale        Where translation files should go to.(contains lang subdirs)
-# kde_cgidir        Where cgi-bin executables should go to.
-# kde_confdir       Where config files should go to.
-# kde_mimedir       Where mimetypes should go to.
-# kde_toolbardir    Where general toolbar icons should go to.
-# kde_wallpaperdir  Where general wallpapers should go to.
-
-# set the include path for X, qt, KDE and Sword
-INCLUDES = $(all_includes)
-
-# claim, which subdirectories you want to install
-# you can add here more. This one gets installed 
-bin_PROGRAMS = bibletime 
-
-#>- bibletime_METASOURCES = AUTO
-
-# the library search path. 
-bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-
-# them while "make clean", use CLEANFILES
-DISTCLEANFILES = $(bibletime_METASOURCES)
-subdir = bibletime
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = bibletime$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_bibletime_OBJECTS = bibletime_init.$(OBJEXT) \
-	bibletime_slots.$(OBJEXT) bibletime.$(OBJEXT) \
-	bibletimeapp.$(OBJEXT) main.$(OBJEXT)
-#>- bibletime_OBJECTS = $(am_bibletime_OBJECTS)
-#>+ 7
-bibletime_final_OBJECTS = bibletime.all_cpp.o 
-bibletime_nofinal_OBJECTS = bibletime_init.$(OBJEXT) \
-	bibletime_slots.$(OBJEXT) bibletime.$(OBJEXT) \
-	bibletimeapp.$(OBJEXT) main.$(OBJEXT)\
-bibletime.moc.o 
-@KDE_USE_FINAL_FALSE@bibletime_OBJECTS = $(bibletime_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@bibletime_OBJECTS = $(bibletime_final_OBJECTS)
-bibletime_DEPENDENCIES = ./printing/libprinting.a \
-	./frontend/displaywindow/libdisplaywindow.a \
-	./frontend/display/libdisplay.a \
-	./frontend/keychooser/libkeychooser.a \
-	./frontend/mainindex/libmainindex.a \
-	./frontend/searchdialog/libsearchdialog.a \
-	./frontend/libfrontend.a ./backend/libbackend.a \
-	./util/libutil.a
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bibletime.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bibletime_init.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bibletime_slots.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bibletimeapp.Po ./$(DEPDIR)/main.Po
-#>+ 8
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/bibletime.moc.P  $(DEPDIR)/bibletime.all_cpp.P ./$(DEPDIR)/bibletime.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_init.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_slots.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletimeapp.Po ./$(DEPDIR)/main.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/bibletime.moc.P ./$(DEPDIR)/bibletime.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_init.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_slots.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletimeapp.Po ./$(DEPDIR)/main.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(bibletime_SOURCES)
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(bibletime_SOURCES)
-
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-bibletime$(EXEEXT): $(bibletime_OBJECTS) $(bibletime_DEPENDENCIES) 
-	@rm -f bibletime$(EXEEXT)
-	$(CXXLINK) $(bibletime_LDFLAGS) $(bibletime_OBJECTS) $(bibletime_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime_slots.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletimeapp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-data-recursive install-exec \
-	install-exec-am install-exec-recursive install-info \
-	install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
-
-
-# make messages.po. Move this one to ../po/ and "make merge" in po
-# the -x is for skipping messages already translated in kdelibs
-#messages:
-#	$(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
-
-rpm: dist
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-bibletime.moc.cpp: $(srcdir)/bibletime.h
-	$(MOC) $(srcdir)/bibletime.h -o bibletime.moc.cpp
-
-#>+ 2
-mocs: bibletime.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  bibletime.moc.cpp
-
-#>+ 2
-KDE_DIST=dirlist bibletimeapp.h bibletime.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-bibletime.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bibletime_init.cpp $(srcdir)/bibletime_slots.cpp $(srcdir)/bibletime.cpp $(srcdir)/bibletimeapp.cpp $(srcdir)/main.cpp bibletime.moc.cpp 
-	@echo 'creating bibletime.all_cpp.cpp ...'; \
-	rm -f bibletime.all_cpp.files bibletime.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> bibletime.all_cpp.final; \
-	for file in bibletime_init.cpp bibletime_slots.cpp bibletime.cpp bibletimeapp.cpp main.cpp bibletime.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> bibletime.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> bibletime.all_cpp.final; \
-	done; \
-	cat bibletime.all_cpp.final bibletime.all_cpp.files > bibletime.all_cpp.cpp; \
-	rm -f bibletime.all_cpp.final bibletime.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f bibletime.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/backend/Makefile.am b/bibletime/backend/Makefile.am
deleted file mode 100644
index cc89edb..0000000
--- a/bibletime/backend/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-libbackend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libbackend.a
-
-INCLUDES = $(all_includes)
-
-libbackend_a_SOURCES = cswordmodulesearch.cpp cswordbackend.cpp cswordkey.cpp cswordldkey.cpp cswordversekey.cpp cswordmoduleinfo.cpp cswordlexiconmoduleinfo.cpp cswordcommentarymoduleinfo.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp cswordtreekey.cpp creferencemanager.cpp bt_thmlhtml.cpp bt_osishtml.cpp bt_gbfhtml.cpp centrydisplay.cpp clanguagemgr.cpp cfiltertool.cpp
-
-all_headers = cswordbiblemoduleinfo.h \
-cswordcommentarymoduleinfo.h \
-cswordlexiconmoduleinfo.h \
-cswordkey.h \
-cswordversekey.h \
-cswordldkey.h \
-cswordbackend.h \
-cswordmoduleinfo.h \
-cswordmodulesearch.h \
-creferencemanager.h \
-cswordbookmoduleinfo.h \
-cswordtreekey.h \
-bt_thmlhtml.h \
-bt_osishtml.h \
-bt_gbfhtml.h \
-centrydisplay.h \
-clanguagemgr.h \
-cfiltertool.h
-
-EXTRA_DIST = $(libbackend_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/backend/Makefile.in b/bibletime/backend/Makefile.in
deleted file mode 100644
index c73ac39..0000000
--- a/bibletime/backend/Makefile.in
+++ /dev/null
@@ -1,765 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-#>- libbackend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libbackend.a
-
-INCLUDES = $(all_includes)
-
-libbackend_a_SOURCES = cswordmodulesearch.cpp cswordbackend.cpp cswordkey.cpp cswordldkey.cpp cswordversekey.cpp cswordmoduleinfo.cpp cswordlexiconmoduleinfo.cpp cswordcommentarymoduleinfo.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp cswordtreekey.cpp creferencemanager.cpp bt_thmlhtml.cpp bt_osishtml.cpp bt_gbfhtml.cpp centrydisplay.cpp clanguagemgr.cpp cfiltertool.cpp
-
-all_headers = cswordbiblemoduleinfo.h \
-cswordcommentarymoduleinfo.h \
-cswordlexiconmoduleinfo.h \
-cswordkey.h \
-cswordversekey.h \
-cswordldkey.h \
-cswordbackend.h \
-cswordmoduleinfo.h \
-cswordmodulesearch.h \
-creferencemanager.h \
-cswordbookmoduleinfo.h \
-cswordtreekey.h \
-bt_thmlhtml.h \
-bt_osishtml.h \
-bt_gbfhtml.h \
-centrydisplay.h \
-clanguagemgr.h \
-cfiltertool.h
-
-
-EXTRA_DIST = $(libbackend_a_SOURCES) $(all_headers)
-subdir = bibletime/backend
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libbackend_a_AR = $(AR) cru
-libbackend_a_LIBADD =
-am_libbackend_a_OBJECTS = cswordmodulesearch.$(OBJEXT) \
-	cswordbackend.$(OBJEXT) cswordkey.$(OBJEXT) \
-	cswordldkey.$(OBJEXT) cswordversekey.$(OBJEXT) \
-	cswordmoduleinfo.$(OBJEXT) cswordlexiconmoduleinfo.$(OBJEXT) \
-	cswordcommentarymoduleinfo.$(OBJEXT) \
-	cswordbiblemoduleinfo.$(OBJEXT) cswordbookmoduleinfo.$(OBJEXT) \
-	cswordtreekey.$(OBJEXT) creferencemanager.$(OBJEXT) \
-	bt_thmlhtml.$(OBJEXT) bt_osishtml.$(OBJEXT) \
-	bt_gbfhtml.$(OBJEXT) centrydisplay.$(OBJEXT) \
-	clanguagemgr.$(OBJEXT) cfiltertool.$(OBJEXT)
-#>- libbackend_a_OBJECTS = $(am_libbackend_a_OBJECTS)
-#>+ 13
-libbackend_a_final_OBJECTS = libbackend_a.all_cpp.o 
-libbackend_a_nofinal_OBJECTS = cswordmodulesearch.$(OBJEXT) \
-	cswordbackend.$(OBJEXT) cswordkey.$(OBJEXT) \
-	cswordldkey.$(OBJEXT) cswordversekey.$(OBJEXT) \
-	cswordmoduleinfo.$(OBJEXT) cswordlexiconmoduleinfo.$(OBJEXT) \
-	cswordcommentarymoduleinfo.$(OBJEXT) \
-	cswordbiblemoduleinfo.$(OBJEXT) cswordbookmoduleinfo.$(OBJEXT) \
-	cswordtreekey.$(OBJEXT) creferencemanager.$(OBJEXT) \
-	bt_thmlhtml.$(OBJEXT) bt_osishtml.$(OBJEXT) \
-	bt_gbfhtml.$(OBJEXT) centrydisplay.$(OBJEXT) \
-	clanguagemgr.$(OBJEXT) cfiltertool.$(OBJEXT)
-@KDE_USE_FINAL_FALSE@libbackend_a_OBJECTS = $(libbackend_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libbackend_a_OBJECTS = $(libbackend_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bt_gbfhtml.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bt_osishtml.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bt_thmlhtml.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/centrydisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cfiltertool.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/clanguagemgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/creferencemanager.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordbackend.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordbiblemoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordbookmoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordcommentarymoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordkey.Po ./$(DEPDIR)/cswordldkey.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordlexiconmoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordmoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordmodulesearch.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordtreekey.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordversekey.Po
-#>+ 34
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libbackend_a.all_cpp.P ./$(DEPDIR)/bt_gbfhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_osishtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_thmlhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/centrydisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cfiltertool.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/clanguagemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/creferencemanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbackend.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbiblemoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbookmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordcommentarymoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordkey.Po ./$(DEPDIR)/cswordldkey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordlexiconmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmodulesearch.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordtreekey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordversekey.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  ./$(DEPDIR)/bt_gbfhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_osishtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_thmlhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/centrydisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cfiltertool.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/clanguagemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/creferencemanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbackend.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbiblemoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbookmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordcommentarymoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordkey.Po ./$(DEPDIR)/cswordldkey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordlexiconmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmodulesearch.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordtreekey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordversekey.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libbackend_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libbackend_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/backend/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/backend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/backend/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libbackend.a: $(libbackend_a_OBJECTS) $(libbackend_a_DEPENDENCIES) 
-	-rm -f libbackend.a
-	$(libbackend_a_AR) libbackend.a $(libbackend_a_OBJECTS) $(libbackend_a_LIBADD)
-	$(RANLIB) libbackend.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_gbfhtml.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_osishtml.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_thmlhtml.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/centrydisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfiltertool.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clanguagemgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creferencemanager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbackend.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbiblemoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbookmoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordcommentarymoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordkey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordldkey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordlexiconmoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordmoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordmodulesearch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordtreekey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordversekey.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-KDE_DIST=cswordmodulesearch.h clanguagemgr.h bt_osishtml.h bt_gbfhtml.h cswordtreekey.h cswordmoduleinfo.h cswordbookmoduleinfo.h cswordldkey.h creferencemanager.h cswordcommentarymoduleinfo.h cswordversekey.h cswordbackend.h cswordkey.h cswordlexiconmoduleinfo.h cswordbiblemoduleinfo.h cfiltertool.h bt_thmlhtml.h centrydisplay.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/backend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/backend/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libbackend_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cswordmodulesearch.cpp $(srcdir)/cswordbackend.cpp $(srcdir)/cswordkey.cpp $(srcdir)/cswordldkey.cpp $(srcdir)/cswordversekey.cpp $(srcdir)/cswordmoduleinfo.cpp $(srcdir)/cswordlexiconmoduleinfo.cpp $(srcdir)/cswordcommentarymoduleinfo.cpp $(srcdir)/cswordbiblemoduleinfo.cpp $(srcdir)/cswordbookmoduleinfo.cpp $(srcdir)/cswordtreekey.cpp $(srcdir)/creferencemanager.cpp $(srcdir)/bt_thmlhtml.cpp $(srcdir)/bt_osishtml.cpp $(srcdir)/bt_gbfhtml.cpp $(srcdir)/centrydisplay.cpp $(srcdir)/clanguagemgr.cpp $(srcdir)/cfiltertool.cpp 
-	@echo 'creating libbackend_a.all_cpp.cpp ...'; \
-	rm -f libbackend_a.all_cpp.files libbackend_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libbackend_a.all_cpp.final; \
-	for file in cswordmodulesearch.cpp cswordbackend.cpp cswordkey.cpp cswordldkey.cpp cswordversekey.cpp cswordmoduleinfo.cpp cswordlexiconmoduleinfo.cpp cswordcommentarymoduleinfo.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp cswordtreekey.cpp creferencemanager.cpp bt_thmlhtml.cpp bt_osishtml.cpp bt_gbfhtml.cpp centrydisplay.cpp clanguagemgr.cpp cfiltertool.cpp ; do \
-	  echo "#include \"$$file\"" >> libbackend_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libbackend_a.all_cpp.final; \
-	done; \
-	cat libbackend_a.all_cpp.final libbackend_a.all_cpp.files > libbackend_a.all_cpp.cpp; \
-	rm -f libbackend_a.all_cpp.final libbackend_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libbackend_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/backend/bt_gbfhtml.cpp b/bibletime/backend/bt_gbfhtml.cpp
deleted file mode 100644
index 092bf5a..0000000
--- a/bibletime/backend/bt_gbfhtml.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/***************************************************************************
-                          gbfhtml.cpp  -  description
-                             -------------------
-    begin                : Thu Jun 24 1999
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordmoduleinfo.h"
-#include "cswordbackend.h"
-#include "util/cpointers.h"
-
-#include "bt_gbfhtml.h"
-
-//sytsme includes
-#include <stdlib.h>
-#include <stdio.h>
-
-//Sword includes
-#include <utilxml.h>
-
-//Qt includes
-#include <qregexp.h>
-#include <qstring.h>
-
-
-BT_GBFHTML::BT_GBFHTML(){
-  setTokenStart("<");
-	setTokenEnd(">");
-	
-	setTokenCaseSensitive(true);
-
-	replaceTokenSubstitute("Rf", ")</span>");// end of footnote
-
-	replaceTokenSubstitute("FI", "<i>"); // italics begin
-	replaceTokenSubstitute("Fi", "</i>");
-
-	replaceTokenSubstitute("FB", "<b>"); // bold begin
-	replaceTokenSubstitute("Fb", "</b>");
-
-	replaceTokenSubstitute("FR", "<span class=\"jesuswords\">");
-	replaceTokenSubstitute("Fr", "</span>");
-
-	replaceTokenSubstitute("FU", "<u>"); // underline begin
-	replaceTokenSubstitute("Fu", "</u>");
-
-//	replaceTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
-//	replaceTokenSubstitute("Fo", "</cite>");
-	replaceTokenSubstitute("FO", "<span class=\"quotation\">"); //  Old Testament quote begin
-	replaceTokenSubstitute("Fo", "</span>");
-
-
-  replaceTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
-	replaceTokenSubstitute("Fs", "</sup>");
-
-  replaceTokenSubstitute("FV", "<sub>"); // Subscript begin
-	replaceTokenSubstitute("Fv", "</sub>");
-
-//	replaceTokenSubstitute("TT", QString::fromLatin1(" <h1><font color=\"%1\">").arg(text_color).local8Bit());
-//	replaceTokenSubstitute("Tt", "</font></h1>");
-	replaceTokenSubstitute("TT", "<div class=\"booktitle\">");
-	replaceTokenSubstitute("Tt", "</div>");
-
-	replaceTokenSubstitute("TS", "<div class=\"sectiontitle\">");
-	replaceTokenSubstitute("Ts", "</div>");
-
-	replaceTokenSubstitute("PP", "<span class=\"poetry\">"); //  poetry  begin
-	replaceTokenSubstitute("Pp", "</span>");
-
-	replaceTokenSubstitute("Fn", "</font>"); //  font  end
-	replaceTokenSubstitute("CL", "<br>"); //  new line
-	replaceTokenSubstitute("CM", "<!p><br>"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
-
-  replaceTokenSubstitute("CG", "&gt;"); // literal greater-than sign
-	replaceTokenSubstitute("CT", "&lt;"); // literal less-than sign
-
-  replaceTokenSubstitute("JR", "<span align=\"right\">"); // right align begin
-	replaceTokenSubstitute("JC", "<span align=\"center\">"); // center align begin
-	replaceTokenSubstitute("JL", "</span>"); // align end
-}
-
-/** No descriptions */
-char BT_GBFHTML::processText(sword::SWBuf& buf, const sword::SWKey * key, const sword::SWModule * module){
-	GBFHTML::processText(buf, key, module);
-
-  CSwordModuleInfo* const mod = CPointers::backend()->findSwordModuleByPointer(module);
-  if (!mod || (mod && (mod->type() != CSwordModuleInfo::Bible) && (mod->type() != CSwordModuleInfo::GenericBook))) {
-    ProcessRWPRefs(buf, mod ? mod->module() : 0);
-  }
-
-  return 1;
-}
-
-bool BT_GBFHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {
-	if (!substituteToken(buf, token)) {  //more than a simple replace
-  	const unsigned int tokenLength = strlen(token);
-		unsigned long i;
-    sword::SWBuf value;
-    BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData);
-
-    if (!strncmp(token, "WG", 2)){ // strong's numbers greek
-			for (i = 2; i < tokenLength; i++) {
-					value += token[i];
-      }
-      
-			buf.appendFormatted(" <a href=\"strongs://Greek/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ",
-				value.c_str(),
-        value.c_str()
-      );
-		}
-		else if (!strncmp(token, "WH", 2)){ // strong's numbers hebrew
-			for (i = 2; i < tokenLength; i++) {
-					value += token[i];
-      }
-      
-			buf.appendFormatted(" <a href=\"strongs://Hebrew/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span> </a>",
-				value.c_str(),
-        value.c_str()
-      );
-		}
-		else if (!strncmp(token, "WTG", 3)) { // strong's numbers tense greek
-			for (i = 3; i < tokenLength; i++) {
-					value += token[i];
-      }
-
-			buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ",
-				value.c_str(),
-				value.c_str()
-      );
-		}
-
-		else if (!strncmp(token, "WTH", 3)) { // strong's numbers tense hebrew
-			for (i = 3; i < tokenLength; i++) {
-					value += token[i];
-      }
-
-			buf.appendFormatted(" <a href=\"morph://Hebrew/%s\"><span class=\"morphcode\">(%s)</span></a> ",
-				value.c_str(),
-				value.c_str()
-      );
-		}
-
-		else if (!strncmp(token, "RB", 2)) {
-			buf += "<span class=\"footnotepre\">";
-			myUserData->hasFootnotePreTag = true;
-		}
-
-		else if (!strncmp(token, "RF", 2)) {
-			if (myUserData->hasFootnotePreTag) {
-				myUserData->hasFootnotePreTag = false;
-				buf += "</span> ";
-			}
-			buf += "<span class=\"footnote\"> (";
-		}
-
-		else if (!strncmp(token, "FN", 2)) {
-			buf += "<font face=\"";
-			for (i = 2; i < tokenLength; i++) {
-				if(token[i] != '\"') {
-					buf += token[i];
-        }
-      }
-			buf += "\">";
-		}
-		else if (!strncmp(token, "CA", 2)) {	// ASCII value
-			buf += (char)atoi(&token[2]);
-		}		
-		else {
-			return GBFHTML::handleToken(buf, token, userData);
-		}
-	}
-	return true;
-}
-
diff --git a/bibletime/backend/bt_gbfhtml.h b/bibletime/backend/bt_gbfhtml.h
deleted file mode 100644
index 97f227d..0000000
--- a/bibletime/backend/bt_gbfhtml.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-                          gbfhtml.h  -  description
-                             -------------------
-    begin                : Tue Jun 15 15:34:26 CEST 1999
-
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/* $Header: /cvsroot/bibletime/bibletime/bibletime/backend/bt_gbfhtml.h,v 1.14 2003/08/12 19:37:15 joachim Exp $ */
-/* $Revision: 1.14 $ */
-
-#ifndef BT_GBFHTML_H
-#define BT_GBFHTML_H
-
-#include "cfiltertool.h"
-
-#include <swkey.h>
-#include <swmodule.h>
-#include <swbasicfilter.h>
-#include <gbfhtml.h>
-
-/**
-* This filter converts GBF Text into HTML
-*/
-class BT_GBFHTML : public sword::GBFHTML, protected CFilterTool {
-protected:
-  class BT_UserData : public sword::GBFHTML::MyUserData {
-  public:
-    BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::GBFHTML::MyUserData(module, key) {}
-    bool hasFootnotePreTag;
-  };
-  virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) {
-    return new BT_UserData(module, key);
-  }
-
-public:
-  BT_GBFHTML ();
-  virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData);
-  virtual char processText(sword::SWBuf& buf, const sword::SWKey*, const sword::SWModule * = 0);
-};
-
-#endif
diff --git a/bibletime/backend/bt_osishtml.cpp b/bibletime/backend/bt_osishtml.cpp
deleted file mode 100644
index c3b1d7b..0000000
--- a/bibletime/backend/bt_osishtml.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/***************************************************************************
-                     thmlhtml.cpp  -  ThML to HTML filter
-                             -------------------
-    begin                : 1999-10-27
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include <stdlib.h>
-#include "bt_osishtml.h"
-#include "versekey.h"
-
-#include "clanguagemgr.h"
-#include "creferencemanager.h"
-#include "cswordmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-#include "util/cpointers.h"
-
-#include <iostream>
-
-//Sword includes
-#include <swmodule.h>
-#include <swbuf.h>
-#include <utilxml.h>
-
-//Qt includes
-#include <qstring.h>
-
-using sword::SWBuf;
-using sword::XMLTag;
-
-BT_OSISHTML::BT_OSISHTML() {
-	setTokenStart("<");
-	setTokenEnd(">");
-
-	setEscapeStart("&");
-	setEscapeEnd(";");
-
-	setEscapeStringCaseSensitive(true);
-	setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes
-
-	setTokenCaseSensitive(true);
-}
-
-bool BT_OSISHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {
-  // manually process if it wasn't a simple substitution
-	if (!substituteToken(buf, token)) {
-    BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData);
-
-    XMLTag tag(token);
-  	const	bool osisQToTick = ((!userData->module->getConfigEntry("OSISqToTick")) || (strcmp(userData->module->getConfigEntry("OSISqToTick"), "false")));
-
-    if (!tag.getName()) {
-      return false;
-    }
-
-		// <w> tag
-		if (!strcmp(tag.getName(), "w")) {
-
-			// start <w> tag
-			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
-				myUserData->w = token;
-			}
-			// end or empty <w> tag
-			else {
-				bool endTag = tag.isEndTag();
-				SWBuf lastText;
-				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
-
-				if (endTag) {
-					tag = myUserData->w.c_str();
-					lastText = myUserData->lastTextNode.c_str();
-				}
-				else lastText = "stuff";
-
-				const char *attrib;
-				const char *val;
-				if ((attrib = tag.getAttribute("xlit"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if ((attrib = tag.getAttribute("gloss"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if ((attrib = tag.getAttribute("lemma"))) {
-					const int count = tag.getAttributePartCount("lemma");
-					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-					do {
-						attrib = tag.getAttribute("lemma", i);
-						if (i < 0) // to handle our -1 condition
-              i = 0;
-						val = strchr(attrib, ':');
-						val = (val) ? (val + 1) : attrib;
-
-            if ((!strcmp(val+2, "3588")) && (lastText.length() < 1)) {
-							show = false;
-            }
-						else if (*val == 'H') {
-              buf.appendFormatted(" <a href=\"strongs://Hebrew/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ", val+1, val+1);
-            }
-						else if (*val == 'G') {
-              buf.appendFormatted(" <a href=\"strongs://Greek/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ", val+1, val+1);
-            }
-					} while (++i < count);
-				}
-				if ((attrib = tag.getAttribute("morph")) && (show)) {
-					const int count = tag.getAttributePartCount("morph");
-					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-					do {
-						attrib = tag.getAttribute("morph", i);
-						if (i < 0)
-              i = 0;	// to handle our -1 condition
-						val = strchr(attrib, ':');
-						val = (val) ? (val + 1) : attrib;
- 						if ((*val == 'T') && (val[1] == 'H')) {
-              buf.appendFormatted(" <a href=\"morph://Hebrew/%s\"><span class=\"morphcode\">(%s)</span></a> ", val+2, val+2);
-            }
-						else if ((*val == 'T') && (val[1] == 'G')) {
-              buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ", val+2, val+2);
-            }
-            else if ((*val == 'T')) {
-              buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ", val+2, val+2);
-            }
-					} while (++i < count);
-				}
-				if ((attrib = tag.getAttribute("POS"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-			}
-		}
-		// <note> tag
-		else if (!strcmp(tag.getName(), "note")) {
-			if (!tag.isEndTag()) {
-				const SWBuf type = tag.getAttribute("type");
-
-				if (type == "crossReference") { //note containing cross references
-          buf += " <span class=\"footnote\">[";
-          myUserData->noteType = BT_UserData::CrossReference;
-        }
-        else if (type == "strongsMarkup") {
-  				myUserData->suspendTextPassThru = true;
-          myUserData->noteType = BT_UserData::StrongsMarkup;
-        }
-        else {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
-          buf += " <span class=\"footnote\">(";
-          myUserData->noteType = BT_UserData::Footnote;
-				}
-			}
-			if (tag.isEndTag()) {
-        if (myUserData->noteType == BT_UserData::CrossReference) {
-          buf += "]</span> ";
-        }
-        else if (myUserData->noteType == BT_UserData::Footnote) {
-          buf += ")</span> ";
-        }
-
-        myUserData->noteType = BT_UserData::Unknown;
-				myUserData->suspendTextPassThru = false;
-			}
-		}
-		// <p> paragraph tag is handled by OSISHTMLHref
-		// <reference> tag
-		else if (!strcmp(tag.getName(), "reference")) {
-			if (!tag.isEndTag() && !tag.isEmpty() && tag.getAttribute("osisRef")) {
-        const char* ref = tag.getAttribute("osisRef");
-
-        SWBuf typeName = "Bible";
-        CSwordModuleInfo::ModuleType type = CSwordModuleInfo::Bible;
-        if (!strncmp(ref, "Bible:", 6)) {
-          type = CSwordModuleInfo::Bible;
-          typeName = "Bible";
-          ref += 6;
-        }
-        else if (!strncmp(ref, "Commentary:", 11)) { //need to check with OSIS tags
-          type = CSwordModuleInfo::Commentary;
-          typeName = "Commentary";
-          ref += 11;
-        }
-
-				buf.appendFormatted("<a class=\"reference\" href=\"sword://%s/%s/%s\">",
-          typeName.c_str(),
-          CReferenceManager::preferredModule( CReferenceManager::typeFromModule(type) ).latin1(),
-          ref
-        );
-			}
-			else if (tag.isEndTag()) {
-				buf += "</a>";
-			}
-			else {	// empty reference marker
-				// -- what should we do?  nothing for now.
-			}
-		}
-    // <l> is handled by OSISHTMLHref
-		// <title>
-		else if (!strcmp(tag.getName(), "title")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-  			buf += "<div class=\"sectiontitle\">";
-			}
-			else if (tag.isEndTag()) {
-  			buf += "</div>";
-			}
-			else {	// empty title marker
-				// what to do?  is this even valid?
-				buf += "<br />";
-			}
-		}
-		// <hi> is handled by OSISHTMLHRef
-		// <q> quote
-		else if (!strcmp(tag.getName(), "q")) {
-			SWBuf type = tag.getAttribute("type");
-			SWBuf who = tag.getAttribute("who");
-			const char *lev = tag.getAttribute("level");
-			int level = (lev) ? atoi(lev) : 1;
-
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				/*buf += "{";*/
-
-				myUserData->quote.who = who;
-				//alternate " and '
-				if(osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-
-				if (who == "Jesus") {
-					buf += "<span class=\"jesuswords\">";
-				}
-			}
-			else if (tag.isEndTag()) {
-        if (myUserData->quote.who == "Jesus")
-          buf += "</span>";
-        else if (osisQToTick) //alternate " and '
-					buf += (level % 2) ? '\"' : '\'';
-			}
-			else {	// empty quote marker
-				//alternate " and '
-				if(osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-			}
-		}
-		// <transChange> is handled by OSISHTMLHref
-    else { //all tokens handled by OSISHTMLHref will run through the filter now
-      return sword::OSISHTMLHREF::handleToken(buf, token, userData);
-    }
-	}
-  return false;
-}
diff --git a/bibletime/backend/bt_osishtml.h b/bibletime/backend/bt_osishtml.h
deleted file mode 100644
index a42bbda..0000000
--- a/bibletime/backend/bt_osishtml.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
-                          thmlhtml.h  -  description
-                             -------------------
-    begin                : 1999-10-28
-
-    copyright            : 1999 by Chris Little
-    email                : chrislit@chiasma.org
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BT_OSISHTML_H
-#define BT_OSISHTML_H
-
-#include "cfiltertool.h"
-
-//Sword includes
-#include <osishtmlhref.h>
-
-/**
-* This filter converts ThML text to HTML text
-*/
-class BT_OSISHTML : public sword::OSISHTMLHREF, protected CFilterTool {
-protected:
-  class BT_UserData : public sword::OSISHTMLHREF::MyUserData {
-  public:
-    BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::OSISHTMLHREF::MyUserData(module, key) {
-      noteType = Unknown;
-    }
-
-    enum NoteTpe {
-      Unknown,
-      CrossReference,
-      Footnote,
-      StrongsMarkup
-    } noteType;
-
-		struct {
-			sword::SWBuf who;
-		} quote;
-  };
-
-  virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) {
-    return new BT_UserData(module, key);
-  }
-
-public:
-  BT_OSISHTML();
-  virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData);
-};
-
-#endif
diff --git a/bibletime/backend/bt_thmlhtml.cpp b/bibletime/backend/bt_thmlhtml.cpp
deleted file mode 100644
index 7e2e566..0000000
--- a/bibletime/backend/bt_thmlhtml.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/***************************************************************************
-                     thmlhtml.cpp  -  ThML to HTML filter
-                             -------------------
-    begin                : 1999-10-27
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include <stdlib.h>
-#include "bt_thmlhtml.h"
-#include "versekey.h"
-
-#include "clanguagemgr.h"
-#include "frontend/cbtconfig.h"
-#include "util/cpointers.h"
-
-#include <iostream>
-
-//Sword includes
-#include <swmodule.h>
-#include <utilxml.h>
-
-//Qt includes
-#include <qstring.h>
-
-BT_ThMLHTML::BT_ThMLHTML() {
-	setEscapeStringCaseSensitive(true);
-	setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes	
-
-  setTokenStart("<");
-	setTokenEnd(">");
-	setTokenCaseSensitive(true);
-  
-	replaceTokenSubstitute("/foreign", "</span>");
-
-  if (tokenSubMap.find("note") != tokenSubMap.end()) { //remove note tag
-	  tokenSubMap.erase( tokenSubMap.find("note") );
-  }
-	replaceTokenSubstitute("/note", ")</span>");	
-}
-
-bool BT_ThMLHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {  
-	if (!substituteToken(buf, token) && !substituteEscapeString(buf, token)) {
-    sword::XMLTag tag(token);
-    BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData);
-    sword::SWModule* myModule = const_cast<sword::SWModule*>(myUserData->module); //hack to be able to call stuff like Lang()
-
-    if ( tag.getName() && !strcasecmp(tag.getName(), "foreign") ) { // a text part in another language, we have to set the right font
-      if (tag.getAttribute("lang")) {
-        const char* abbrev = tag.getAttribute("lang");
-
-        CLanguageMgr::Language language = CPointers::languageMgr()->languageForAbbrev( QString::fromLatin1(abbrev) );
-
-        if (language.isValid()) {
-          CBTConfig::FontSettingsPair fontSetting = CBTConfig::get(language);
-          if (fontSetting.first) {
-            const QFont f = fontSetting.second;
-            buf.appendFormatted("<span lang=\"%s\" style=\"font-family:%s;font-size:%ipt;\">",
-              abbrev,
-              f.family().latin1(),
-              f.pointSize()
-            );
-          }
-          else { //CBTConfig says: don't set a special font, so we just set the language flag
-            buf.appendFormatted("<span lang=\"%s\">", abbrev);
-          }
-        }
-        else { //invalid language, just set the HTML language attribute
-          buf.appendFormatted("<span lang=\"%s\">", abbrev);
-        }
-      }
-    }
-    else if (tag.getName() && !strcasecmp(tag.getName(), "sync")) { //lemmas, morph codes or strongs
-      if (tag.getAttribute("type") && !strcasecmp(tag.getAttribute("type"), "lemma")) { // Lemma
-        const char* value = tag.getAttribute("value");
-        if ( strlen(value) ) {
-          buf.appendFormatted(" &lt;%s&gt; ",
-            value
-          );
-        };
-      }
-      else if (tag.getAttribute("type") && !strcasecmp(tag.getAttribute("type"), "morph")) { // Morph
-        const char* value = tag.getAttribute("value");
-        if ( value ) {
-          buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ",
-            value,
-            value
-          );
-        };
-  		}
-		  else if (tag.getAttribute("type") && !strcasecmp(tag.getAttribute("type"), "Strongs")) { // Strongs
-        const char* value = tag.getAttribute("value");
-        if ( value && value[0] == 'H' ) { //hewbrew strong number
-          buf.appendFormatted(" <a href=\"strongs://Hebrew/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ",
-     				value+1, //skip the H
-            value+1 //skip the H
-          );
-        }
-        else if ( value && value[0] == 'G' ) { //hewbrew strong number
-          buf.appendFormatted(" <a href=\"strongs://Greek/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ",
-      			value+1, //skip the G
-            value+1 //skip the G
-          );
-        };
-      };
-		}
-		else if (tag.getName() && !strcasecmp(tag.getName(), "note")) { // <note> tag
-			if (!tag.isEndTag() && !tag.isEmpty()) {
-				//SWBuf type = tag.getAttribute("type");
-				//SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-				buf += "<span class=\"footnote\">(";
-			}
-		}
-		else if (tag.getName() && !strcasecmp(tag.getName(), "scripRef")) { // a more complicated scripRef
-      if (tag.isEndTag()) {
-       	if (myUserData->inscriptRef) { // like  "<scripRef passage="John 3:16">See John 3:16</scripRef>"
-  				myUserData->inscriptRef = false;
-  				buf += thmlRefEnd().c_str();
-  			}
-  			else { // like "<scripRef>John 3:16</scripRef>"
-   			  buf += parseSimpleRef( myUserData->lastTextNode, myModule ? myModule->Lang() : "en" ).c_str();
-  				myUserData->suspendTextPassThru = false;
-  			}
-      }		
-      else if (tag.getAttribute("passage") ) { //the passage was given within the scripRef tag
-        myUserData->inscriptRef = true;
-        buf += parseThMLRef(tag.getAttribute("passage"), tag.getAttribute("version")).c_str();
-      }
-      else if ( !tag.getAttribute("passage") ) { // we're starting a scripRef like "<scripRef>John 3:16</scripRef>"
-	  		myUserData->inscriptRef = false;
-  			// let's stop text from going to output
-		  	userData->suspendTextPassThru = true;
-      }
-		}
-		else if (tag.getName() && !strcasecmp(tag.getName(), "div")) {                                      
-      if (tag.isEndTag()) {
-        buf += "</div>";
-      }
-      else if ( tag.getAttribute("class") && !strcasecmp(tag.getAttribute("class"),"sechead") ) {
-  			buf += "<div class=\"sectiontitle\">";
-      }
-  		else if (tag.getAttribute("class") && !strcasecmp(tag.getAttribute("class"), "title")) {
-		  	buf += "<div class=\"booktitle\">";
-      }
-    }
-		else if (tag.getName() && !strcasecmp(tag.getName(), "img") && tag.getAttribute("src")) {
-      const char* value = tag.getAttribute("src");
-      if (value[0] == '/') {
-        value++; //strip the first /
-      }
-      
-      buf.appendFormatted("<img src=\"file:%s/%s\" />",
-        myUserData->module->getConfigEntry("AbsoluteDataPath"),
-        value
-      );
- 		}
-    else { // let unknown token pass thru
-    	return sword::ThMLHTML::handleToken(buf, token, userData);
-    }
-  }
-	return true;
-}
diff --git a/bibletime/backend/bt_thmlhtml.h b/bibletime/backend/bt_thmlhtml.h
deleted file mode 100644
index 6588f85..0000000
--- a/bibletime/backend/bt_thmlhtml.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-                          thmlhtml.h  -  description
-                             -------------------
-    begin                : 1999-10-28
-
-    copyright            : 1999 by Chris Little
-    email                : chrislit@chiasma.org
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BT_THMLHTML_H
-#define BT_THMLHTML_H
-
-#include "cfiltertool.h"
-
-#include <swbuf.h>
-#include <thmlhtml.h>
-
-using sword::SWBuf;
-//using sword::
-
-/**
-* This filter converts ThML text to HTML text
-*/
-class BT_ThMLHTML : public sword::ThMLHTML, protected CFilterTool {
-protected:
-  class BT_UserData : public sword::ThMLHTML::MyUserData {
-  public:
-    BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::ThMLHTML::MyUserData(module, key) {}
-    
-    bool inscriptRef;
-  };
-  
-  virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) {
-    return new BT_UserData(module, key);
-  }
-
-public:
-  BT_ThMLHTML ();
-  virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData);
-//  virtual char ProcessText (char *text, int maxlen = -1);
-};
-
-#endif
diff --git a/bibletime/backend/centrydisplay.cpp b/bibletime/backend/centrydisplay.cpp
deleted file mode 100644
index e70bae0..0000000
--- a/bibletime/backend/centrydisplay.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/***************************************************************************
-                          centrydisplay.cpp  -  description
-                             -------------------
-    begin                : Fre Mai 31 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "centrydisplay.h"
-#include "cswordkey.h"
-#include "cswordversekey.h"
-#include "cswordbookmoduleinfo.h"
-#include "creferencemanager.h"
-
-#include "frontend/cbtconfig.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qapplication.h>
-
-CEntryDisplay::CEntryDisplay(){
-}
-
-CEntryDisplay::~CEntryDisplay(){
-}
-
-/** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */
-const QString CEntryDisplay::text( QPtrList<CSwordModuleInfo> modules, const QString& keyName, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-
-  const QString entry = entryText(modules, keyName);
-  return finishText( entry, modules, keyName );
-}
-
-/** Returns a preview for the given module and key. This is useful for the seatchdialog and perhaps the tooltips. */
-const QString CEntryDisplay::previewText( CSwordModuleInfo*  module, const QString& keyName, const QString& headerText, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions){
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-  key->key(keyName);
-
-  QString css = QString::null;
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) );
-  }
-
-  const QString pageStart = QString::fromLatin1("<html><head><style type=\"text/css\">%1</style></head><body>%2<hr/>")
-    .arg(css)
-    .arg(headerText);
-
-  const QString text = QString::fromLatin1("<div %1>%2</div>")
-    .arg(module->textDirection() == CSwordModuleInfo::RightToLeft ? QString::fromLatin1("dir=\"rtl\"") : QString::null)
-//    .arg(module->isUnicode() ? QString::fromLatin1("class=\"unicodetext\"") : QString::null)
-    .arg(key->renderedText());
-
-  const QString pageEnd = QString::fromLatin1("</body></html>");
-  return pageStart + text + pageEnd;
-}
-
-/** Renders one entry using the given modules and the key. This makes chapter rendering more easy. */
-const QString CEntryDisplay::entryText( QPtrList<CSwordModuleInfo> modules, const QString& keyName){
-//	Q_ASSERT(modules.first());
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(modules.first()) );
-  key->key(keyName);
-  QString renderedText = QString::null;
-
-  QFont moduleFont;
-  QString tdStyle;
-  
-  renderedText = QString::fromLatin1("<tr valign=\"top\">");
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    moduleFont = CBTConfig::get( m->language() ).second;
-    tdStyle = QString::fromLatin1("style=\"%1 %2 font-family:%3; font-size:%4pt;\"")
-      .arg(((modules.at()+1) < (int)modules.count()) ? QString::fromLatin1("padding-right:2mm; border-right:1px solid black;") : QString::null)
-      .arg(((modules.at()>0) && ((modules.at()+1) <= (int)modules.count() )) ? QString::fromLatin1("padding-left:2mm;") : QString::null)
-      .arg(moduleFont.family())
-      .arg(moduleFont.pointSize());
-
-    key->module(m);
-    key->key(keyName);
-
-    renderedText += QString::fromLatin1("<td %1 valign=\"top\">%2</td>")
-                      .arg(tdStyle)
-                      .arg(key->renderedText());
-  }
-  renderedText += QString::fromLatin1("</tr>");
-  return renderedText;
-}
-
-/** Returns the color of the given type. */
-const QColor CEntryDisplay::color( const CEntryDisplay::ColorType type ) {
-  switch (type) {
-    case ReferenceColor:
-      return CBTConfig::get(CBTConfig::swordRefColor);
-    case TextColor:
-      return CBTConfig::get(CBTConfig::textColor);
-    case HighlightedTextColor:
-      return CBTConfig::get(CBTConfig::highlightedVerseColor);
-    case BackgroundColor:
-      return CBTConfig::get(CBTConfig::backgroundColor);
-    case FootnoteColor:
-      return CBTConfig::get(CBTConfig::footnotesColor);
-    case StrongsNumberColor:
-      return CBTConfig::get(CBTConfig::strongsColor);
-    case MorphCodeColor:
-      return CBTConfig::get(CBTConfig::morphsColor);
-    case JesusWordColor:
-      return CBTConfig::get(CBTConfig::jesuswordsColor);
-    default:
-      return Qt::white;
-  }
-}
-
-/** Returns the font of the given type. */
-const QFont CEntryDisplay::font( const CLanguageMgr::Language& lang ) {
-  return CBTConfig::get(lang).second;
-}
-
-/** Adds the right headers and footers to the page and returns them together. */
-const QString CEntryDisplay::finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName){
-  CSwordModuleInfo* module = modules.first();
-  Q_ASSERT(module); //shouldn't happen
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(modules.first()) );
-  key->key(keyName);
-
-  QString css = "table.maintable {width:100%;} td.tableheading {border-bottom:1px solid black;}";
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) ) + "\n\n";
-  }
-
-  const int columnWidth = (int)((float)100 / (float)modules.count());
-
-  QString pageStart = QString::fromLatin1("<html><head><style type=\"text/css\">%1</style></head><body><table cellspacing=\"0\" class=\"maintable\"><tr>")
-    .arg(css);
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key->module(m);
-    const QString newKeyName = key->key();
-    pageStart += QString::fromLatin1("<td class=\"tableheading\" width=\"%1%\"><center><b>%2</b> %3</center></td>")
-      .arg(columnWidth)
-      .arg(m->name())
-      .arg(!newKeyName.isEmpty() ? QString::fromLatin1("(%1)").arg(htmlReference(m, newKeyName, newKeyName, newKeyName)) : QString::null);
-  }
-  pageStart += QString::fromLatin1("</tr>");
-
-  const QString pageEnd = QString::fromLatin1("</table></body></html>");
-
-  return pageStart + text + pageEnd;
-}
-
-const QString CEntryDisplay::cssString( const CEntryDisplay::StyleType type ){
-  const QString bgColor = color(BackgroundColor).name();
-
-  const QString textColor = color(TextColor).name();
-  const QString highlightColor = color(HighlightedTextColor).name();
-  const QString swordRefColor = color(ReferenceColor).name();
-  const QString footnotesColor = color(FootnoteColor).name();
-
-  const QString strongsColor = color(StrongsNumberColor).name();
-  const QString morphsColor = color(MorphCodeColor).name();
-//  const QString lemmaColor = color(LemmaColor).name();
-
-  const QString jesusWordsColor = color(JesusWordColor).name();
-
-
-  QString text;
-  switch(type) {
-    case Body:
-//      text =  QString::fromLatin1("body {%1; color: %2; font-size: %3pt; font-family: %4;}")
-//                .arg(QString::fromLatin1("background-color: %1").arg(bgColor))
-//                .arg(textColor)
-//                .arg(font(StandardFont).pointSize())
-//                .arg(font(StandardFont).family());
-      text =  QString::fromLatin1("body {background-color:%1; color:%2;}")
-                .arg(bgColor)
-                .arg(textColor);
-      break;
-    case Link:
-      text = QString::fromLatin1("a:link {text-decoration:none;}");
-//              .arg(swordRefColor);
-      break;
-    case LinkHover:
-      text = QString::fromLatin1("a:hover {text-decoration:none;}");
-      break;
-    case Background:
-      text = QString::fromLatin1(".background1 {background-color:%1;}")
-              .arg(bgColor);
-      break;
-//    case Background2:
-//      text = QString::fromLatin1(".background2 {background-color:%1;}")
-//              .arg(bgColor2);
-//      break;
-    case HighlightedText:
-      text = QString::fromLatin1(".highlighted {color: %1;}")
-              .arg(highlightColor);
-      break;
-    case UnicodeText:
-//      text = QString::fromLatin1(".unicodetext { font-family: %1; font-size:%2pt; }")
-//                .arg(font(UnicodeFont).family())
-//                .arg(font(UnicodeFont).pointSize());
-      break;
-    case Reference:
-      text = QString::fromLatin1(".reference {color:%1; font-weight:light; font-size:small;}")
-              .arg(swordRefColor);
-      break;
-    case MorphCode:
-      text = QString::fromLatin1(".morphcode {font-size: smaller; color: %1; font-decoration:none;}")
-              .arg(morphsColor);
-      break;
-    case StrongNumber:
-      text = QString::fromLatin1(".strongnumber {font-size: smaller; color: %1; font-decoration:none;}")
-              .arg(strongsColor);
-      break;
-    case Lemma:
-//      text = QString::fromLatin1(".lemma {font-size: smaller; color: %1; font-decoration:none;}")
-//              .arg(lemmaColor);
-      break;
-    case Footnote:
-      text = QString::fromLatin1(".footnote  {font-size:smaller; color:%1; font-style:italic;}")
-              .arg(footnotesColor);
-      break;
-    case FootnotePre:
-      text = QString::fromLatin1(".footnotepre {font-size:smaller; color:%1; font-weight:bolder;}")
-              .arg(footnotesColor);
-      break;
-    case Poetry:
-      text = QString::fromLatin1(".poetry {font-weight:lighter; alignment:justify;}");
-      break;
-    case Quotation:
-      text = QString::fromLatin1(".quotation {font-style:italic;}");
-      break;
-    case JesusWords:
-      text = QString::fromLatin1(".jesuswords {font-style:italic; color:%1;}")
-              .arg(jesusWordsColor);
-      break;
-    case BookTitle:
-      text = QString::fromLatin1(".booktitle {font-weight:x-bold; font-size:x-large; color:%1; margin-top:1mm; margin-bottom:1mm;}")
-              .arg(textColor);
-      break;
-    case SectionTitle:
-      text = QString::fromLatin1(".sectiontitle {font-size:larger; font-weight:bold; color:%1;}")
-              .arg(textColor);
-      break;
-    default:      
-      break;
-  };
-  return QString::fromLatin1("%1\n").arg(text);
-}
-
-void CEntryDisplay::setDisplayOptions(const CSwordBackend::DisplayOptions options) {
-  m_displayOptions = options;
-}
-
-/** Returns the right reference text which can be incluced in the HTML */
-const QString CEntryDisplay::htmlReference( CSwordModuleInfo* module, const QString& keyName, const QString linkText, const QString& anchorText ) {
-  if (linkText.isEmpty()) {
-    return QString::fromLatin1("<a name=\"%1\"></a>").arg(anchorText);
-  }
-  else {
-    return QString::fromLatin1("<a name=\"%1\" href=\"%2\">%3</a>")
-      .arg(anchorText)
-      .arg(CReferenceManager::encodeHyperlink(module->name(), keyName, CReferenceManager::typeFromModule(module->type()) ))
-      .arg(linkText);
-  }
-}
-
-/* ----------------------- new class: CChapterDisplay ------------------- */
-
-/** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */
-const QString CChapterDisplay::text( QPtrList <CSwordModuleInfo> modules, const QString& keyName, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-  QString text = QString::null;
-
-  CSwordVerseKey key(0);
-  key = keyName;
-
-  const int currentTestament = key.Testament();	
-	const int currentBook = key.Book();
-	const int currentChapter = key.Chapter();
-	
-  CSwordModuleInfo* module = modules.first();
-  bool ok = true;
-  
-	for (key.Verse(1); key.Testament() == currentTestament && key.Book() == currentBook && key.Chapter() == currentChapter && ok && !module->module()->Error(); ok = key.next(CSwordVerseKey::UseVerse) && !key.Error() ) {
-    text += entryText(modules, key.key(), keyName);
-	}
-
-//  qWarning(finishText(text, modules, QString::null).latin1());
-  return finishText(text, modules, QString::null);
-}
-
-/** Renders one entry using the given modules and the key. This makes chapter rendering more easy. */
-const QString CChapterDisplay::entryText( QPtrList<CSwordModuleInfo> modules, const QString& keyName, const QString& chosenKey ) {
-
-  CSwordVerseKey key(modules.first());
-  QString renderedText = (modules.count() > 1) ? QString::fromLatin1("<tr valign=\"top\">") : QString::null;
-
-	// Only insert the table stuff if we are displaying parallel.
-  // Otherwise, strip out he table stuff -> the whole chapter will be rendered in one cell!
-
-
-  //declarations out of the loop for optimization
-  const QString colStyle = QString::fromLatin1("style=\"border-bottom:1px solid black; padding-bottom:2px; padding-top:2px;");
-  QString tdStyle;
-  QString entry;
-  QString keyText;
-
-  QFont font;
-  bool isRTL;
-
-  const QString lineBreakString = ((modules.count() == 1) && m_displayOptions.lineBreaks) ? QString::fromLatin1("<br/>") : QString::fromLatin1(" ");
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key.module(m);
-    key.key(keyName);
-    keyText = key.key();
-    isRTL = (m->textDirection() == CSwordModuleInfo::RightToLeft);
-
-    tdStyle = colStyle + QString::fromLatin1("%1 %2\"")
-      .arg((modules.at()+1 < (int)modules.count()) ? QString::fromLatin1("padding-right: 2mm; border-right: 1px solid black;") : QString::null)
-      .arg((modules.at()>0 && modules.at()+1 <= modules.count()) ? QString::fromLatin1("padding-left:2mm;") : QString::null);
-
-    font = CBTConfig::get(m->language()).second;
-
-		entry = QString::null;
-
-	//	m->module()->RenderText(); //force rendering of entry attributes
-		key.renderedText();
-		int pvHeading = 0;
-		do { //add sectiontitle before we add the versenumber
-			QString preverseHeading = QString::fromUtf8(
-m->module()->getEntryAttributes()["Heading"]["Preverse"][QString::number(pvHeading++).latin1()].c_str());
-			if (!preverseHeading.isEmpty()) {
-				entry += QString::fromLatin1("<br/><div class=\"sectiontitle\">%1</div>")
-					.arg(preverseHeading);
-			}
-			else {
-				break;
-			}
-		} while (true);
-
-    entry +=
-      QString::fromLatin1("<span %1 style=\"font-family:%2;font-size:%3pt;\" dir=\"%4\">%5%6</span>")
-        .arg((keyText == chosenKey) ? QString::fromLatin1("class=\"highlighted\"") : QString::null)
-        .arg(font.family())
-        .arg(font.pointSize())
-        .arg(isRTL ? QString::fromLatin1("rtl") : QString::fromLatin1("ltr"))
-        .arg(m_displayOptions.verseNumbers //if we shuld show the verse numbers
-            ? QString::fromLatin1("<span style=\"vertical-align:text-top; font-size:%1pt;\">%2</span> ")
-                .arg(int(float(font.pointSize()) / 1.5))
-                .arg(htmlReference(m, keyText, QString::number(key.Verse()), keyText))
-            : htmlReference(m, QString::null, QString::null, keyText) )
-        .arg(key.renderedText() + lineBreakString);
-
-  	if (modules.count() == 1) {
-			renderedText += entry;
-		}
-  	else {
-	    renderedText += QString::fromLatin1("<td class=\"background1\" %1 dir=\"%2\" valign=\"top\">%3</td>")
-                        .arg(tdStyle)
-                        .arg(isRTL ? QString::fromLatin1("rtl") : QString::fromLatin1("ltr"))
-											  .arg(entry);
-		}
-  }
-
-  if (modules.count() > 1){
-		renderedText += QString::fromLatin1("</tr>");
-	}
-
-  return renderedText;
-}
-
-const QString CChapterDisplay::finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName) {
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(modules.first()) );
-  key->key(keyName);
-
-  QString css = "table.maintable {width:100%;} td.tableheading {border-bottom:1px solid black;}";
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) );
-  }
-
-  const int columnWidth = (int)((float)100 / (float)modules.count());
-
-  QString pageStart = QString::fromLatin1("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html><head><style type=\"text/css\">%1</style></head><body><table cellspacing=\"0\" class=\"maintable\" %2><tr>")
-    .arg(css)
-    .arg(((modules.count() == 1) && (modules.first()->textDirection() == CSwordModuleInfo::RightToLeft)) ? "dir=\"rtl\"" : "");
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key->module(m);
-    const QString newKeyName = key->key();
-
-    pageStart += QString::fromLatin1("<td class=\"tableheading\" width=\"%1%\"><center><b>%2</b> %3</center></td>")
-      .arg(columnWidth)
-      .arg(m->name())
-      .arg(!keyName.isEmpty() ? htmlReference(m, newKeyName, newKeyName, newKeyName) : QString::null);
-  }
-  pageStart += QString::fromLatin1("</tr>");
-
-  QString pageEnd = QString::fromLatin1("</table></body></html>");
-
-	if (modules.count() == 1) // render everything into one cell. entryText leaves out the table tags.
-		return pageStart  + QString::fromLatin1("<tr><td>%1</td></tr>%2").arg(text).arg(pageEnd);
-  else  // use many cells. entryText inserts the necessary table tags.
-	 	return pageStart + text + pageEnd;
-}
-
-/* ----------------------- new class: CBookDisplay ------------------- */
-
-/** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */
-const QString CBookDisplay::text( QPtrList <CSwordModuleInfo> modules, const QString& keyName, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-
-	CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.first());
-
-  // the number of levels which should be display together, 1 means display no entries together
-  int displayLevel = book->config( CSwordModuleInfo::DisplayLevel ).toInt();
-
-  util::scoped_ptr<CSwordTreeKey> key(
-		dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(book) )
-	);
-  key->key(keyName); //set the key to position we'd like to get
-
-  // standard of DisplayLevel, display nothing together
-  // if the current key is the root entry don't display anything together!
-  if ((displayLevel <= 1) || (key->key().isEmpty() || (key->key() == "/") )) {
-		QString ret = finishText(entryText(modules, key) , modules, keyName );
-  	key->key(keyName); //restore before we return so make sure it doesn't break anything
-    return ret;
-  };
-
-  /**
-  * Check whether displaying displayLevel levels together is possible.
-	* For this count the childs and parents
-  * of the required position
-  */
-
-  int possibleLevels = 1; //we start with the default value of displayLevel, which means no entries together
-  while( key->parent() && (key->key() != "/") && !key->key().isEmpty() ) {//add parents
-    ++possibleLevels;
-  };
-  key->key(keyName); //set the key to the start position
-  while( key->firstChild( )) { //add childs
-    ++possibleLevels;
-  };
-
-  if (possibleLevels < displayLevel) { //too few levels available!
-    //display current level, we could also decide to display the available levels together
-    return finishText( entryText(modules, key), modules, keyName );
-  };
-  if ((displayLevel > 2) && (displayLevel == possibleLevels)) { //fix not to diplay the whole module
-    --displayLevel;
-  }
-
-  // at this point we're sure that we can display the required levels toogether
-  // at the moment we're at the lowest level, so we only have to go up!
-  for (int currentLevel = 1; currentLevel < displayLevel; ++currentLevel) { //we start again with 1 == standard of displayLevel
-    if (!key->parent()) { //something went wrong althout we checked before! Be safe and return entry's text
-      return finishText( entryText(modules, key), modules, keyName );
-    };
-  };
-
-  // no we can display all sub levels together! We checked before that this is possible!
-  m_text = entryText(modules, key, 0, (key->key() == keyName));
-
-  const bool hasToplevelText = !key->strippedText().isEmpty();
-
-  key->firstChild(); //go to the first sibling on the same level
-  m_chosenKey = keyName;
-
-  printTree(key, modules, hasToplevelText); //if the top level entry has text ident the other text
-
-	key->key(keyName); //restore key
-  return finishText(m_text, modules, keyName);
-}
-
-/** Renders one entry using the given modules and the key. This makes chapter rendering more easy. */
-const QString CBookDisplay::entryText( QPtrList<CSwordModuleInfo> modules, CSwordTreeKey* const key, const int level, const bool activeKey){
-  /**
-  * we have to be careful that we don't change the value of the key! We pass pointers for optimizations reasons,
-  * since entryText is called many times!
-  * creating copies of the key object takes too long
-  */
-	CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.first());
-	Q_ASSERT( book );
-
-  const QFont font = CBTConfig::get(book->language()).second;
-  const QString& keyName = key->getFullName();
-
-  return QString::fromLatin1("<tr><td style=\"padding-left:%1px;\"><sup>%2</sup> %3</td></tr>")
-    .arg( level*30 )
-    .arg( htmlReference(book, keyName, key->getLocalName(), !keyName.isEmpty() ? keyName : "/" ) )
-    .arg( QString::fromLatin1("<span %1 style=\"font-family:%2; font-size:%3pt;\">%4</span>")
-            .arg(activeKey ? "class=\"highlighted\"" : QString::null)
-            .arg(font.family())
-            .arg(font.pointSize())
-            .arg(key->renderedText())
-    );
-}
-
-void CBookDisplay::printTree(CSwordTreeKey* const treeKey, QPtrList<CSwordModuleInfo> modules, const int levelPos){
-  // make sure we don't change the value of the key!
-
-  //static for performance reasons, static is faster because the
-  //initialization isn't executed more than one time
-  static QString fullKeyName;
-  fullKeyName = treeKey->getFullName();
-
-  m_text += entryText(modules, treeKey, levelPos, (m_chosenKey == fullKeyName));
-
-  if (treeKey->hasChildren()) { //print tree for the child items
-    treeKey->firstChild();
-    printTree(treeKey, modules, levelPos+1); //doesn't change the value of the key! (this function)
-    treeKey->key(fullKeyName); //go back where we came from
-  }
-
-  if (treeKey->nextSibling()) { //print tree for next entry on the same depth
-		printTree(treeKey, modules, levelPos);
-    treeKey->key(fullKeyName); //return to the value we had at the beginning of this block!
-  }
-}
-
-const QString CBookDisplay::finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName) {
- 	CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.first());
-  util::scoped_ptr<CSwordTreeKey> key(
-		dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(book) )
-	);
-  key->key(keyName);
-
-  QString css = "table.maintable {width:100%;} td.tableheading {border-bottom: thin solid black;}";
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) ) + "\n\n";
-  }
-
-  const int columnWidth = (int)((float)100 / (float)modules.count());
-
-  QString pageStart = QString::fromLatin1("<html><head><style type=\"text/css\">%1</style></head><body><table cellspacing=\"0\" class=\"maintable\"><tr>")
-    .arg(css);
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key->module(m);
-    const QString newKeyName = !key->key().isEmpty() ? key->key() : "/";
-
-    pageStart += QString::fromLatin1("<td class=\"tableheading\" width=\"%1%\"><center><b>%2</b> %3</center></td>")
-      .arg(columnWidth)
-      .arg(m->name())
-      .arg(!newKeyName.isEmpty() ? QString::fromLatin1("(%1)").arg(htmlReference(m, newKeyName, newKeyName, QString::null)) : QString::null);
-  }
-	pageStart += QString::fromLatin1("</tr>");
-
-  const QString pageEnd = QString::fromLatin1("</table></body></html>");
-
-  return pageStart + text + pageEnd;
-}
diff --git a/bibletime/backend/centrydisplay.h b/bibletime/backend/centrydisplay.h
deleted file mode 100644
index 8cdadad..0000000
--- a/bibletime/backend/centrydisplay.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************
-                          centrydisplay.h  -  description
-                             -------------------
-    begin                : Fre Mai 31 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CENTRYDISPLAY_H
-#define CENTRYDISPLAY_H
-
-//BibleTime includes
-#include "cswordbackend.h"
-#include "cswordmoduleinfo.h"
-#include "cswordtreekey.h"
-
-#include "util/cpointers.h"
-#include "frontend/cbtconfig.h"
-
-//Sword includes
-#include <swdisp.h>
-
-//Qt includes
-#include <qstring.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qptrlist.h>
-
-/**The reimplementation of SWDisplay to fir our needs.
-  *@author The BibleTime team
-  */
-
-class CEntryDisplay : public sword::SWDisplay, public CPointers  {
-public: // Public methods
-  enum StyleType {
-    Body = 0,
-    Font,
-    Link,
-    LinkHover,
-    Background,
-//    Background2,
-    HighlightedText,
-    UnicodeText,
-
-    Reference,
-
-    MorphCode,
-    StrongNumber,
-    Lemma,
-    Footnote,
-    FootnotePre,
-
-    Poetry,
-    Quotation,
-    JesusWords,
-
-    BookTitle,
-    SectionTitle,
-
-    MinType = Body,
-    MaxType = SectionTitle
-  };
-
-//  enum FontType {
-//    UnicodeFont,
-//    StandardFont
-//  };
-
-  enum ColorType {
-    ReferenceColor,
-    TextColor,
-    HighlightedTextColor,
-    BackgroundColor,
-    BackgroundColor2,
-
-    FootnoteColor,
-    StrongsNumberColor,
-    MorphCodeColor,
-    LemmaColor,
-    JesusWordColor
-  };
-
-  CEntryDisplay();
-	virtual ~CEntryDisplay();
-  /**
-  * Returns the rendered text using the modules in the list and using the key parameter.
-  *  The displayoptions and filter options are used, too.
-  */
-  virtual const QString text( QPtrList <CSwordModuleInfo> modules, const QString& key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions);
-  /**
-  * Returns a preview for the given module and key.
-  * This is useful for the seatchdialog and perhaps the tooltips.
-  */
-  virtual const QString previewText( CSwordModuleInfo*  module, const QString& key, const QString& headerText = QString::null,  CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(), CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults());
-  void setDisplayOptions(const CSwordBackend::DisplayOptions options);
-
-  /**
-  * Returns the font of the given type.
-  */
-  const QFont font( const CLanguageMgr::Language& lang );
-  /**
-  * Returns the color of the given type.
-  */
-  const QColor color( const CEntryDisplay::ColorType type );
-  const QString cssString( const CEntryDisplay::StyleType type );
-
-
-protected:
-  /**
-  * Renders one entry using the given modules and the key.
-  * This makes chapter rendering more easy.
-  */
-  virtual const QString entryText( QPtrList<CSwordModuleInfo> modules, const QString& key);
-  /**
-  * Adds the right headers and footers to the page and returns them together.
-  */
-  virtual const QString finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName);
-  /**
-  * Returns the right reference text which can be incluced in the HTML
-  */
-  const QString htmlReference( CSwordModuleInfo* module, const QString& keyName, const QString linkText, const QString& anchorText );
-
-  CSwordBackend::DisplayOptions m_displayOptions;
-};
-
-class CChapterDisplay : public CEntryDisplay  {
-public: // Public methods
-  /**
-  * Returns the rendered text using the modules in the list and using the key parameter.
-  *  The displayoptions and filter options are used, too.
-  */
-  virtual const QString text( QPtrList <CSwordModuleInfo> modules, const QString& key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions);
-
-protected:
-  /**
-  * Renders one entry using the given modules and the key.
-  * This makes chapter rendering more easy.
-  */
-  virtual const QString entryText( QPtrList<CSwordModuleInfo> modules, const QString& key, const QString& chosenKey);
-  /**
-  * Adds the right headers and footers to the page and returns them together.
-  */
-  virtual const QString finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName);
-};
-
-class CBookDisplay : public CEntryDisplay  {
-public: // Public methods
-  /**
-  * Returns the rendered text using the modules in the list and using the key parameter.
-  *  The displayoptions and filter options are used, too.
-  */
-  virtual const QString text( QPtrList <CSwordModuleInfo> modules, const QString& key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions);
-
-protected:
-  /**
-  * Renders one entry using the given modules and the key.
-  * This makes chapter rendering more easy.
-  *
-  * Please be careful not to change the value of "key"!
-  */
-  virtual const QString entryText( QPtrList<CSwordModuleInfo> modules, CSwordTreeKey* const key, const int level = 0, const bool activekey = false);
-  /**
-  * Creates the text by processing all tree items.
-  */
-  void printTree(CSwordTreeKey* const treeKey, QPtrList<CSwordModuleInfo> modules, const int levelPos = 0);
-  virtual const QString finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName);
-
-private:
-  QString m_text;
-  QString m_chosenKey;
-};
-#endif
diff --git a/bibletime/backend/cfiltertool.cpp b/bibletime/backend/cfiltertool.cpp
deleted file mode 100644
index d3ab26d..0000000
--- a/bibletime/backend/cfiltertool.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/***************************************************************************
-                          cfiltertool.cpp  -  description
-                             -------------------
-    begin                : Don Jul 10 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cfiltertool.h"
-#include "creferencemanager.h"
-
-#include <qregexp.h>
-#include <qstring.h>
-
-
-#include <string>
-
-using std::string;
-
-CFilterTool::CFilterTool() {
-  updateSettings();
-}
-
-CFilterTool::~CFilterTool(){
-}
-
-void CFilterTool::updateSettings(){
-	m_standardBible = CReferenceManager::preferredModule(CReferenceManager::Bible);
-}
-
-const sword::SWBuf CFilterTool::thmlRefEnd(){
-	return "</a></span>";
-}
-
-char CFilterTool::ProcessRWPRefs(sword::SWBuf & buf, sword::SWModule* const module){
-  /** Markup verse refs which are marked by #ref1[,;]ref2|
-  *
-  * 1. Search start marker (#)
-  * 2. Search end marker (|)
-  * 3. Replace found ref by parsed result!
-  */
-
-  std::string target(buf.c_str());
-  unsigned int idx_start = target.find_first_of("#",0); //find ref start
-  unsigned int idx_end;
-
-  while (idx_start != std::string::npos) {
-    idx_end = target.find_first_of("|", idx_start); //find end marker
-
-    if ((idx_end != std::string::npos) && (idx_end > idx_start+1)) { //found marker with content
-      // Our length of the ref without markers is idx_end - (idx_start+1) = idx_end - idx_start - 1
-
-      // Parse ref without start and end markers!
-      const string ref = string(parseRef( target.substr(idx_start + 1, idx_end - idx_start - 1).c_str(),  module, 0 ).c_str());
-
-      // Replace original ref sourrounded by # and | by the parsed ref in target!
-      target.replace( idx_start, idx_end - idx_start + 1, ref ); //remove marker, too
-
-      // Start searching for next ref start behind current one! It's faster!
-      idx_start += ref.length();
-    }
-
-    idx_start = target.find_first_of("#", idx_start); //find ref start
-  };
-
-  buf = target.c_str(); //copy new content back into text!
-  return 0;
-}
-
-/** Parses the verse reference ref and returns it. */
-const sword::SWBuf CFilterTool::parseRef(const sword::SWBuf ref, sword::SWModule * const module, sword::SWKey * const key, const char* lang, const bool insertFullRef){
-  /**
-  * This function should be able to parse references like "John 1:3; 3:1-10; Matthew 1:1-3:3"
-  * without problems.
-  */
-  const sword::SWBuf moduleName( module ? module->Name() : m_standardBible.latin1() );
-
-  sword::VerseKey parseKey;
- 	parseKey.setLocale( lang ? lang : (module ? module->Lang() : "en") ); //we assume that the keys are in english or in the module's language
-
- 	parseKey = key ? (const char*)*key : "Genesis 1:1"; //use the current key if there's any
-  
- 	sword::ListKey list;
-  sword::SWBuf ret;
-
-  QStringList refList = QStringList::split(QRegExp("[,.;]|(?:\\s(?=\\d?[A-Z]))", false), QString::fromLocal8Bit(ref.c_str()));
-	int pos = 0;
-
-  if ( !insertFullRef && (refList.count() >= 1) ) {
-    /* We can't handle refs which defined their own caption if we would have to insert multiple refs
-    * If our own caption should not be inserted and we have more than one ref return so the original
-    * ref and caption will be used.
-    */
-    return sword::SWBuf("<span id=\"reference\"><a href=\"sword://Bible/") + moduleName + "/" + ref + "\">";
-  }
-
-	for ( QStringList::Iterator it = refList.begin(); it != refList.end(); ++it, pos++ ) {
-	 	list = parseKey.ParseVerseList((*it).local8Bit(), parseKey, true);
-
-	 	const int count = list.Count();
-    sword::SWKey* key = 0;
-	 	for(int i = 0; i < count; i++) {
-	 		key = list.GetElement(i);
-//      qWarning("%s (%s) [%s] (%s)", key->getRangeText(), ref.c_str(), parseKey.getLocale(), module->Lang());
-  		ret += sword::SWBuf("<span id=\"reference\"><a href=\"sword://Bible/") + moduleName + "/";
- 			if ( sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key) ) {
- 				vk->setLocale("en");
-        ret += sword::SWBuf(vk->getRangeText()) + "\">";
-        parseKey = *vk;
-      }
-      else {
-        sword::VerseKey vk = key->getText();
- 				vk.setLocale("en");
-        ret += sword::SWBuf(vk.getRangeText()) + "\">";
-        parseKey = vk;
-      }
-
-      /* This is kind of a hack. This will only work if we process simple refs which won't get splitted.
-      * But since insertFullRef is true by default, the end markers will be left out only in special cases like ThML refs
-      * with own caption.
-      */
-      if (insertFullRef) { //HTML will only be valid if we hide only the end of one cross reference
-        ret += sword::SWBuf( (const char*)(*it).utf8() ) + "</a>";
-  	 		(pos+1 < (int)refList.count()) ? ret.append("</span>, ") : ret.append("</span>");
-      }
-	 	}
-
-	}
- 	return ret;
-}
-
-const sword::SWBuf CFilterTool::parseThMLRef(const sword::SWBuf& ref, const char* mod) {
-  updateSettings();
-
-  const char* moduleName = (mod ? mod : m_standardBible.latin1());
-  sword::SWModule* module = 0;
-  if ( CSwordModuleInfo* m = CPointers::backend()->findModuleByName(moduleName) ) {
-    module = m->module();
-  }
-  return parseRef( ref, module, 0, module ? module->Lang() : "en", false );
-}
-
-const sword::SWBuf CFilterTool::parseSimpleRef(const sword::SWBuf& ref, const char* lang) {
-  updateSettings();
-
-  if ( CSwordModuleInfo* m = CPointers::backend()->findModuleByName(m_standardBible.latin1()) ) {
-    return parseRef( ref, m->module(), 0, lang);
-  }
-  return sword::SWBuf();
-}
diff --git a/bibletime/backend/cfiltertool.h b/bibletime/backend/cfiltertool.h
deleted file mode 100644
index d627608..0000000
--- a/bibletime/backend/cfiltertool.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
-                          cfiltertool.h  -  description
-                             -------------------
-    begin                : Don Jul 10 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CFILTERTOOL_H
-#define CFILTERTOOL_H
-
-#include "util/cpointers.h"
-
-#include "swmodule.h"
-#include "swkey.h"
-#include "swbuf.h"
-
-/**CFilterTool includes some functions to use filters from Sword without multiple virtual inheritance.
-  *@author The BibleTime team
-  */
-
-class CFilterTool : public CPointers  {
-public: 
-	CFilterTool();
-	virtual ~CFilterTool();
-
-protected: // Protected methods
-  /** 
-	* updates the filter specific settings like colors
-	* the variables are used in the inherited filters
-	* in HandleToken()
-	*/
-  void updateSettings();
-  /** 
-	* This filter converts the RWP #Gen 1:1|
-	* style bible references to HTML
-	*/
-  char ProcessRWPRefs(sword::SWBuf & buf, sword::SWModule* const module);
-  /** 
-  * parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf thmlRefEnd();
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf parseRef(const sword::SWBuf ref, sword::SWModule * const , sword::SWKey * const, const char* lang="en", const bool insertFullRef = true);
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf parseThMLRef(const sword::SWBuf& ref, const char* mod = 0);
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf parseSimpleRef(const sword::SWBuf& ref, const char* lang = 0);
-
-private:
-  QString m_standardBible;
-};
-
-#endif
diff --git a/bibletime/backend/clanguagemgr.cpp b/bibletime/backend/clanguagemgr.cpp
deleted file mode 100644
index 05f5e85..0000000
--- a/bibletime/backend/clanguagemgr.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-/***************************************************************************
-                          clanguagemgr.cpp  -  description
-                             -------------------
-    begin                : Mon Okt 21 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "clanguagemgr.h"
-
-#include "cswordmoduleinfo.h"
-
-#include "util/cpointers.h"
-
-//KDE includes
-#include <klocale.h>
-
-//initialize static language list
-static QValueList<CLanguageMgr::Language> m_langList;
-static CLanguageMgr::Language m_defaultLanguage;
-
-CLanguageMgr::Language::Language() {
-  m_abbrev = QString::null;
-  m_altAbbrevs = QStringList();
-  m_englishName = QString::null;
-  m_translatedName = QString::null;
-};
-
-CLanguageMgr::Language::Language( const QString& abbrev, const QString& name, const QString& translatedName, const QStringList altAbbrevs ) {
-  m_abbrev = abbrev;
-  m_altAbbrevs = altAbbrevs;
-  m_englishName = name;
-  m_translatedName = translatedName;
-};
-
-CLanguageMgr::Language::~Language() {
-};
-
-/** Returns true if this language object is valid, i.e. has an abbrev and name. */
-const bool CLanguageMgr::Language::isValid(){
-  return (!abbrev().isEmpty() && !name().isEmpty());
-}
-
-const QString& CLanguageMgr::Language::abbrev() const {
-  if (m_abbrev.isEmpty() && m_altAbbrevs.count()) { //no standard abbrev but alternative ones
-    return m_altAbbrevs.first();
-  };
-  return m_abbrev;
-};
-
-const QString& CLanguageMgr::Language::translatedName() const {
-  return m_translatedName;
-};
-
-const QStringList& CLanguageMgr::Language::alternativeAbbrevs() const {
-  return m_altAbbrevs;
-};
-
-const QPixmap CLanguageMgr::Language::flag() {
-  return QPixmap();
-};
-
-
-/****************************************************/
-/******************** CLanguageMgr ******************/
-/****************************************************/
-CLanguageMgr::CLanguageMgr(){
-  init();
-}
-
-CLanguageMgr::~CLanguageMgr(){
-}
-
-const CLanguageMgr::LangMap& CLanguageMgr::languages() const {
-  return m_langMap;
-};
-
-const CLanguageMgr::LangMap CLanguageMgr::availableLanguages() {
-  LangMap map;
-  
-  //collect the languages abbrevs of all modules
-  ListCSwordModuleInfo mods = CPointers::backend()->moduleList();
-  QStrList abbrevs;
-  char *abbrev;  
-
-  for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
-    abbrev = m->module()->Lang();
-    if (abbrev && !abbrevs.contains(abbrev)) {
-      abbrevs.append( abbrev );
-    }
-  };
-
-  //now create a map of available langs
-  Language lang;
-  for ( abbrev = abbrevs.first(); abbrev; abbrev = abbrevs.next() ) {
-    lang = languageForAbbrev(abbrev);
-    if (lang.isValid()) {
-      map.insert( abbrev, lang );
-    }
-    else {
-      map.insert( abbrev, Language(abbrev, abbrev, abbrev) );
-    }
-  };
-
-  return map;
-};
-
-const CLanguageMgr::Language& CLanguageMgr::languageForAbbrev( const QString& abbrev ) {
-  if (m_langMap.contains(abbrev)) {
-    return m_langMap[abbrev];
-  };
-
-  //try to search in the alternative abbrevs
-  LangMap::Iterator it;
-  for ( it = m_langMap.begin(); it != m_langMap.end(); ++it ) {
-    if (it.data().alternativeAbbrevs().contains(abbrev)) {
-      return it.data();
-    };
-  }  
-  return m_defaultLanguage; //invalid language
-};
-
-const CLanguageMgr::Language& CLanguageMgr::languageForName( const QString& name ) {
-  LangMap::Iterator it;
-  for ( it = m_langMap.begin(); it != m_langMap.end(); ++it ) {
-    if (it.data().name() == name) {
-      return it.data();
-    };
-  };
-  return m_defaultLanguage;//invalid language
-};
-
-const CLanguageMgr::Language& CLanguageMgr::languageForTranslatedName( const QString& name ) {
-  LangMap::Iterator it;
-  for ( it = m_langMap.begin(); it != m_langMap.end(); ++it ) {
-    if (it.data().translatedName() == name) {
-      return it.data();
-    };
-  };
-  return m_defaultLanguage;//invalid language
-};
-
-void CLanguageMgr::init() {
-  //if we've already inserted all items we do not proceed
-  if (m_langMap.count())
-    return;
-
-/*
-* Chris explained in an eMail how language codes are build:
-
-Preference order for locale codes are:
-
-ISO 639-1
-ISO 639-2
-Ethnologue (http://www.ethnologue.org/)
-
-We intend to always follow OSIS locale conventions, which state that
-Ethnologue codes will be encoded in the format x-E-??? where ???
-represents the 3-letter Ethnologue code in capital letters (though
-capitalization really doesn't matter here).
-
-Some older modules maintain a former format for Ethnolgoue codes of
-xx-???, including the AleWiesler module.
-
---Chris
-
-*/    
-    
-    
-//  m_langList.append( Language("aa"  , "Afar"        , i18n("Afar")) );
-//  m_langList.append( Language("ab"  , "Abkhazian"   , i18n("Abkhazian")) );
-//  m_langList.append( Language("ae"  , "Avestan"     , i18n("Avestan")) );
-  m_langList.append( Language("af"  , "Afrikaans"   , i18n("Afrikaans")) );
-//  m_langList.append( Language("am"  , "Amharic"     , i18n("Amharic")) );
-  m_langList.append( Language("ang", "English, Old (ca.450-1100)", i18n("English, Old (ca.450-1100)")) );
-  m_langList.append( Language("ar"  , "Arabic"      , i18n("Arabic")) );
-//  m_langList.append( Language("as"  , "Assamese"    , i18n("Assamese")) );
-//  m_langList.append( Language("ay"  , "Aymara"      , i18n("Aymara")) );
-  m_langList.append( Language("az"  , "Azerbaijani" , i18n("Azerbaijani")) );
-
-//  m_langList.append( Language("ba"  , "Bashkir"     , i18n("Bashkir")) );
-  m_langList.append( Language("be"  , "Belarusian"  , i18n("Belarusian")) );
-  m_langList.append( Language("bg"  , "Bulgarian"   , i18n("Bulgarian")) );
-//  m_langList.append( Language("bh"  , "Bihari"      , i18n("Bihari")) );
-//  m_langList.append( Language("bi"  , "Bislama"     , i18n("Bislama")) );
-//  m_langList.append( Language("bn"  , "Bengali"     , i18n("Bengali")) );
-//  m_langList.append( Language("bo"  , "Tibetan"     , i18n("Tibetan")) );
-  m_langList.append( Language("br"  , "Breton"      , i18n("Breton")) );
-  m_langList.append( Language("bs"  , "Bosnian"     , i18n("Bosnian")) );
-
-  m_langList.append( Language("ca"  , "Catalan"     , i18n("Catalan")) );
-//  m_langList.append( Language("ce"  , "Chechen"     , i18n("Chechen")) );
-  m_langList.append( Language("ceb"  , "Cebuano"     , i18n("Cebuano")) );
-//  m_langList.append( Language("ch"  , "Chamorro"    , i18n("Chamorro")) );
-//  m_langList.append( Language("co"  , "Corsican"    , i18n("Corsican")) );
-  m_langList.append( Language("cop" , "Coptic"         , i18n("Coptic")) );
-  m_langList.append( Language("cs"  , "Czech"       , i18n("Czech")) );
-  m_langList.append( Language("cu"  , "Church Slavic" , i18n("Church Slavic")) );
-//  m_langList.append( Language("cv"  , "Chuvash"     , i18n("Chuvash")) );
-  m_langList.append( Language("cy"  , "Welsh"       , i18n("Welsh")) );
-
-  m_langList.append( Language("da"  , "Danish"      , i18n("Danish")) );
-  m_langList.append( Language("de"  , "German"      , i18n("German")) );
-//  m_langList.append( Language("dz"  , "Dzongkha"    , i18n("Dzongkha")) );
-
-  m_langList.append( Language("el"  , "Greek, Modern (1453-)" , i18n("Greek, Modern (1453-)"), makeStringList("gre;ell")) );
-  m_langList.append( Language("en"  , "English"     , i18n("English")) );
-  m_langList.append( Language("en_US",  "American English"     , i18n("American English")) );
-  m_langList.append( Language("enm" , "English, Middle (1100-1500)", i18n("English, Middle (1100-1500)")) );
-  m_langList.append( Language("eo"  , "Esperanto"   , i18n("Esperanto")) );
-  m_langList.append( Language("es"  , "Spanish"     , i18n("Spanish")) );
-  m_langList.append( Language("et"  , "Estonian"    , i18n("Estonian")) );
-  m_langList.append( Language("eu"  , "Basque"      , i18n("Basque")) );
-
-//  m_langList.append( Language("fa"  , "Persian"     , i18n("Persian")) );
-  m_langList.append( Language("fi"  , "Finnish"     , i18n("Finnish")) );
-//  m_langList.append( Language("fj"  , "Fijian"      , i18n("Fijian")) );
-//  m_langList.append( Language("fo"  , "Faroese"     , i18n("Faroese")) );
-  m_langList.append( Language("fr"  , "French"      , i18n("French")) );
-  m_langList.append( Language("fy"  , "Frisian"     , i18n("Frisian")) );
-
-  m_langList.append( Language("ga"  , "Irish"       , i18n("Irish")) );
-  m_langList.append( Language("gd"  , "Gaelic (Scots)"     , i18n("Gaelic (Scots)")) );
-//  m_langList.append( Language("gl"  , "Gallegan"    , i18n("Gallegan")) );
-//  m_langList.append( Language("gn"  , "Guarani"     , i18n("Guarani")) );
-//  m_langList.append( Language("gn"  , "Gujarati"    , i18n("Gujarati")) );
-  m_langList.append( Language("got"  , "Gothic"    , i18n("Gothic")) );
-  m_langList.append( Language("gv"  , "Manx"        , i18n("Manx")) );
-  m_langList.append( Language("grc"  , "Greek, Ancient (to 1453)" , i18n("Greek, Ancient (to 1453)")) );
-
-  m_langList.append( Language("he"  , "Hebrew"      , i18n("Hebrew")) );
-  m_langList.append( Language("haw"    , "Hawaiian"    , i18n("Hawaiian")) );
-//  m_langList.append( Language("hi"  , "Hindi"       , i18n("Hindi")) );
-//  m_langList.append( Language("ho"  , "Hiri Motu"   , i18n("Hiri Motu")) );
-//  m_langList.append( Language("hr"  , "Croatian"    , i18n("Croatian")) );
-  m_langList.append( Language("hu"  , "Hungarian"   , i18n("Hungarian")) );
-  m_langList.append( Language("hy"  , "Armenian"    , i18n("Armenian")) );
-//  m_langList.append( Language("hz"  , "Herero"      , i18n("Herero")) );
-
-//  m_langList.append( Language("ia"  , "Interlingua" , i18n("Interlingua")) );
-  m_langList.append( Language("id"  , "Indonesian"  , i18n("Indonesian")) );
-//  m_langList.append( Language("ie"  , "Interlingue" , i18n("Interlingue")) );
-//  m_langList.append( Language("ik"  , "Inupiaq"     , i18n("Inupiaq")) );
-  m_langList.append( Language("is"  , "Icelandic"   , i18n("Icelandic")) );
-  m_langList.append( Language("it"  , "Italian"     , i18n("Italian")) );
-//  m_langList.append( Language("iu"  , "Inuktitut"   , i18n("Inuktitut")) );
-
-  m_langList.append( Language("ja"  , "Japanese"    , i18n("Japanese")) );
-
-  m_langList.append( Language("ka"  , "Georgian"    , i18n("Georgian")) );
-//  m_langList.append( Language("ki"  , "Kikuyu"      , i18n("Kikuyu")) );
-//  m_langList.append( Language("kj"  , "Kuanyama"    , i18n("Kuanyama")) );
-//  m_langList.append( Language("kk"  , "Kazakh"      , i18n("Kazakh")) );
-//  m_langList.append( Language("kl"  , "Kalaallisut" , i18n("Kalaallisut")) );
-//  m_langList.append( Language("km"  , "Khmer"       , i18n("Khmer")) );
-//  m_langList.append( Language("kn"  , "Kannada"     , i18n("Kannada")) );
-  m_langList.append( Language("ko"  , "Korean"      , i18n("Korean")) );
-//  m_langList.append( Language("ks"  , "Kashmiri"    , i18n("Kashmiri")) );
-  m_langList.append( Language("ku"  , "Kurdish"     , i18n("Kurdish")) );
-//  m_langList.append( Language("kv"  , "Komi"        , i18n("Komi")) );
-//  m_langList.append( Language("kw"  , "Cornish"     , i18n("Cornish")) );
-  m_langList.append( Language("ky"  , "Kirghiz"     , i18n("Kirghiz")) );
-
-  m_langList.append( Language("la"  , "Latin"       , i18n("Latin")) );
-//  m_langList.append( Language("lb"  , "Letzeburgesch" , i18n("Letzeburgesch")) );
-//  m_langList.append( Language("ln"  , "Lingala"     , i18n("Lingala")) );
-//  m_langList.append( Language("lo"  , "Lao"         , i18n("Lao")) );
-//  m_langList.append( Language("lt"  , "Lithuanian"  , i18n("Lithuanian")) );
-  m_langList.append( Language("lv"  , "Latvian"     , i18n("Latvian")) );
-
-//  m_langList.append( Language("mg"  , "Malagasy"    , i18n("Malagasy")) );
-//  m_langList.append( Language("mh"  , "Marshall"    , i18n("Marshall")) );
-  m_langList.append( Language("mi"  , "Maori"       , i18n("Maori")) );
-
-  m_langList.append( Language("mk"  , "Macedonian"  , i18n("Macedonian")) );
-//  m_langList.append( Language("ml"  , "Malayalam"   , i18n("Malayalam")) );
-//  m_langList.append( Language("mn"  , "Mongolian"   , i18n("Mongolian")) );
-//  m_langList.append( Language("mo"  , "Moldavian"   , i18n("Moldavian")) );
-//  m_langList.append( Language("mr"  , "Marathi"     , i18n("Marathi")) );
-  m_langList.append( Language("ms"  , "Malay"       , i18n("Malay")) );
-  m_langList.append( Language("mt"  , "Maltese"     , i18n("Maltese")) );
-//  m_langList.append( Language("my"  , "Burmese"     , i18n("Burmese")) );
-
-//  m_langList.append( Language("na"  , "Nauru"       , i18n("Nauru")) );
-//  m_langList.append( Language("nb"  , "Norwegian Bokm�l"       , i18n("Norwegian Bokm�l")) );
-//  m_langList.append( Language("nd"  , "Ndebele, North" , i18n("Ndebele, North")) );
-  m_langList.append( Language("nds"  , "Low German; Low Saxon" , i18n("Low German; Low Saxon")) );
-//  m_langList.append( Language("ne"  , "Nepali"      , i18n("Nepali")) );
-//  m_langList.append( Language("ng"  , "Ndonga"      , i18n("Ndonga")) );
-  m_langList.append( Language("nl"  , "Dutch"       , i18n("Dutch")) );
-//  m_langList.append( Language("nn"  , "Norwegian Nynorsk"     , i18n("Norwegian Nynorsk")) );
-  m_langList.append( Language("no"  , "Norwegian"   , i18n("Norwegian")) );
-//  m_langList.append( Language("nr"  , "Ndebele, South"     , i18n("Ndebele, South")) );
-//  m_langList.append( Language("nv"  , "Navajo"      , i18n("Navajo")) );
-//  m_langList.append( Language("ny"  , "Chichewa; Nyanja"      , i18n("Chichewa; Nyanja")) );
-
-//  m_langList.append( Language("oc"  , "Occitan (post 1500); Proven�al"     , i18n("Occitan (post 1500); Proven�al")) );
-//  m_langList.append( Language("om"  , "Oromo"       , i18n("Oromo")) );
-//  m_langList.append( Language("or"  , "Oriya"       , i18n("Oriya")) );
-//  m_langList.append( Language("os"  , "Ossetian; Ossetic"     , i18n("Ossetian; Ossetic")) );
-
-//  m_langList.append( Language("pa"  , "Panjabi"     , i18n("Panjabi")) );
-  m_langList.append( Language("pap"  , "Papiamento"     , i18n("Papiamento")) );
-//  m_langList.append( Language("pi"  , "Pali"        , i18n("Pali")) );
-  m_langList.append( Language("pl"  , "Polish"      , i18n("Polish")) );
-//  m_langList.append( Language("ps"  , "Pushto"      , i18n("Pushto")) );
-  m_langList.append( Language("pt"  , "Portuguese"  , i18n("Portuguese")) );
-
-//  m_langList.append( Language("qu"  , "Quechua"     , i18n("Quechua")) );
-
-//  m_langList.append( Language("rm"  , "Raeto-Romance"    , i18n("Raeto-Romance")) );
-//  m_langList.append( Language("rn"  , "Rundi"       , i18n("Rundi")) );
-
-  m_langList.append( Language("ro"  , "Romanian"    , i18n("Romanian")) );
-  m_langList.append( Language("ru"  , "Russian"     , i18n("Russian")) );
-//  m_langList.append( Language("rw"  , "Kinyarwanda" , i18n("Kinyarwanda")) );
-
-//  m_langList.append( Language("sa"  , "Sanskrit"    , i18n("Sanskrit")) );
-//  m_langList.append( Language("sc"  , "Sardinian"   , i18n("Sardinian")) );
-  m_langList.append( Language("sco"  , "Scots"   , i18n("Scots")) );
-//  m_langList.append( Language("sd"  , "Sindhi"      , i18n("Sindhi")) );
-//  m_langList.append( Language("se"  , "Northern Sami" , i18n("Northern Sami")) );
-//  m_langList.append( Language("sg"  , "Sango"       , i18n("Sango")) );
-//  m_langList.append( Language("si"  , "Sinhalese"   , i18n("Sinhalese")) );
-  m_langList.append( Language("sk"  , "Slovak"      , i18n("Slovak")) );
-  m_langList.append( Language("sl"  , "Slovenian"   , i18n("Slovenian")) );
-//  m_langList.append( Language("sm"  , "Samoan"      , i18n("Samoan")) );
-//  m_langList.append( Language("sn"  , "Shona"       , i18n("Shona")) );
-  m_langList.append( Language("so"  , "Somali"      , i18n("Somali")) );
-  m_langList.append( Language("sq"  , "Albanian"    , i18n("Albanian")) );
-//  m_langList.append( Language("sr"  , "Serbian"     , i18n("Serbian")) );
-//  m_langList.append( Language("ss"  , "Swati"       , i18n("Swati")) );
-//  m_langList.append( Language("st"  , "Sotho, Southern"     , i18n("Sotho, Southern")) );
-//  m_langList.append( Language("su"  , "Sundanese"   , i18n("Sundanese")) );
-  m_langList.append( Language("sv"  , "Swedish"     , i18n("Swedish")) );
-  m_langList.append( Language("sw"  , "Swahili"     , i18n("Swahili")) );
-  m_langList.append( Language("syr"  , "Syriac"     , i18n("Syriac")) );
-
-  m_langList.append( Language("ta"  , "Tamil"       , i18n("Tamil")) );
-//  m_langList.append( Language("te"  , "Telugu"      , i18n("Telugu")) );
-//  m_langList.append( Language("tg"  , "Tajik"       , i18n("Tajik")) );
-  m_langList.append( Language("th"  , "Thai"        , i18n("Thai")) );
-//  m_langList.append( Language("tk"  , "Turkmen"     , i18n("Turkmen")) );
-  m_langList.append( Language("tl"  , "Tagalog"     , i18n("Tagalog")) );
-  m_langList.append( Language("tn"  , "Tswana"      , i18n("Tswana")) );
-  m_langList.append( Language("tr"  , "Turkish"     , i18n("Turkish")) );
-//  m_langList.append( Language("ts"  , "Tsonga"      , i18n("Tsonga")) );
-//  m_langList.append( Language("tt"  , "Tatar"       , i18n("Tatar")) );
-//  m_langList.append( Language("tw"  , "Twi"         , i18n("Twi")) );
-  m_langList.append( Language("ty"  , "Tahitian"    , i18n("Tahitian")) );
-//
-//  m_langList.append( Language("ug"  , "Uighur"      , i18n("Uighur")) );
-  m_langList.append( Language("uk"  , "Ukrainian"   , i18n("Ukrainian")) );
-//  m_langList.append( Language("ur"  , "Urdu"        , i18n("Urdu")) );
-//  m_langList.append( Language("uz"  , "Uzbek"       , i18n("Uzbek")) );
-
-  m_langList.append( Language("vi"  , "Vietnamese"  , i18n("Vietnamese")) );
-//  m_langList.append( Language("vo"  , "Volap�k"     , i18n("Volap�k")) );
-//
-//  m_langList.append( Language("wo"  , "Wolof"       , i18n("Wolof")) );
-
-  m_langList.append( Language("xh"  , "Xhosa"       , i18n("Xhosa")) );
-
-  m_langList.append( Language("x-E-BAR"  , "Bavarian"     , i18n("Bavarian")) );
-  m_langList.append( Language("x-E-GSW"  , "Alemannisch"  , i18n("Alemannisch")) );
-  m_langList.append( Language("x-E-HAT"  , "Haitian Creole French" , i18n("Haitian Creole French")) );
-  m_langList.append( Language("x-E-ITZ"  , "Itz�"         , i18n("Itz�")) );  
-  m_langList.append( Language("x-E-JIV"  , "Shuar"        , i18n("Shuar")) );
-  m_langList.append( Language("x-E-KEK"  , "Kekch�"       , i18n("Kekch�")) );
-  m_langList.append( Language("x-E-LMO"  , "Lombard"      , i18n("Lombard")) );  
-  m_langList.append( Language("x-E-MKJ"  , "Macedonian"   , i18n("Macedonian")) );
-  m_langList.append( Language("x-E-PDG"  , "Tok Pisin"    , i18n("Tok Pisin")) );
-  m_langList.append( Language("x-E-PPK"  , "Uma"          , i18n("Uma")) );
-  m_langList.append( Language("x-E-RMY"  , "Romani, Vlax" , i18n("Romani, Vlax")) );
-  m_langList.append( Language("x-E-SAJ"  , "Sango"        , i18n("Sango")) );
-  m_langList.append( Language("x-E-SRN"  , "Sranan"       , i18n("Sranan")) );  
-
-//  m_langList.append( Language("yi"  , "Yiddish"     , i18n("Yiddish")) );
-//
-//  m_langList.append( Language("za"  , "Zhuang"      , i18n("Zhuang")) );
-  m_langList.append( Language("zh"  , "Chinese"     , i18n("Chinese")) );
-  m_langList.append( Language("zu"  , "Zulu"        , i18n("Zulu")) );
-
-  QValueList<Language>::iterator it;
-  for ( it = m_langList.begin(); it != m_langList.end(); ++it ) {
-    m_langMap.insert((*it).abbrev(), *it);
-  };
-};
-
-/** No descriptions */
-void CLanguageMgr::debug(){
-  //some tests
-  Language lang = languageForName("German");
-  qWarning("abbrev of language German is %s", lang.abbrev().latin1());
-
-  lang = languageForTranslatedName("Deutsch");
-  qWarning("abbrev of translated language name Deutsch is %s", lang.abbrev().latin1());
-
-  lang =  languageForAbbrev("ar");
-  qWarning("language name of abbrev ar is %s", lang.name().latin1());
-
-  lang =  languageForAbbrev("sd");
-  qWarning("language name of abbrev sd is %s and is valid? %i", lang.name().latin1(), lang.isValid());
-
-  //print out all languages
-  LangMap::Iterator it;
-  LangMap map = languages();
-  for ( it = map.begin(); it != map.end(); ++it ) {
-    qWarning("language %s: %s (%s)", it.data().abbrev().latin1(), it.data().name().latin1(),it.data().translatedName().latin1());
-  };
-}
-
-const QStringList CLanguageMgr::makeStringList( const QString& abbrevs ) {
-  return QStringList::split( ";", abbrevs, false );
-};
diff --git a/bibletime/backend/clanguagemgr.h b/bibletime/backend/clanguagemgr.h
deleted file mode 100644
index 4e070e2..0000000
--- a/bibletime/backend/clanguagemgr.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
-                          clanguagemgr.h  -  description
-                             -------------------
-    begin                : Mon Okt 21 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CLANGUAGEMGR_H
-#define CLANGUAGEMGR_H
-
-//Qt includes
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qpixmap.h>
-#include <qmap.h>
-
-/** Manages the anguages of BibleTime and provides functions to work with them.
-  * @author The BibleTime team
-  */
-class CLanguageMgr  {
-public:
-  class Language {
-  public:
-    /** Constructor of a language object.
-    * Uses the abbreviation parameter to lookup the language name and to be able to return the name, flag etc.
-    * Possible values for abbrev are de, en, fr, it etc.
-    */
-    Language();
-    Language(const QString& abbrev, const QString& englishName, const QString& translatedName, const QStringList altAbbrevs = QStringList());
-    ~Language();
-    const QString& abbrev() const;
-    const QString& translatedName() const;
-
-		//always define inlines in the header file, or make them not inline.
-    inline const QString& name() const{
-			return m_englishName;
-		}
-
-    const QStringList& alternativeAbbrevs() const;
-    const QPixmap flag();
-    /**
-    * Returns true if this language object is valid, i.e. has an abbrev and name.
-    */
-    const bool isValid();
-  private:
-    QString m_abbrev;
-    QString m_englishName;
-    QString m_translatedName;
-    QStringList m_altAbbrevs;
-  };
-
-  typedef QMap<QString, Language> LangMap;
-
-  CLanguageMgr();
-	virtual ~CLanguageMgr();
-  /**
-  * Returns the standard languages available as standard. Does nothing for Sword.
-  */
-  const CLanguageMgr::LangMap& languages() const;
-  /**
-  * Returns the languages which are available. The languages cover all available modules, but nothing more.
-  */
-//  const QStringList availableAbbrevs();
-  const CLanguageMgr::LangMap availableLanguages();
-  const CLanguageMgr::Language& languageForAbbrev( const QString& abbrev );
-  const CLanguageMgr::Language& languageForName( const QString& language );  
-  const CLanguageMgr::Language& languageForTranslatedName( const QString& language );
-
-  void debug();
-
-private:
-  void init();
-  const QStringList makeStringList(const QString& abbrevs);
-  LangMap m_langMap;
-};
-
-#endif
diff --git a/bibletime/backend/creferencemanager.cpp b/bibletime/backend/creferencemanager.cpp
deleted file mode 100644
index 675f9fd..0000000
--- a/bibletime/backend/creferencemanager.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/***************************************************************************
-                          creferencemanager.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "creferencemanager.h"
-#include "cswordversekey.h"
-
-#include "../frontend/cbtconfig.h"
-
-//QT includes
-#include <qregexp.h>
-
-/** Returns a hyperlink used to be imbedded in the display windows. At the moment the format is sword://module/key */
-const QString CReferenceManager::encodeHyperlink( const QString& moduleName, const QString& key, const CReferenceManager::Type& type){
-	QString ret = QString::null;
-	switch (type) {
-		case Bible:				
-			ret = QString::fromLatin1("sword://Bible/");
-			break;
-		case Commentary:
-			ret = QString::fromLatin1("sword://Commentary/");
-			break;
-		case Lexicon:
-			ret = QString::fromLatin1("sword://Lexicon/");
-			break;
-		case GenericBook:
-			ret = QString::fromLatin1("sword://Book/");
-			break;			
-		case MorphHebrew:				
-			ret = QString::fromLatin1("morph://Hebrew/");		
-			break;
-		case MorphGreek:
-			ret = QString::fromLatin1("morph://Greek/");				
-			break;
-		case StrongsHebrew:				
-			ret = QString::fromLatin1("strongs://Hebrew/");				
-			break;
-		case StrongsGreek:				
-			ret = QString::fromLatin1("strongs://Greek/");					
-			break;
-		default:
-			break;
-	}
-
-	if (!moduleName.isEmpty()) {
-		ret += moduleName + QString::fromLatin1("/");
-  }
-	else { //if module is empty use fallback module
-		ret += preferredModule(type) + QString::fromLatin1("/");
-	}	
-	
-	if (type == GenericBook) {
-		const QString s = (!key.isEmpty() ? key : QString::null);
-		QString newKey = QString::null;	
-	  //replace all / of the key (e.g. of a CSwordTreeKey) with
-	  // the escape sequence \/ so we know it's a link internal divider (e.g. of CSwordTreeKey)!
-
-    QChar c;
-		for(unsigned int i = 0; i < s.length(); ++i) {
-      c = s.at(i);
-			if (c == '/') {
-				newKey += "\\/";
-      }
-			else {
-				newKey += c;
-      }
-		}
-		ret += newKey;		
-	}
-	else { //slashes do not appear in verses and dictionary entries
-   	switch (type) {
-      case Bible: //bibles or commentary keys need parsing
-  		case Commentary: {
-        CSwordVerseKey vk(0);
-        vk = key;
-        //vk.setLocale("en");
-
-        ret += vk.key(); //we add the english key, so drag and drop will work in all cases
-        break;
-      }
-      default:
-        ret += key; //use the standard key, no parsing required
-        break;
-    }
-	}
-	return ret;
-}
-
-/** Decodes the given hyperlink to module and key. */
-const bool CReferenceManager::decodeHyperlink( const QString& hyperlink, QString& module, QString& key, CReferenceManager::Type& type ){
-	/**
-	* We have to decide between three types of URLS: sword://Type/Module/Key, morph://Testament/key and strongs://Testament/Key
-	*/	
-  module = QString::null;
-  key = QString::null;
-  	
-	type = Unknown; //not yet known
-	QString ref = hyperlink;
-	//remove the trailing slash
-	if (ref.right(1)=="/" && ref.right(2) != "\\/") //triling slash, but not escaped
-		ref = ref.left(ref.length()-1);
-	
-	//find out which type we have by looking at the beginning (protocoll section of URL)
-	if (ref.left(8) == "sword://") { //Bible, Commentary or Lexicon
-		ref = ref.mid(8);
-		if (ref.left(5) == "Bible") { //a bible hyperlink
-			type = CReferenceManager::Bible;			
-			ref = ref.mid(6); //inclusive trailing slash
-		}
-		else if (ref.left(10) == "Commentary") { // a Commentary hyperlink
-			type = CReferenceManager::Commentary;			
-			ref = ref.mid(11); //inclusive trailing slash
-		}
-		else if (ref.left(7) == "Lexicon") { // a Lexicon hyperlink
-			type = CReferenceManager::Lexicon;
-			ref = ref.mid(8); //inclusive trailing slash
-		}
-		else if (ref.left(4) == "Book") { // a Book hyperlink
-			type = CReferenceManager::GenericBook;
-			ref = ref.mid(5); //inclusive trailing slash
-		}		
-		// string up to next slash is the modulename
-		if (ref.at(0) != '/' ) { //we have a module given
-      while (true) {
-  			const int pos = ref.find("/");
-  			if (pos>0 && ref.at(pos-1) != '\\') { //found a slash which is not escaped
-  				module = ref.mid(0,pos);
-  				ref = ref.mid(pos+1);
-  				break;
-  			}
-        else if (pos == -1) {
-          break;
-        }
-  		}
-  		// the rest is the key
-   		key = ref;
-    }
-    else {
-      key = ref.mid(1);
-    }
- 		//replace \/ escapes with /
- 		key.replace(QRegExp("\\\\/"), "/");
-	}
-	else if (ref.left(8) == "morph://" || ref.left(10) == "strongs://") { //strongs or morph URL have the same format
-		enum PreType {IsMorph, IsStrongs};
-		PreType preType = IsMorph;
-		if (ref.left(8) == "morph://") { //morph code hyperlink
-			ref = ref.mid(8);
-			preType = IsMorph;
-		}
-		else if (ref.left(10) == "strongs://") {
-			ref = ref.mid(10);		
-			preType = IsStrongs;			
-		}
-		//part up to next slash is the language
-		const int pos = ref.find("/");
-		if (pos>0) { //found
-			const QString language = ref.mid(0,pos);
-			if (language == "Hebrew") {
-				switch (preType) {
-					case IsMorph:
-						type = CReferenceManager::MorphHebrew;
-						break;
-					case IsStrongs:
-						type = CReferenceManager::StrongsHebrew;
-						break;								
-				}			
-			}
-			else if (language == "Greek") {
-				switch (preType) {
-					case IsMorph:
-						type = CReferenceManager::MorphGreek;
-						break;
-					case IsStrongs:
-						type = CReferenceManager::StrongsGreek;
-						break;								
-				}
-			}
-			ref = ref.mid(pos+1);
-			key = ref; //the remaining part is the key
-			
-			module = preferredModule(type);
-		}
-	}
-
-  if (key.isEmpty() && module.isEmpty())
-  	return false;
-	return true;
-}
-
-const QString CReferenceManager::encodeReference(const QString &module, const QString &reference){
-	return QString::fromLatin1("(%1)%2").arg(module).arg(reference);
-}
-
-void CReferenceManager::decodeReference(QString &dragreference, QString &module, QString &reference){
-  const int pos = dragreference.find(")");
-	const QString fallbackModule = dragreference.mid( 1, pos - 1);
-  dragreference = dragreference.mid(pos+1);
-
-  module = fallbackModule;
-  reference = dragreference;
-}
-
-/** Returns true if the parameter is a hyperlink. */
-const bool CReferenceManager::isHyperlink( const QString& hyperlink ){
-	return (    hyperlink.left(8)  == "sword://")
-					|| (hyperlink.left(10) == "strongs://")
-					|| (hyperlink.left(8)  == "morph://");
-}
-
-/** Returns the preferred module name for the given type. */
-const QString CReferenceManager::preferredModule( const CReferenceManager::Type type ){
-	QString description = QString::null;
-	switch (type) {
-		case CReferenceManager::Bible:
-			description = CBTConfig::get( CBTConfig::standardBible );
-			break;
-		case CReferenceManager::Commentary:
-			description = CBTConfig::get( CBTConfig::standardCommentary );
-			break;			
-		case CReferenceManager::Lexicon:
-			description = CBTConfig::get( CBTConfig::standardLexicon );
-			break;			
-		case CReferenceManager::StrongsHebrew:
-			description = CBTConfig::get( CBTConfig::standardHebrewStrongsLexicon );
-			break;			
-		case CReferenceManager::StrongsGreek:
-			description = CBTConfig::get( CBTConfig::standardGreekStrongsLexicon );
-			break;			
-		case CReferenceManager::MorphHebrew:
-			description = CBTConfig::get( CBTConfig::standardHebrewMorphLexicon );
-			break;			
-		case CReferenceManager::MorphGreek:
-			description = CBTConfig::get( CBTConfig::standardGreekMorphLexicon );
-			break;			
-		default:
-//			qWarning("unknwon type");
-			description = QString::null;
-			break;			
-	}
-	if (!description.isEmpty())
-		return CSwordBackend::findModuleNameByDescription(description);
-	else
-		return QString::null;
-}
-
-/** No descriptions */
-CReferenceManager::Type CReferenceManager::typeFromModule( const CSwordModuleInfo::ModuleType type){
-	switch (type) {
-		case CSwordModuleInfo::Bible:
-			return CReferenceManager::Bible;
-		case CSwordModuleInfo::Commentary:
-			return CReferenceManager::Commentary;
-		case CSwordModuleInfo::Lexicon:
-			return CReferenceManager::Lexicon;
-    case CSwordModuleInfo::GenericBook:
-      return CReferenceManager::GenericBook;
-		default:
-			return CReferenceManager::Unknown;
-	}
-}
-
-/** Parses the given verse references using the given language and the module.*/
-const QString CReferenceManager::parseVerseReference( const QString ref, const QString& lang, const QString& newLang){
-	CSwordVerseKey key(0);
-	if (!lang.isEmpty()) {
-		key.setLocale( lang.latin1() );
-  }
-	
-	key.key(ref);
-	
-	if (!lang.isEmpty() && lang != newLang) {
-		key.setLocale(newLang.latin1());
-  }
-	return key.key();
-}
diff --git a/bibletime/backend/creferencemanager.h b/bibletime/backend/creferencemanager.h
deleted file mode 100644
index 661d955..0000000
--- a/bibletime/backend/creferencemanager.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/***************************************************************************
-                          creferencemanager.h  -  description
-                             -------------------
-    begin                : Sun Aug 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREFERENCEMANAGER_H
-#define CREFERENCEMANAGER_H
-
-//Qt includes
-#include <qstring.h>
-
-#include "cswordmoduleinfo.h"
-
-/**Contains static functions to compute with referneces used for Drag&Drop and for hyperlinks used in HTML.
-  *@author The BibleTime team
-  */
-class CReferenceManager {
-public:
-	enum Type {
-		Bible,
-		Commentary,
-		Lexicon,
-		GenericBook,
-		MorphHebrew,
-		MorphGreek,
-		StrongsHebrew,
-		StrongsGreek,
-		Unknown
-	};
-  /**
-	* Decodes the given hyperlink to module and key.
-	*/
-  static const bool decodeHyperlink( const QString& hyperlink, QString& module, QString& key,Type& type);
-  /**
-	* Returns a hyperlink used to be imbedded in the display windows.
-	* At the moment the format is sword://module/key
- 	*/
-  static const QString encodeHyperlink( const QString& module, const QString& key, const Type& type);
-  /**
-	* Puts a module Name and a Reference together in the 'draggable' form
-	* (module)reference
-	* @param module The name of the module
-	* @param reference The key reference as text
-	* @return The encoded reference using module and reference
-	* @author Martin Gruner
-	*/
-	static const QString encodeReference(const QString &module, const QString &reference);
-	/**
-	* decodes a 'draggable' reference into a modulename and a reference
-	* @author Martin Gruner
-	*/
-	static void decodeReference(QString &dragreference, QString &module, QString &reference);
-  /**
-  * Returns true if the parameter is a hyperlink.
-  */
-  static const bool isHyperlink( const QString& hyperlink );
-  /**
-  * Returns the preferred module name for the given type.
-  */
-  static const QString preferredModule( const Type type );
-  static CReferenceManager::Type typeFromModule( const CSwordModuleInfo::ModuleType type );
-  /** Parses the given verse references using the given language and the module.
-	* @param ref The verse refernce
-	* @param lang The language of the verse reference
-	* @param newLang The language of the reference, which will be returned. For example: If BibleTime using an english environment parses a spanish ref (lang=es) the returned ref should be in english (newLang=en), because his english standard module only understands en.
-	*/
-  static const QString parseVerseReference( const QString ref, const QString& lang = QString::null, const QString& newLang = "en");
-};
-
-#endif
-
diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp
deleted file mode 100644
index f355006..0000000
--- a/bibletime/backend/cswordbackend.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-/***************************************************************************
-                          cswordbackend.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordbackend.h"
-#include "centrydisplay.h"
-#include "cswordbiblemoduleinfo.h"
-#include "cswordcommentarymoduleinfo.h"
-#include "cswordlexiconmoduleinfo.h"
-#include "cswordbookmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-#include "bt_thmlhtml.h"
-#include "bt_osishtml.h"
-#include "bt_gbfhtml.h"
-#include <dirent.h>
-#include <unistd.h>
-
-//Qt includes
-#include <qdir.h>
-#include <qfileinfo.h>
-
-//KDE includes
-#include <klocale.h>
-
-//Sword includes
-#include <swdisp.h>
-#include <swfiltermgr.h>
-#include <encfiltmgr.h>
-#include <plainhtml.h>
-#include <rawgbf.h>
-#include <rtfhtml.h>
-#include <filemgr.h>
-#include <utilstr.h>
-
-using std::string;
-
-//static class-wide members
-static QMap<QString, QString> moduleDescriptionMap;
-
-CSwordBackend::CSwordBackend()
-	: sword::SWMgr(0, 0, false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ))
-{	
-	m_displays.entry = 0;
-	m_displays.chapter = 0;
-	m_displays.book = 0;
-
-	m_filters.gbf = 0;
-	m_filters.thml = 0;
-	m_filters.osis = 0;
-	m_filters.plain = 0;
-}
-
-CSwordBackend::CSwordBackend(const QString& path)
-	: sword::SWMgr((!path.isEmpty() ? path.local8Bit() : 0), false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ))
-{
-  qWarning("backend constructed with a path argument! %s", path.latin1());
-	m_displays.entry = 0;
-	m_displays.chapter = 0;
-	m_displays.book = 0;
-
-	m_filters.gbf = 0;
-	m_filters.thml = 0;
-	m_filters.osis = 0;
-	m_filters.plain = 0;
-}
-
-CSwordBackend::~CSwordBackend(){
-	shutdownModules();
-	delete m_filters.gbf;
-	delete m_filters.plain;
-	delete m_filters.thml;
-	delete m_filters.osis;
-
-  delete m_displays.book;
-  delete m_displays.chapter;
-  delete m_displays.entry;
-}
-
-/** Initializes the Sword modules. */
-const CSwordBackend::LoadError CSwordBackend::initModules() {
-//  qWarning("globalSwordConfigPath is %s", globalConfPath);
-	LoadError ret = NoError;
-
- 	shutdownModules(); //remove previous modules
- 	m_moduleList.clear();	
-
-	ret = LoadError( Load() );
-	for (sword::ModMap::iterator it = Modules.begin(); it != Modules.end(); it++) {
-		sword::SWModule* const curMod = (*it).second;
-		CSwordModuleInfo* newModule = 0;
-				
-		if (!strcmp(curMod->Type(), "Biblical Texts")) {
-			newModule = new CSwordBibleModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.chapter ? m_displays.chapter : (m_displays.chapter = new CChapterDisplay));
-		} else if (!strcmp(curMod->Type(), "Commentaries")) {
-			newModule = new CSwordCommentaryModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.entry ? m_displays.entry : (m_displays.entry = new CEntryDisplay));
-		} else if (!strcmp(curMod->Type(), "Lexicons / Dictionaries")) {
-			newModule = new CSwordLexiconModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.entry ? m_displays.entry : (m_displays.entry = new CEntryDisplay));
-		} else if (!strcmp(curMod->Type(), "Generic Books")) {
-			newModule = new CSwordBookModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.book ? m_displays.book : (m_displays.book = new CBookDisplay));
-		}
-		
-		if (newModule) {	//append the new modules to our list
-			m_moduleList.append( newModule );
-		}
-	}
-
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-		moduleDescriptionMap.insert(m_moduleList.current()->config(CSwordModuleInfo::Description), m_moduleList.current()->name());
-	}
-
-	//unlock modules if keys are present
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-		if ( m_moduleList.current()->isEncrypted() ){
-			const QString unlockKey = CBTConfig::getModuleEncryptionKey(m_moduleList.current()->name()).latin1();
-			if (!unlockKey.isNull()){
-  			setCipherKey( m_moduleList.current()->name().latin1(), unlockKey.latin1() );
-			}
-		}
-	}
-
-	return ret;
-}
-
-void CSwordBackend::AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap &section) {
-	sword::SWBuf sourceformat;
-	sword::SWBuf moduleDriver;
-	sword::ConfigEntMap::iterator entry;
-	bool noDriver = true;
-
-	sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
-	moduleDriver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
-
-	if (sourceformat == "GBF") {
-		if (!m_filters.gbf)
-			m_filters.gbf = new BT_GBFHTML();
-		module->AddRenderFilter(m_filters.gbf);
-		noDriver = false;
-	}
-
-	if (sourceformat == "PLAIN") {
-		if (!m_filters.plain)
-			m_filters.plain = new sword::PLAINHTML();	
-		module->AddRenderFilter(m_filters.plain);
-		noDriver = false;
-	}
-
-	if (sourceformat == "ThML") {
-		if (!m_filters.thml)
-			m_filters.thml = new BT_ThMLHTML();
-		module->AddRenderFilter(m_filters.thml);
-		noDriver = false;
-	}
-
-	if (sourceformat == "OSIS") {
-		if (!m_filters.osis)
-			m_filters.osis = new BT_OSISHTML();
-		module->AddRenderFilter(m_filters.osis);
-		noDriver = false;
-	}
-
-	if (noDriver){ //no driver found
-		if ( (moduleDriver == "RawCom") || (moduleDriver == "RawLD") ) {
-			if (!m_filters.plain)
-				m_filters.plain = new sword::PLAINHTML();
-			module->AddRenderFilter(m_filters.plain);
-			noDriver = false;
-		}
-	}
-}
-
-/** This function deinitializes the modules and deletes them. */
-const bool CSwordBackend::shutdownModules(){
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-		CSwordModuleInfo* current = m_moduleList.current();
-    m_moduleList.removeRef(current);
-		delete current;
-	}
-	m_moduleList.clear();
-
-  //BT  mods are deleted now, delete Sword mods, too.
-  DeleteMods();
-  
-	return true;
-}
-
-/** Returns true if the given option is enabled. */
-const bool CSwordBackend::isOptionEnabled( const CSwordBackend::FilterTypes type) {
-	return (getGlobalOption( optionName(type).latin1() ) == "On");
-}
-
-/** Sets the given options enabled or disabled depending on the second parameter. */
-void CSwordBackend::setOption( const CSwordBackend::FilterTypes type, const int state ){
-  sword::SWBuf value;
-	switch (type) {
-		case textualVariants:
-      if (state == 0) {
-        value = "Primary Reading";
-			}
-      else if (state == 1) {
-        value = "Secondary Reading";
-			}
-      else {
-        value = "All Readings";
-			}
-			break;
-
-		case transliteration:
-      if (useICU()) {
-        sword::StringList options = transliterator()->getOptionValues();
-        sword::StringList::iterator it = options.begin();
-        for (int index = state; (index > 0) && (it != options.end()); ++it) {
-          --index;
-        }
-        value = it->c_str();
-				qWarning("setting transliteration to %s", value.c_str());
-      }
-      break;
-
-		default:
-			value = state ? "On": "Off";
-			break;
-	};
-	if (value.length())
-    setGlobalOption(optionName(type).latin1(), value.c_str());
-}
-
-void CSwordBackend::setFilterOptions( const CSwordBackend::FilterOptions options){
-//  qWarning("CSwordBackend::setFilterOptions( const CSwordBackend::FilterOptions options)");
-  setOption( footnotes, 					options.footnotes );
-  setOption( strongNumbers, 			options.strongNumbers );
-  setOption( headings, 						options.headings );
-  setOption( morphTags, 					options.morphTags );
-	setOption( lemmas, 							options.lemmas );
-	setOption( hebrewPoints, 				options.hebrewPoints );
-	setOption( hebrewCantillation, 	options.hebrewCantillation );
-	setOption( greekAccents, 				options.greekAccents );
-	setOption( redLetterWords,			options.redLetterWords );	
-  setOption( textualVariants,			options.textualVariants );	
-	setOption( transliteration,			options.transliteration );	
-	setOption( scriptureReferences,	options.scriptureReferences);	
-}
-
-void CSwordBackend::setDisplayOptions( const CSwordBackend::DisplayOptions options){
-  if (m_displays.entry)
-		m_displays.entry->setDisplayOptions(options);	
-  if (m_displays.chapter)
-		m_displays.chapter->setDisplayOptions(options);	
-  if (m_displays.book)
-		m_displays.book->setDisplayOptions(options);
-}
-
-/** This function searches for a module with the specified description */
-CSwordModuleInfo* const CSwordBackend::findModuleByDescription(const QString& description){
-  if (m_moduleList.count())
-    for ( m_moduleList.first();m_moduleList.current();m_moduleList.next() )
-      if ( m_moduleList.current()->config(CSwordModuleInfo::Description) == description )
-        return m_moduleList.current();
-  return 0;
-}
-
-/** This function searches for a module with the specified description */
-const QString CSwordBackend::findModuleNameByDescription(const QString& description){
-	if (moduleDescriptionMap.contains(description)) {
-		return moduleDescriptionMap[description];
-  }
-  return QString::null;
-}
-
-/** This function searches for a module with the specified name */
-CSwordModuleInfo* const CSwordBackend::findModuleByName(const QString& name){
-  if (m_moduleList.count()) {
-    for ( m_moduleList.first(); m_moduleList.current(); m_moduleList.next() ) {
-      if ( m_moduleList.current()->name() == name ) {
-        return m_moduleList.current();
-      }
-    }
-  }
-  return 0;
-}
-
-CSwordModuleInfo* const CSwordBackend::findSwordModuleByPointer(const sword::SWModule* const swmodule){
-  if (swmodule) {
-    for ( m_moduleList.first(); m_moduleList.current(); m_moduleList.next() ) {
-      if ( m_moduleList.current()->module() == swmodule ) {
-        return m_moduleList.current();
-      }
-    }
-  }
-  return 0;
-}
-
-CSwordModuleInfo* const CSwordBackend::findModuleByPointer(const CSwordModuleInfo* const module){
-  if (module) {
-    for ( m_moduleList.first(); m_moduleList.current(); m_moduleList.next() ) {
-      if ( m_moduleList.current() == module ) {
-        return m_moduleList.current();
-      }
-    }
-  }
-  return 0;
-}
-
-/** Returns our local config object to store the cipher keys etc. locally for each user. The values of the config are merged with the global config. */
-const bool CSwordBackend::moduleConfig(const QString& module, sword::SWConfig& moduleConfig) {
-	sword::SectionMap::iterator section;
-	DIR *dir = opendir(configPath);
-	struct dirent *ent;
-	
-	bool foundConfig = false;	
-	QString modFile;	
-	if (dir) {    // find and update .conf file
-		rewinddir(dir);
-		while ((ent = readdir(dir)) && !foundConfig) {
-			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {								
-				modFile = QString::fromLocal8Bit(configPath);
-				modFile += QString::fromLatin1("/");
-				modFile += QString::fromLocal8Bit(ent->d_name);
-				moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() );
-				section =	moduleConfig.Sections.find( (const char*)module.local8Bit() );
-				foundConfig = ( section != moduleConfig.Sections.end() );
-			}
-		}
-		closedir(dir);
-	}
-	else { //try to read mods.conf
-		//moduleConfig = SWConfig( configPath + "/mods.conf" );
-		moduleConfig = sword::SWConfig("");//global config		
-		section =	config->Sections.find( (const char*)module.local8Bit() );		
-		foundConfig = ( section != config->Sections.end() );		
-		
-		sword::ConfigEntMap::iterator entry;
-		if (foundConfig) { //copy module section
-			for (entry = (*section).second.begin(); entry != (*section).second.end(); entry++) {
-					moduleConfig.Sections[(*section).first].insert(sword::ConfigEntMap::value_type((*entry).first, (*entry).second));
-			}
-		}			
-	}
-	
-	if (!foundConfig && configType != 2) { //search in $HOME/.sword/
-		QString myPath = QString::fromLatin1("%1/.sword/mods.d").arg(getenv("HOME"));
-		dir = opendir(myPath.latin1());
-		if (dir) {
-			rewinddir(dir);
-			while ((ent = readdir(dir)) && !foundConfig) {
-				if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {								
-					modFile = myPath;
-					modFile += "/";
-					modFile += ent->d_name;
-					moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() );
-					section =	moduleConfig.Sections.find( (const char*)module.local8Bit() );
-					foundConfig = ( section != moduleConfig.Sections.end() );
-				}
-			}
-			closedir(dir);
-		}
-	}
-	return foundConfig;
-}
-
-/** Returns the text used for the option given as parameter. */
-const QString CSwordBackend::optionName( const CSwordBackend::FilterTypes option ){
-	switch (option) {
-		case CSwordBackend::footnotes:
-			return QString::fromLatin1("Footnotes");
-		case CSwordBackend::strongNumbers:
-			return QString::fromLatin1("Strong's Numbers");
-		case CSwordBackend::headings:
-			return QString::fromLatin1("Headings");
-		case CSwordBackend::morphTags:
-			return QString::fromLatin1("Morphological Tags");
-  	case CSwordBackend::lemmas:
-			return QString::fromLatin1("Lemmas");
-		case CSwordBackend::hebrewPoints:
-			return QString::fromLatin1("Hebrew Vowel Points");
-		case CSwordBackend::hebrewCantillation:
-			return QString::fromLatin1("Hebrew Cantillation");
-		case CSwordBackend::greekAccents:
-			return QString::fromLatin1("Greek Accents");
-		case CSwordBackend::redLetterWords:
-			return QString::fromLatin1("Words of Christ in Red");
-    case CSwordBackend::textualVariants:
-			return QString::fromLatin1("Textual Variants");	
-		case CSwordBackend::scriptureReferences:
-			return QString::fromLatin1("Cross-references");
-		case CSwordBackend::transliteration:
-			return QString::fromLatin1("Transliteration");
-	}
-	return QString::null;	
-}
-
-/** Returns the translated name of the option given as parameter. */
-const QString CSwordBackend::translatedOptionName(const CSwordBackend::FilterTypes option){
-	switch (option) {
-		case CSwordBackend::footnotes:
-			return i18n("Footnotes");
-		case CSwordBackend::strongNumbers:
-			return i18n("Strong's Numbers");
-		case CSwordBackend::headings:
-			return i18n("Headings");
-		case CSwordBackend::morphTags:
-			return i18n("Morphological Tags");
-  	case CSwordBackend::lemmas:
-			return i18n("Lemmas");
-		case CSwordBackend::hebrewPoints:
-			return i18n("Hebrew Vowel Points");
-		case CSwordBackend::hebrewCantillation:
-			return i18n("Hebrew Cantillation");
-		case CSwordBackend::greekAccents:
-			return i18n("Greek Accents");
-		case CSwordBackend::redLetterWords:
-			return i18n("Red letter words");
-		case CSwordBackend::textualVariants:
-			return i18n("Textual Variants");
-		case CSwordBackend::scriptureReferences:
-			return i18n("Scripture Cross-references");	
-		case CSwordBackend::transliteration:
-			return i18n("Transliteration between scripts");	
-	}
-	return QString::null;
-}
-
-
-const QString CSwordBackend::configOptionName( const CSwordBackend::FilterTypes option ){
-	switch (option) {
-		case CSwordBackend::footnotes:
-			return QString::fromLatin1("Footnotes");         
-		case CSwordBackend::strongNumbers:
-			return QString::fromLatin1("Strongs");
-		case CSwordBackend::headings:
-			return QString::fromLatin1("Headings");
-		case CSwordBackend::morphTags:
-			return QString::fromLatin1("Morph");
-  	case CSwordBackend::lemmas:
-			return QString::fromLatin1("Lemma");
-		case CSwordBackend::hebrewPoints:
-			return QString::fromLatin1("HebrewPoints");
-		case CSwordBackend::hebrewCantillation:
-			return QString::fromLatin1("Cantillation");
-		case CSwordBackend::greekAccents:
-			return QString::fromLatin1("GreekAccents");
-		case CSwordBackend::redLetterWords:
-			return QString::fromLatin1("RedLetterWords");
-		case CSwordBackend::textualVariants:
-			return QString::fromLatin1("Variants");
-		case CSwordBackend::scriptureReferences:
-			return QString::fromLatin1("Scripref");
-    default:
-      return QString::null;
-	}
-	return QString::null;	
-}
-
-const QString CSwordBackend::booknameLanguage( const QString& language ) {
-	if (!language.isNull())
-		sword::LocaleMgr::systemLocaleMgr.setDefaultLocaleName( language.local8Bit() );
-	return QString::fromLatin1(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
-}
-
-/** Returns the version of the Sword library. */
-const sword::SWVersion CSwordBackend::Version() {
-	return sword::SWVersion::currentVersion;
-}
-
-/** Returns our transliterator object we use. Returns 0 if ICU is not used. */
-sword::SWFilter* const CSwordBackend::transliterator() {
-  if (!useICU())
-    return 0;
-  if (sword::SWFilter* filter = optionFilters["UTF8Transliterator"])
-    return filter;
-  return 0;
-}
-
-/** Returns true if ICU is being used. */
-const bool CSwordBackend::useICU() const{
-  return SWMgr::isICU;
-}
-
-/** Reload all Sword modules. */
-void CSwordBackend::reloadModules(){
-  shutdownModules();
-  
-  //delete Sword's config to make Sword reload it!
-  if (myconfig) { // force reload on config object because we may have changed the paths
-    delete myconfig;
-    config = myconfig = 0;
-    loadConfigDir(configPath);
-  }
-  else if (config) {
-    config->Load();
-  }
-  initModules();
-}
-
-const QStringList CSwordBackend::swordDirList(){
-  QStringList ret;
-	const QString home = getenv("HOME");
-
-  //return a list of used Sword dirs. Useful for the installer
-  QString configPath;
-	if (!home.isEmpty())
-		configPath = home + "/.sword/sword.conf";
-	else
-		configPath = globalConfPath; //e.g. /etc/sword.conf, /usr/local/etc/sword.conf
-
-
-  QStringList configs = QStringList::split(":", configPath);
-  for (QStringList::iterator it = configs.begin(); it != configs.end(); ++it) {
-    if (!QFileInfo(*it).exists())
-      continue;
-
-    //get all DataPath and AugmentPath entries from the config file and add them to the list
-    sword::SWConfig conf( (*it).latin1() );
-
-    ret << conf["Install"]["DataPath"].c_str();
-    sword::ConfigEntMap group = conf["Install"];
-    sword::ConfigEntMap::iterator start = group.equal_range("AugmentPath").first;
-    sword::ConfigEntMap::iterator end = group.equal_range("AugmentPath").second;
-
-    for (sword::ConfigEntMap::iterator it = start; it != end; ++it) {
-      ret << it->second.c_str(); //added augment path
-    }
-  }
-
-  if (!home.isEmpty()) {
-    ret << home + "/.sword/";
-  }
-
-  return ret;
-}
diff --git a/bibletime/backend/cswordbackend.h b/bibletime/backend/cswordbackend.h
deleted file mode 100644
index 83bfd0a..0000000
--- a/bibletime/backend/cswordbackend.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/***************************************************************************
-                          cswordbackend.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDBACKEND_H
-#define CSWORDBACKEND_H
-
-//BibleTime includes
-//#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qptrlist.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-
-//Sword includes
-#include <swmgr.h>
-#include <swmodule.h>
-#include <swversion.h>
-#include <localemgr.h>
-
-class CEntryDisplay;
-class CChapterDisplay;
-class CBookDisplay;
-
-class CSwordModuleInfo;
-typedef QPtrList<CSwordModuleInfo>	ListCSwordModuleInfo;
-
-/**
-	* This is the implementation of CBackend for Sword. It's additionally derived from SWMgr
-	*	to provide functions of Sword.	
-  *
-  *	@short The backend implementation of Sword
-  *	@author The BibleTime team
-  * @version $Id: cswordbackend.h,v 1.37 2003/10/02 20:37:41 joachim Exp $
-  */
-class CSwordBackend : public sword::SWMgr {
-public:
-  /**
- 	* These are the options which could be supported by modules and by this backend.
- 	* It's used in @ref isOptionEnabled and @ref setOption
- 	*/
-  enum FilterTypes {
-  	footnotes,
-  	strongNumbers,
-  	headings,
-  	morphTags,
-		lemmas,
-		hebrewPoints,
-		hebrewCantillation,
-		greekAccents,
-    scriptureReferences,
-    redLetterWords,
-    textualVariants,
-		filterTypesMIN = footnotes,
-		filterTypesMAX = textualVariants,
-
-    /* The following are handled in a special way */
-    transliteration
-	};
-
-  struct FilterOptions {
-  	int footnotes;
-  	int strongNumbers;
-  	int headings;
-  	int morphTags;
-		int lemmas;
-		int hebrewPoints;
-		int hebrewCantillation;
-		int greekAccents;
-		int textualVariants;
-    int redLetterWords;
-    int scriptureReferences;
-    int transliteration;
-	};
-	struct DisplayOptions {
-		int lineBreaks;
-		int verseNumbers;
-	};
-  enum LoadError { // the values exist to cast from the char return of SWMgr::Load
-		NoSwordConfig = -1,
-		NoError = 0,
-		NoModules = 1
-  };
-	/**
-	* The constructor of the Sword backend.
-	* It creates the SWModule objects using SWMgr's methods, it adds the necessary
-	* filters for the module format.
-	*/
-	CSwordBackend();
-	CSwordBackend( const QString& path );
-  
-	/**
-	* The destrctor of this backend. This function shuts the modules down using @ref shutdownModules.
-	*/
-	virtual ~CSwordBackend();
-  /**
-  * This function returns the list of available modules managed by this backend.
-  *	You have to call initModules() first;
-  *	
-  *	@return The list of modules managed by this backend
-  */
-  virtual ListCSwordModuleInfo& moduleList();
-  /**
-  * Initializes the Sword modules.
-  *
-  *	@return True if the initializiation was succesful, otherwise return false.
-  */
-  virtual const CSwordBackend::LoadError initModules();
-  /**
-  * This function deinitializes the modules and deletes them.
-  *
-  *	@return True if it was succesful, otherwise return false
-  */
-  virtual const bool shutdownModules();
-  /**
-  * Sets the given options enabled or disabled depending on the second parameter.
-  *
-  * @param type This is the type this function should set enabled or disabled
-  * @param enable If this is true the option will be enabled, otherwise it will be disabled.
-  */
-  void setOption( const CSwordBackend::FilterTypes type, const int state );
-  void setFilterOptions( const CSwordBackend::FilterOptions options );
-  void setDisplayOptions( const CSwordBackend::DisplayOptions options );
-  /**
-  * Returns true if the given option is enabled.
-  *
-  * @return Returns true if the options given as aparameter is switched on at this time, otherwise return false.
-  */
-  virtual const bool isOptionEnabled( const CSwordBackend::FilterTypes type);
-  /**
-  * Sets the language for the international booknames of Sword.
-  */
-  const QString booknameLanguage( const QString& = QString::null );
-  /**
-  * This function searches for a module with the specified description
-  * @param description The description of the desired module
-  * @return pointer to the desired module; null if no module has the specified description
-  */
-  virtual CSwordModuleInfo* const findModuleByDescription(const QString& description);
-  /**
-  * This function searches for a module with the specified description
-  * @param description The description of the desired module
-  * @return pointer to the desired module; null if no module has the specified description
-  */
-  static const QString findModuleNameByDescription(const QString& description);
-  /**
-  * This function searches for a module with the specified name
-  * @param description The name of the desired module
-  * @return pointer to the desired module; null if no module has the specified name
-  */
-  CSwordModuleInfo* const findModuleByName(const QString& name);
-  /**
-  * This function searches for a module with the specified sword module as module() object!
-  * @param pointer to a Sword module
-  * @return pointer to the desired module; null if no module has the specified name
-  */
-  CSwordModuleInfo* const findSwordModuleByPointer(const sword::SWModule* const swmodule);
-  CSwordModuleInfo* const findModuleByPointer(const CSwordModuleInfo* const module);
-  /**
-  * @return Our global config object to store the cipher keys etc.
-	*/
-  sword::SWConfig* const getConfig() const;
-  /**
-  * Tries to find the config object for the module. The second paramter will be the found config.
-  * @return True if the config was found, false if not. If false is returned the moduleConfig object is in undefined/unknwon state.
-	*/
-  const bool moduleConfig(const QString& module, sword::SWConfig& moduleConfig);
-  /**
-  * Returns the text used for the option given as parameter.
-  */
-  static const QString optionName( const CSwordBackend::FilterTypes option);
-  /**
-  * Returns the text used for the option given as parameter.
-  */
-  static const QString configOptionName( const CSwordBackend::FilterTypes option);
-  /**
-	* Returns the translated name of the option given as parameter.
-	*/
-  static const QString translatedOptionName(const CSwordBackend::FilterTypes option);
-  /**
-  * Returns the version of the Sword library.
-  */
-  virtual const sword::SWVersion Version();
-  /**
-  * Returns our transliterator object we use. Returns 0 if ICU is not used.
-  */
-  sword::SWFilter* const transliterator();
-  /** Returns true if ICU is being used. */
-  const bool useICU() const;
-  /**
-  * Reload all Sword modules.
-  */
-  void reloadModules();
-
-  /**
-  * Reload all Sword modules.
-  */
-  const QStringList swordDirList();
-	
-protected:
-	/**
-	* Adds a render filter to the module.
-	* @param module Add a render filter to this module!
-	*/
-	virtual void AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap &section);
-	
-private:
-	//filters
-	struct {
-		sword::SWFilter *gbf;
-		sword::SWFilter *plain;
-		sword::SWFilter *thml;
- 		sword::SWFilter *osis;
-	} m_filters;
-	ListCSwordModuleInfo m_moduleList;
-
-	struct {
-		CChapterDisplay* 	chapter;
-		CEntryDisplay* 		entry;
-		CBookDisplay* 		book;
-	} m_displays;
-};
-
-/**Returns The list of modules managed by this backend*/
-inline ListCSwordModuleInfo& CSwordBackend::moduleList() {
-	return m_moduleList;
-}
-
-/** Returns our local config object to store the cipher keys etc. locally for each user. The values of the config are merged with the global config. */
-inline sword::SWConfig* const CSwordBackend::getConfig() const {
-	return config;
-}
-
-#endif
diff --git a/bibletime/backend/cswordbiblemoduleinfo.cpp b/bibletime/backend/cswordbiblemoduleinfo.cpp
deleted file mode 100644
index 7172d1f..0000000
--- a/bibletime/backend/cswordbiblemoduleinfo.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/***************************************************************************
-                          cswordbiblemoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordbiblemoduleinfo.h"
-#include "cswordversekey.h"
-
-//Qt includes
-#include <qfile.h>
-
-//Sword includes
-#include <versekey.h>
-
-static sword::VerseKey staticKey;
-
-CSwordBibleModuleInfo::CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend )
-	: CSwordModuleInfo(module, usedBackend),
-    m_lowerBound(0),
-    m_upperBound(0),
-	  m_bookList(0),
-	  m_cachedLocale("unknown"),
-	  m_hasOT(-1),
-    m_hasNT(-1)
-{
-
-
-}
-
-CSwordBibleModuleInfo::CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m ) :
-  CSwordModuleInfo(m),
-  m_lowerBound(0),
-  m_upperBound(0),
-  m_bookList(0)
-{
-	if (m.m_bookList) {
-		m_bookList = new QStringList();
-		*m_bookList = *m.m_bookList;
-	}	
-	m_hasOT = m.m_hasOT;
-	m_hasNT = m.m_hasNT;
-	m_cachedLocale = m.m_cachedLocale;
-}
-
-CSwordModuleInfo* CSwordBibleModuleInfo::clone(){
-	return new CSwordBibleModuleInfo(*this);
-}
-
-CSwordBibleModuleInfo::~CSwordBibleModuleInfo(){
-	delete m_bookList;
-}
-
-void CSwordBibleModuleInfo::initBounds() {
-	if (m_hasOT == -1)
-		m_hasOT = hasTestament(OldTestament);
-	if (m_hasNT == -1)
-		m_hasNT = hasTestament(NewTestament);
-
-	if (m_hasOT)
-		m_lowerBound.key("Genesis 1:1");
-	else
-		m_lowerBound.key("Matthew 1:1");
-	if (!m_hasNT)
-		m_upperBound.key("Malachi 4:6");
-	else
-		m_upperBound.key("Revelation of John 22:21");
-}
-
-
-/** Returns the books available in this module */
-QStringList* const CSwordBibleModuleInfo::books() {
-	if (m_cachedLocale != backend()->booknameLanguage()){	//if the locale has changed
-		delete m_bookList;
-		m_bookList = 0;
-	}
-
-	if (!m_bookList) {
-		m_bookList = new QStringList();
-
-		initBounds();
-		int min = 0;
-		int max = 1;
-		//find out if we have ot and nt, only ot or only nt
-		if (m_hasOT>0 && m_hasNT>0) { //both
-			min = 0;
-			max = 1;
-		}
-		else if (m_hasOT>0 && !m_hasNT) { //only OT
-			min = 0;
-			max = 0;
-		}
-		else if (!m_hasOT && m_hasNT>0) { //only NT
-			min = 1;
-			max = 1;
-		}
-		else if (!m_hasOT && !m_hasNT) { //somethings wrong here! - no OT and no NT
-			qWarning("CSwordBibleModuleInfo (%s) no OT and not NT! Check your config!", module()->Name());
-			min = 0;
-			max = -1;
-		}
-
-		staticKey.setLocale(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
-		for (int i = min; i <= max; ++i) {
-			for ( int j = 0; j < staticKey.BMAX[i]; ++j) {
-//			if (backend()->useICU())
-//      	m_bookList->append( QString::fromUtf8(staticKey.books[i][j].name) );
-//      else
-        m_bookList->append( QString::fromLocal8Bit(staticKey.books[i][j].name) );
-			}
-		}
-		m_cachedLocale = backend()->booknameLanguage();
-	}
-	return m_bookList;
-}
-
-/** Returns the number of chapters for the given book. */
-const unsigned int CSwordBibleModuleInfo::chapterCount(const unsigned int book) {
-	int result = 0;
- 	if ( (book >= 1) && book <= (unsigned int)staticKey.BMAX[0] && hasTestament(OldTestament)) {		//Is the book in the old testament?
-     result = (staticKey.books[0][book-1].chapmax);
- 	}
- 	else if ((book >= 1) && (book - staticKey.BMAX[0]) <= (unsigned int)staticKey.BMAX[1] && hasTestament(NewTestament) ) {	//is the book in the new testament?
- 	 	result = (staticKey.books[1][book-1-staticKey.BMAX[0]].chapmax);
- 	}
-	return result;
-}
-
-const unsigned int CSwordBibleModuleInfo::chapterCount(const QString& book) {
-  return chapterCount( bookNumber(book) );
-}
-
-/** Returns the number of verses  for the given chapter. */
-
-const unsigned int CSwordBibleModuleInfo::verseCount( const unsigned int book, const unsigned int chapter ) {
-	unsigned int result = 0;
-
- 	if (book>=1 && (book <= (unsigned int)staticKey.BMAX[0]) && hasTestament(OldTestament) ) { //Is the book in the old testament?
- 		if (chapter <= chapterCount(book) )	//does the chapter exist?
- 			result = (staticKey.books[0][book-1].versemax[chapter-1]);
- 	}
- 	else if (book>=1 && (book - staticKey.BMAX[0]) <= (unsigned int)staticKey.BMAX[1] && hasTestament(NewTestament)) {	//is the book in the new testament?
- 		if (chapter <= chapterCount(book) )	//does the chapter exist?
- 			result = staticKey.books[1][book-1-staticKey.BMAX[0]].versemax[chapter-1];
- 	}
-	return result;
-}
-
-const unsigned int CSwordBibleModuleInfo::verseCount( const QString& book, const unsigned int chapter ) {
-//  qWarning("book is %s", book.latin1());
-  return verseCount( bookNumber(book), chapter );
-}
-
-const unsigned int CSwordBibleModuleInfo::bookNumber(const QString &book){
-	unsigned int bookNumber = 0;
-	bool found = false;
-	staticKey.setLocale(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
-	int min = 0;
-	int max = 1;
-
-	//find out if we have ot and nt, only ot or only nt
-	initBounds();
-	if ((m_hasOT>0 && m_hasNT>0) || (m_hasOT == m_hasNT == -1)) {
-		min = 0;
-		max = 1;
-		bookNumber = 0;
-	}
-	else if (m_hasOT>0 && !m_hasNT) {
-		min = 0;
-		max = 0;
-		bookNumber = 0;
-	}
-	else if (!m_hasOT && m_hasNT>0) {
-		min = 1;
-		max = 1;
-		bookNumber = staticKey.BMAX[0];
-	}
-	else if (!m_hasOT && !m_hasNT) {
-		min = 0;
-		max = -1; //no loop
-		bookNumber = 0;
-	}
-
-	for (int i = min; i <= max && !found; ++i) {
-		for ( int j = 0; j < staticKey.BMAX[i] && !found; ++j) {
-			++bookNumber;
-			if (book == QString::fromLocal8Bit( staticKey.books[i][j].name) )
-//			if (book == QString::fromUtf8( staticKey.books[i][j].name) )
-				found = true;
-		}
-	}
-	return bookNumber;
-}
-
-/** Returns true if his module has the text of desired type of testament */
-const bool CSwordBibleModuleInfo::hasTestament( CSwordBibleModuleInfo::Testament type ) {
-  if (m_hasOT == -1 || m_hasNT == -1) {
-    module()->setSkipConsecutiveLinks(true);
-		*module() = sword::TOP; //position to first entry
-		sword::VerseKey key( module()->KeyText() );
-		if (key.Testament() == 1) { // OT && NT
-			m_hasOT = 1;
-		}
-		else if (key.Testament() == 2) { //no OT
-			m_hasOT = 0;
-		}
-
-		*module() = sword::BOTTOM;
-		key = module()->KeyText();
-		if (key.Testament() == 1) { // only OT, no NT
-			m_hasNT = 0;
-		}
-		else if (key.Testament() == 2) { //has NT
-			m_hasNT = 1;
-		}
-    module()->setSkipConsecutiveLinks(false);
-	}
-
-	switch (type) {
-		case OldTestament:
-			return m_hasOT>0;
-		case NewTestament:
-			return m_hasNT>0;
-
-		default:
-			return false;
-	}
-}
-
-/** Returns the key which represents the lower bound of this module. */
-CSwordVerseKey CSwordBibleModuleInfo::lowerBound() {
-	initBounds();
-  return m_lowerBound;
-}
-
-/** Returns the key which represents the lower bound of this module. */
-CSwordVerseKey CSwordBibleModuleInfo::upperBound() {
-	initBounds();
-  return m_upperBound;
-}
diff --git a/bibletime/backend/cswordbiblemoduleinfo.h b/bibletime/backend/cswordbiblemoduleinfo.h
deleted file mode 100644
index 0067def..0000000
--- a/bibletime/backend/cswordbiblemoduleinfo.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************
-                          cswordbiblemoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDBIBLEMODULEINFO_H
-#define CSWORDBIBLEMODULEINFO_H
-
-//own includes
-#include "cswordmoduleinfo.h"
-#include "cswordversekey.h"
-
-//Qt includes
-#include <qstringlist.h>
-
-//Sword includes
-
-
-/**
-	* This is the CModuleInfo imlementation for Bible modules managed by Sword.
-	*	
-	*	@short Implementation for Sword Bibles
-  *	@author The BibleTime team
-  * @version $Id: cswordbiblemoduleinfo.h,v 1.12 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordBibleModuleInfo : public CSwordModuleInfo  {
-public:
-	enum Testament {
-		OldTestament = 1,
-		NewTestament = 2
-	};
-
-	/**
-	* The constructor of this class
-	*/
-	CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend()  );
-	CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m );
-	/**
-	* The destructor of this class
-	*/
-	~CSwordBibleModuleInfo();
-  /**
- 	* Returns the number of avalable verses for the given chapter and book.
- 	*
- 	* @param book The book we should use
- 	* @param chapter The chapter we should use
- 	* @return The number of verses for the given book and chapter
- 	*/
-  virtual const unsigned int verseCount( const unsigned int book, const unsigned int chapter );
-  virtual const unsigned int verseCount( const QString& book, const unsigned int chapter );
-  /**
- 	* @return The number of available chapters of the given book.
- 	* @return The number of chapters for the given book
- 	*/
-  virtual const unsigned int chapterCount( const unsigned int book );
-  /**
- 	* @return The number of available chapters of the given book.
- 	* @return The number of chapters for the given book
- 	*/
-  virtual const unsigned int chapterCount( const QString& book );
-  /** Return all book of this module.
-  * @return A QStringList containing the books which are available in this module.
-  */
-  virtual QStringList* const books();
-  /**
-  * Reimplementation, Returns the type
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * @return the book number, values starting with 1; 0 if not found
-  */
-  const unsigned int bookNumber(const QString &book);
-  /**
-  * Returns true if his module has the text of desired type of testament
-  */
-  const bool hasTestament( CSwordBibleModuleInfo::Testament );
-  virtual CSwordModuleInfo* clone();
-  /**
-  * Returns the key which represents the lower bound of this module.
-  */
-  CSwordVerseKey lowerBound();
-  /**
-  * Returns the key which represents the upper bound of this module.
-  */
-  CSwordVerseKey upperBound();
-
-private:
-	void initBounds();
-
-  CSwordVerseKey m_lowerBound;
-  CSwordVerseKey m_upperBound;
-
-  QStringList*	m_bookList;	//This booklist is cached
-	QString m_cachedLocale;
-	short int m_hasOT;
-	short int m_hasNT;
-};
-
-inline const CSwordModuleInfo::ModuleType CSwordBibleModuleInfo::type() const {
-	return CSwordModuleInfo::Bible;
-}
-
-
-#endif
diff --git a/bibletime/backend/cswordbookmoduleinfo.cpp b/bibletime/backend/cswordbookmoduleinfo.cpp
deleted file mode 100644
index ad4d13d..0000000
--- a/bibletime/backend/cswordbookmoduleinfo.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************
-                          cswordbookmoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordbookmoduleinfo.h"
-#include "cswordtreekey.h"
-
-//Sword includes
-#include <treekeyidx.h>
-#include <treekey.h>
-
-#include <iostream>
-#include <string>
-using std::cout;
-using std::endl;
-
-CSwordBookModuleInfo::CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend ) 
-	: CSwordModuleInfo(module, usedBackend),
-		m_depth(-1) 
-{
-
-}
-
-CSwordBookModuleInfo::CSwordBookModuleInfo( const CSwordBookModuleInfo& module )
-	: CSwordModuleInfo(module)
-{
-	m_depth = module.m_depth;
-}	
-
-CSwordBookModuleInfo::~CSwordBookModuleInfo(){
-}
-
-const int CSwordBookModuleInfo::depth() {
-	if (m_depth == -1) {
-  	sword::TreeKeyIdx* key = tree();
-  	if (key) {
-    	key->root();
-			computeDepth(key, 0);
-		}
-	}
-	return m_depth;
-}
-
-void CSwordBookModuleInfo::computeDepth(sword::TreeKeyIdx* key, int level ){
-  std::string savedKey;
-  savedKey = key->getFullName();
-  if (level > m_depth) {
-		m_depth = level;
-  }
-
-  if (key->hasChildren()) {
-    key->firstChild();
-    computeDepth(key, level+1);
-    
-    key->setText( savedKey.c_str() );//return to the initial value    
-  }
-  if (key->nextSibling()) {
-		computeDepth(key, level);
-  }
-}
-
-/** Returns a treekey filled with the structure of this module */
-sword::TreeKeyIdx* const  CSwordBookModuleInfo::tree() const {
-	sword::TreeKeyIdx* treeKey = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey*)*(module()));
-  Q_ASSERT(treeKey);
-	return treeKey;
-}
diff --git a/bibletime/backend/cswordbookmoduleinfo.h b/bibletime/backend/cswordbookmoduleinfo.h
deleted file mode 100644
index 0d65231..0000000
--- a/bibletime/backend/cswordbookmoduleinfo.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
-                          cswordbookmoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDGENBOOKMODULEINFO_H
-#define CSWORDGENBOOKMODULEINFO_H
-
-//BibleTime includes
-#include "cswordmoduleinfo.h"
-
-//Sword includes
-#include <treekeyidx.h>
-
-
-/** Class for generic book support
-  * @author The BibleTime team
-  */
-class CSwordBookModuleInfo : public CSwordModuleInfo  {
-public: 
-	CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-	CSwordBookModuleInfo( const CSwordBookModuleInfo& m );	
-	~CSwordBookModuleInfo();
-  /**
-  * Returns the type of the module.
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Returns the maximal depth of sections and subsections.
-  */
-  const int depth();
-  /**
-  * @return A treekey filled with the structure of this module. Don't delete the returned key because it's casted from the module object.
-  */
-  sword::TreeKeyIdx* const tree() const;
-
-private:
-  /**
-  * A recursive helper function to help computng the module depth!
-  */
-  void computeDepth(sword::TreeKeyIdx* key, int level = 0 );	
-	int m_depth;
-};
-
-inline const CSwordBookModuleInfo::ModuleType CSwordBookModuleInfo::type() const {
-	return CSwordModuleInfo::GenericBook;
-}
-
-
-#endif
diff --git a/bibletime/backend/cswordcommentarymoduleinfo.cpp b/bibletime/backend/cswordcommentarymoduleinfo.cpp
deleted file mode 100644
index 54e2ad0..0000000
--- a/bibletime/backend/cswordcommentarymoduleinfo.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
-                          cswordcommentarymoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cswordcommentarymoduleinfo.h"
-
-#include <string>
-
-CSwordCommentaryModuleInfo::CSwordCommentaryModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend)
-	: CSwordBibleModuleInfo(module, usedBackend) 
-{	
-
-}
-
-CSwordCommentaryModuleInfo::~CSwordCommentaryModuleInfo(){
-
-}
-
-/** No descriptions */
-CSwordModuleInfo* CSwordCommentaryModuleInfo::clone(){
-	return new CSwordCommentaryModuleInfo(*this);
-}
-
-/** Returns true if this module may be written by the write display windows. */
-const bool CSwordCommentaryModuleInfo::isWritable(){
-//  qWarning(module()->getConfigEntry("ModDrv"));
-  //a module is only writable if it's a RawFiles module with writable returning true
-  if ( (std::string(module()->getConfigEntry("ModDrv")) == std::string("RawFiles")) && module()->isWritable()) {
-    return true;
-  };
-  return false;
-}
diff --git a/bibletime/backend/cswordcommentarymoduleinfo.h b/bibletime/backend/cswordcommentarymoduleinfo.h
deleted file mode 100644
index 4af59aa..0000000
--- a/bibletime/backend/cswordcommentarymoduleinfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
-                          cswordcommentarymoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDCOMMENTARYMODULEINFO_H
-#define CSWORDCOMMENTARYMODULEINFO_H
-
-//own includes
-#include "cswordbiblemoduleinfo.h"
-
-/**
-  * @author The BibleTime team
-  * @version $Id: cswordcommentarymoduleinfo.h,v 1.7 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordCommentaryModuleInfo : public CSwordBibleModuleInfo  {
-public:
-	CSwordCommentaryModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-	~CSwordCommentaryModuleInfo();
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  virtual CSwordModuleInfo* clone();
-  /**
-  * Returns true if this module may be written by the write display windows.
-  */
-  virtual const bool isWritable();
-};
-
-/** No descriptions */
-inline const CSwordModuleInfo::ModuleType CSwordCommentaryModuleInfo::type() const{
-	return CSwordModuleInfo::Commentary;
-}
-
-#endif
diff --git a/bibletime/backend/cswordkey.cpp b/bibletime/backend/cswordkey.cpp
deleted file mode 100644
index edbd6e6..0000000
--- a/bibletime/backend/cswordkey.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
-                          cswordkey.cpp  -  description
-                             -------------------
-    begin                : Thu May 24 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-//own includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-#include "cswordversekey.h"
-#include "cswordldkey.h"
-#include "cswordtreekey.h"
-
-//Sword includes
-#include <swmodule.h>
-#include <swkey.h>
-#include <versekey.h>
-#include <treekey.h>
-#include <treekeyidx.h>
-
-
-CSwordKey::CSwordKey(CSwordModuleInfo* module) : m_module(module) {
-}
-
-CSwordKey::CSwordKey(const CSwordKey& k) {
-	m_module = k.m_module;
-}
-
-CSwordModuleInfo* const CSwordKey::module(CSwordModuleInfo* const newModule) {
-	if (newModule)
-		m_module = newModule;
-	return m_module;
-}
-
-const QString CSwordKey::rawText() {
-  if (!m_module) {
-		return QString::null;
-	}
-
-	if (sword::SWKey* k = dynamic_cast<sword::SWKey*>(this)) {
-    m_module->module()->SetKey(k);
-	}
-  if (key().isNull()) {
-    return QString::null;
-  }
-  return QString::fromUtf8(m_module->module()->getRawEntry());
-}
-
-const QString CSwordKey::renderedText( const CSwordKey::TextRenderType mode) {
-//	qWarning("const QString CSwordKey::renderedText()");
-  if (!m_module)
-		return QString::null;
-
-	if (sword::SWKey* k = dynamic_cast<sword::SWKey*>(this)) {
-    m_module->module()->SetKey(k);
-	}
-  if (!key().isNull()) {
-    //we have valid text
-    const QString text = QString::fromUtf8(m_module->module()->RenderText());
-    if (mode == HTMLEscaped) {
-      //we have to encode all UTF-8 in HTML escapes
-      // go though every character and write down the escaped HTML unicode entity
-      // form is &#<decimal unicode value here>;
-      QString ret;
-      QChar c;
-      const unsigned int length = text.length();
-      for (unsigned int i = 0; i < length; ++i) {
-        c = text.at(i);
-        if (c.latin1()) //normal latin1 character
-          ret += c;
-        else //unicode character, needs to be escaped
-          ret += QString::fromLatin1("&#%1;").arg(c.unicode());
-      };
-      return ret;
-    }
-    else {
-      return text;
-    }
-  }
-  return QString::null;
-}
-
-const QString CSwordKey::strippedText() {
-//	qWarning("const QString CSwordKey::strippedText()");
-  if (!m_module)
-		return QString::null;
-	if (sword::SWKey* k = dynamic_cast<sword::SWKey*>(this)) {
-		m_module->module()->SetKey(k);
-  }
-	return QString::fromUtf8(m_module->module()->StripText());
-}
-
-/** This will create a proper key object from a given module */
-CSwordKey* CSwordKey::createInstance( CSwordModuleInfo* const module ){
-	if (!module)
-		return 0;
-
-	switch( module->type() ){
-		case CSwordModuleInfo::Bible://fall through
-		case CSwordModuleInfo::Commentary:
-			return new CSwordVerseKey( (sword::VerseKey *) ( (sword::SWKey *)(*module->module()) ), module );
-		case CSwordModuleInfo::Lexicon:
-			return new CSwordLDKey( (sword::SWKey *)(*module->module()), module);
-		case CSwordModuleInfo::GenericBook:
-			return new CSwordTreeKey( (sword::TreeKeyIdx*)((sword::SWKey *)(*module->module())), module );
-		default:
-			return 0;
-	}
-}
-
-/** The assignment operator for more easy use of the key classes. */
-CSwordKey& CSwordKey::operator = ( const QString& newKey ){
-  key(newKey);
-  return *this;
-}
diff --git a/bibletime/backend/cswordkey.h b/bibletime/backend/cswordkey.h
deleted file mode 100644
index f5c774f..0000000
--- a/bibletime/backend/cswordkey.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
-                          cswordkey.h  -  description
-                             -------------------
-    begin                : Thu May 24 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDKEY_H
-#define CSWORDKEY_H
-
-//Own includes
-
-
-//Qt includes
-#include <qstring.h>
-
-
-class CSwordModuleInfo;
-/**
- * The base class for all Sword based keys.
- * @author The BibleTime team
- * @version $Id: cswordkey.h,v 1.14 2003/01/02 18:42:19 joachim Exp $
- */
-class CSwordKey {
-
-protected:
-	CSwordKey(CSwordModuleInfo* module = 0); //protected constructor, because CSwordKey shouldn't be used (it's an abstract base class).
-	CSwordKey(const CSwordKey&); //copy constructor
-
-public:
-
-  enum TextRenderType {
-    Normal = 0,
-    HTMLEscaped
-  };
-
-	virtual ~CSwordKey() {};
-	
-	
-	//pure virtual functions		
-	virtual const QString key() = 0;
-	virtual void key(const QString&) = 0;
-	virtual void key(const char*) = 0;
-	virtual CSwordKey* copy() const = 0;	
-	
-	//implemented functions
-	virtual CSwordModuleInfo* const module(CSwordModuleInfo* const newModule = 0);
-	virtual const QString rawText();
-  virtual const QString renderedText( const CSwordKey::TextRenderType mode = CSwordKey::Normal );
-	virtual const QString strippedText();
-  /**
-  * This returns a new object of the right CSwordKey* implementation (e.g. CSwordVerseKey or CSwordLDKey)
-  * The type is determined by the type of the module.
-  * @see CSwordModuleInfo, CSwordBibleModuleInfo, CSwordCommentaryModuleInfo, CSwordLexiconModukleInfo
-  */
-  static CSwordKey* createInstance(CSwordModuleInfo * const module);
-  /**
-  * The assignment operator for more easy use of the key classes.
-  */
-  virtual CSwordKey& operator = ( const QString& );
-
-protected:
-	CSwordModuleInfo* m_module; //module pointer used by all keys
-};
-
-#endif
diff --git a/bibletime/backend/cswordldkey.cpp b/bibletime/backend/cswordldkey.cpp
deleted file mode 100644
index 5522a8d..0000000
--- a/bibletime/backend/cswordldkey.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************
-                          cswordldkey.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordldkey.h"
-#include "cswordlexiconmoduleinfo.h"
-
-//Qt includes
-
-//Sword includes
-#include <swmodule.h>
-#include <swld.h>
-#include <utilstr.h>
-
-
-CSwordLDKey::CSwordLDKey( CSwordModuleInfo* module ) {
-	if ((m_module = dynamic_cast<CSwordLexiconModuleInfo*>(module))) {
-//    *(m_module->module()) = TOP;	
-  }
-  SWKey::operator = (" ");
-}
-
-/** No descriptions */
-CSwordLDKey::CSwordLDKey( const CSwordLDKey &k ) : CSwordKey(k), SWKey((const char*)k) {
-}
-
-/** No descriptions */
-CSwordLDKey::CSwordLDKey( const SWKey *k, CSwordModuleInfo* module) : CSwordKey(module), SWKey(*k) {
-}
-
-/** Clones this object by copying the members. */
-CSwordLDKey* CSwordLDKey::copy() const {
-	return new CSwordLDKey(*this);
-}
-
-/** Sets the module of this key. */
-CSwordModuleInfo* const CSwordLDKey::module(CSwordModuleInfo* const newModule){	
-	if (newModule && newModule->type() == CSwordModuleInfo::Lexicon) {
-		const QString oldKey = key();	
-		m_module = newModule;
-		key(oldKey);
-	}	
-	return m_module;
-}
-
-/** Sets the key of this instance */
-const QString CSwordLDKey::key(){
-// 	return QString::fromLocal8Bit((const char*)*this);//don't use fromUtf8
- 	return QString::fromUtf8((const char*)*this);
-}
-
-void CSwordLDKey::key( const QString& newKey ){
-//	SWKey::operator = ((const char*)newKey.local8Bit());		
-	SWKey::operator = ((const char*)newKey.utf8());		
-	m_module->module()->SetKey(this);
-	m_module->snap();
-	SWKey::operator = (m_module->module()->KeyText());
-}
-
-/** Uses the parameter to returns the next entry afer this key. */
-CSwordLDKey* CSwordLDKey::NextEntry(){
-	m_module->module()->SetKey(this);	//use this key as base for the next one!
-  m_module->module()->setSkipConsecutiveLinks(true);  
-	( *( m_module->module() ) )++;
-  m_module->module()->setSkipConsecutiveLinks(false);    
-	key(m_module->module()->KeyText());
-	SWKey::operator = (m_module->module()->KeyText());	
-	
-	return this;
-}
-
-/** Uses the parameter to returns the next entry afer this key. */
-CSwordLDKey* CSwordLDKey::PreviousEntry(){
-	m_module->module()->SetKey(this);	//use this key as base for the next one!		
-  m_module->module()->setSkipConsecutiveLinks(true);
-  ( *( m_module->module() ) )--;
-  m_module->module()->setSkipConsecutiveLinks(false);
-	SWKey::operator = (m_module->module()->KeyText());	
-	
-	return this;
-}
-
-/** Sets the key of this instance */
-void CSwordLDKey::key( const char* newKey ){
-	if (newKey) {
-		SWKey::operator = (newKey);
-
-		m_module->module()->SetKey(this);
-		m_module->snap();
-		SWKey::operator = (m_module->module()->KeyText());
-	}
-}
-
-/** Assignment operator for more ease of use of this class. */
-CSwordLDKey& CSwordLDKey::operator = (const QString& keyname ){
-  key(keyname);
-  return *this;
-}
diff --git a/bibletime/backend/cswordldkey.h b/bibletime/backend/cswordldkey.h
deleted file mode 100644
index 951781b..0000000
--- a/bibletime/backend/cswordldkey.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/***************************************************************************
-                          cswordldkey.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************
-
- ***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDLDKEY_H
-#define CSWORDLDKEY_H
-
-
-//own includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qstring.h>
-
-//Sword includes
-#include <swkey.h>
-
-/**
-	*	This class is the implementation of CKey used for dictionaries and lexicons.
-	*
-	*	CSwordLDKey is the implementation of CKey for Lexicons and dictionaries.
-	* It provides a simple interface to set the current key,
-	* to get the text for the key and functions to get the next and previous items
-	* of the used module in comparision to the current key.<BR>
-	* Here's an example how to use this class:<BR>
-	* @code
-	*		CSwordLexiconModuleInfo* m_module = new CSwordLexiconModuleInfo( sword_module );
-	*		CSwordLDKey* ldKey = new CSwordLDKey(m_module);
-	*		ldKey->getPreviousEntry( ldKey );
-	*		qDebug( QString("The current key is: %1").arg(QString::fromLocal8Bit((const char*)*ldKey)));
-	* @endcode
-	*
-	* Please not, that the result will be invalid if use the operator const char*
-	* on the adress of the object, use something like this
-  *
-	* @code
-	*		CSwordLDKey* key = new CSwordLDKey( lexicon_module );
-	*		const QString keyname = key->getKey();
-	* @endcode
-	*
-  *	@author The BibleTime team
-  *	@version $Id: cswordldkey.h,v 1.13 2002/10/01 20:55:49 mgruner Exp $
-  */
-
-class CSwordLDKey : public CSwordKey, public sword::SWKey {
-public: 
-	/**
-	* Constructor of CSwordLDKey
-	*/
-	CSwordLDKey( CSwordModuleInfo* module );
-	/**
-	* Copy constructor for this key class.
-	*/
-	CSwordLDKey( const CSwordLDKey &k );
-	/**
-	* Copy constructor for this key class.
-	*/
-	CSwordLDKey( const sword::SWKey *k, CSwordModuleInfo* module);
-//	virtual ~CSwordLDKey();
-  /**
-  * Clones this object by copying the members.
-  */
-  virtual CSwordLDKey* copy() const;
-  /**
-  * Uses the parameter to returns the next entry afer this key.
-  */
-  CSwordLDKey* NextEntry( void );
-  /**
-  * Uses the parameter to returns the previous entry afer this key.
-  */
-  CSwordLDKey* PreviousEntry( void );  	
-  /**
-  * Sets the module of this key.
-  */
-  virtual CSwordModuleInfo* const module( CSwordModuleInfo* const module = 0 );
-  /**
-  * Returns the current key as a QString
-  */
-  virtual const QString key();
-  /**
-  * Set the current key
-  */
-  virtual void key( const QString& newKey );
-  /**
-  * Returns the current key as a QString
-  */
-  virtual void key( const char* );
-  /** Assignment operator for more ease of use of this class. */
-  virtual CSwordLDKey& operator = (const QString& keyname );
-};
-
-
-#endif
-
diff --git a/bibletime/backend/cswordlexiconmoduleinfo.cpp b/bibletime/backend/cswordlexiconmoduleinfo.cpp
deleted file mode 100644
index 26416c7..0000000
--- a/bibletime/backend/cswordlexiconmoduleinfo.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/***************************************************************************
-                          cswordlexiconmoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordlexiconmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qfile.h>
-#include <qdatastream.h>
-
-//Sword includes
-#include <swmodule.h>
-
-#include <kglobal.h>
-#include <kstandarddirs.h>
-
-//Change it once the format changed to make all
-//systems rebuild their caches
-#define CACHE_FORMAT "2"
-
-CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const backend ) : CSwordModuleInfo(module, backend) {
-	m_entryList = 0;
-}
-
-CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( const CSwordLexiconModuleInfo& m ) : CSwordModuleInfo(m) {
-	delete m_entryList;
-	m_entryList = 0;	
-		
-	if (m.m_entryList) {
-		m_entryList = new QStringList();
-		*m_entryList = *m.m_entryList;//copy list items
-	}
-}
-
-CSwordLexiconModuleInfo::~CSwordLexiconModuleInfo(){
-	delete m_entryList;
-	m_entryList = 0;
-}
-
-/** Returns the entries of the module. */
-QStringList* const CSwordLexiconModuleInfo::entries(){
-	if (!module()) {
-		return 0;
-	}
-
-  if (!m_entryList) {
-		m_entryList = new QStringList();
-    const bool lexiconCache = CBTConfig::get(CBTConfig::lexiconCache);
-		bool read = false;
-
-		if (lexiconCache){
-  		QFile f1(
-  			QString::fromLatin1("%1/%2")
-  				.arg(KGlobal::dirs()->saveLocation("data", "bibletime/cache/"))
-  				.arg(name())
-  		);
-
-      if ( f1.open( IO_ReadOnly ) ){
-        QDataStream s( &f1 );
-  			QString mod_ver, prog_ver;
-        s >> mod_ver;
-        s >> prog_ver;
-  			if ((mod_ver == config(ModuleVersion)) && (prog_ver == CACHE_FORMAT)) {
-  				s >> *m_entryList;
-  				read = true;
-  			}
-  			f1.close();
-      }
-		}
-
-    if (!read || !m_entryList->count()){
-      module()->setSkipConsecutiveLinks(true);
-			(*module()) = sword::TOP;
-      snap(); //snap to top entry
-  		do {
-        if (isUnicode()) {
-     			m_entryList->append(QString::fromUtf8(module()->KeyText()));
-				}
-        else { //for latin1 modules use fromLatin1 because of speed
-          m_entryList->append(QString::fromLatin1(module()->KeyText()));
-				}
-  			(*module())++;
-  		} while ( !module()->Error() );
-			(*module()) = sword::TOP; //back to the first entry
-      module()->setSkipConsecutiveLinks(false);
-
-      if (m_entryList->count()) {
-        m_entryList->first().simplifyWhiteSpace();
-    		if (m_entryList->first().stripWhiteSpace().isEmpty()) {
-  	  		m_entryList->remove( m_entryList->begin() );
-				}
-      }
-
-			if (lexiconCache && m_entryList->count()){
-  			//create cache
-		 		QString dir = KGlobal::dirs()->saveLocation("data", "bibletime/cache/");
-        QFile f2( QString::fromLatin1("%1/%2").arg(dir).arg( name() ) );
-        if (f2.open( IO_WriteOnly )){
-          QDataStream s( &f2 );
-  				s << config(CSwordModuleInfo::ModuleVersion); //store module version
-					s << QString::fromLatin1(CACHE_FORMAT); //store BT version -- format may change
-  				s << *m_entryList;
-  			  f2.close();
-        }
-			}
-		}
-	}
-	return m_entryList;
-}
-
-/** Jumps to the closest entry in the module.  */
-const bool CSwordLexiconModuleInfo::snap(){
-	if(module()->getRawEntry()){	//snap to the current entry
-		return true;
-	}
-	return false;
-}
-
-/** No descriptions */
-CSwordModuleInfo* CSwordLexiconModuleInfo::clone(){
-	return new CSwordLexiconModuleInfo(*this);
-}
diff --git a/bibletime/backend/cswordlexiconmoduleinfo.h b/bibletime/backend/cswordlexiconmoduleinfo.h
deleted file mode 100644
index c8caa22..0000000
--- a/bibletime/backend/cswordlexiconmoduleinfo.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
-                          cswordlexiconmoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDLEXICONMODULEINFO_H
-#define CSWORDLEXICONMODULEINFO_H
-
-//own includes
-#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qstringlist.h>
-
-/**
-	* The implementation of CModuleInfo for the Sword lexiccons and citionaries.
-  * @author The BibleTime team
-  * @version $Id: cswordlexiconmoduleinfo.h,v 1.7 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordLexiconModuleInfo : public CSwordModuleInfo {
-public: 
-	/**
-	* The standard constructor fot this object.
-	* A default constructor doesn't exist. Use this one.
-	*/
-	CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-	/**
-	* The copy constructor
-	*/
-	CSwordLexiconModuleInfo( const CSwordLexiconModuleInfo& m );
-  virtual CSwordModuleInfo* clone();
-	~CSwordLexiconModuleInfo();	
-  /**
- 	* Returns the entries of the module.
- 	* This function returns the entries of the modules represented by this object.
- 	* If this function is called for the first time the list is load from disk and stored in a list which cahes it.
- 	* If the function is called again, the cached list is returned so we have a major speed improvement.
- 	*/
-  QStringList* const entries();
-  /**
-  * Reimplementation.
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Jumps to the closest entry in the module.
-  */
-  const bool snap();
-
-private:
-	/**
-	* This is the list which caches the entres of the module.
-	*/
-	QStringList* m_entryList;
-};
-
-inline const CSwordModuleInfo::ModuleType CSwordLexiconModuleInfo::type() const {
-	return CSwordModuleInfo::Lexicon;
-}
-
-#endif
diff --git a/bibletime/backend/cswordmoduleinfo.cpp b/bibletime/backend/cswordmoduleinfo.cpp
deleted file mode 100644
index 1474279..0000000
--- a/bibletime/backend/cswordmoduleinfo.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/***************************************************************************
-                          cswordmoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Wed Oct 11 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordmoduleinfo.h"
-#include "cswordbackend.h"
-#include "centrydisplay.h"
-#include "cswordmodulesearch.h"
-#include "cswordkey.h"
-#include "clanguagemgr.h"
-#include "util/scoped_resource.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <dirent.h>
-#include <regex.h>
-
-//Qt includes
-#include <qregexp.h>
-
-//Sword includes
-#include <swbuf.h>
-#include <swmodule.h>
-#include <swkey.h>
-#include <listkey.h>
-#include <versekey.h>
-#include <swconfig.h>
-#include <rtfhtml.h>
-
-using std::string;
-
-CSwordModuleInfo::CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend) {
-	m_module = module;
-	m_searchResult.ClearList();
-  m_backend = usedBackend;
-	m_dataCache.name = module ? QString::fromLatin1(module->Name()) : QString();
-	m_dataCache.isUnicode = module ? module->isUnicode() : false;
-
-	if (backend()) {
-		if (hasVersion() && (minimumSwordVersion() > sword::SWVersion::currentVersion)) {
-		 	qWarning("The module \"%s\" requires a newer Sword library. Please update to \"Sword %s\".", name().latin1(), (const char*)minimumSwordVersion());
-		}
-	}
-}
-
-CSwordModuleInfo::CSwordModuleInfo( const CSwordModuleInfo& m ) {
-	m_module = m.m_module;
-	m_backend = m.m_backend;
-	m_dataCache = m.m_dataCache;
-	m_searchResult = m.m_searchResult;
-}
-
-/** No descriptions */
-CSwordModuleInfo* CSwordModuleInfo::clone(){
-	return new CSwordModuleInfo(*this);
-}
-
-CSwordModuleInfo::~CSwordModuleInfo(){
-	m_searchResult.ClearList();
-	m_module = 0; //the Sword module object is deleted by the backend
-}
-
-/** Sets the unlock key of the modules and writes the key into the cofig file.*/
-const bool CSwordModuleInfo::unlock( const QString& unlockKey ){
-  if (!isEncrypted()) {
-    return false;
-  }
-
-  CBTConfig::setModuleEncryptionKey( name(), unlockKey );
-  backend()->setCipherKey(m_module->Name(), unlockKey.latin1());
-      
-  return false;
-}
-
-/** Returns the display object for this module. */
-CEntryDisplay* const CSwordModuleInfo::getDisplay() const {
-	return dynamic_cast<CEntryDisplay*>(m_module->Disp());
-}
-
-/** This function returns true if this module is locked, otherwise return false. */
-const bool CSwordModuleInfo::isLocked() {
-  //still works, but the cipherkey is stored in CBTConfig.
-	//Works because it is set in sword on program startup.
-	if (isEncrypted() && config(CipherKey).isEmpty())
-		return true;
-	return false;
-}
-
-/** This functions returns true if this module is encrypted (locked or unlocked). */
-const bool CSwordModuleInfo::isEncrypted()/* const*/ {
-	/**
-	* If we have the CipherKey entry the module
-	* is encrypted but not necessarily locked
-	*/
-	//This code is still right, though we do no longer write to the module config files any more
-	sword::ConfigEntMap config	= backend()->getConfig()->Sections.find( name().latin1() )->second;
-	sword::ConfigEntMap::iterator it = config.find("CipherKey");
-	if (it != config.end())
-		return true;
-//  if (!config(CipherKey).isEmpty()) {
-//    return true;
-//  };
-	return false;
-}
-
-const bool CSwordModuleInfo::hasVersion() const {
-	const sword::SWBuf version = (*backend()->getConfig())[name().latin1()]["Version"];
-	return version.length();
-}
-
-
-/** Returns true if something was found, otherwise return false. */
-const bool CSwordModuleInfo::search( const QString searchedText, const int searchOptions, sword::ListKey scope, void (*percentUpdate)(char, void*) ) {
-	int searchType = 0;
- 	int searchFlags = REG_ICASE;
-
-	//work around Swords thread insafety for Bibles and Commentaries
-	util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(this) );
-	sword::SWKey* s = dynamic_cast<sword::SWKey*>(key.get());
-	if (s) {
-		m_module->SetKey(*s);
-  }
-
-	//setup variables required for Sword
-	if (searchOptions & CSwordModuleSearch::caseSensitive)
-		searchFlags = 0;
-
-	if (searchOptions & CSwordModuleSearch::multipleWords) {
-		searchType = -2; //multiple words
-  }
-	else if (searchOptions & CSwordModuleSearch::exactPhrase) {
-		searchType = -1; //exact phrase
-  }
-	else if (searchOptions & CSwordModuleSearch::regExp) {
-		searchType = 0;	//regexp matching
-  }
-
-	if ((searchOptions & CSwordModuleSearch::useLastResult) && m_searchResult.Count()) {
-		util::scoped_ptr<sword::SWKey> searchScope( m_searchResult.clone() );
-		m_searchResult = m_module->search(searchedText.utf8(), searchType, searchFlags, searchScope, 0, percentUpdate);
-	}
-	else if (searchOptions & CSwordModuleSearch::useScope) {
-		m_searchResult = m_module->search(searchedText.utf8(), searchType, searchFlags, (type() != Lexicon && type() != GenericBook) ? &scope : 0, 0, percentUpdate);
-	}
-  else {
-  	m_searchResult = m_module->search(searchedText.utf8(), searchType, searchFlags, 0, 0, percentUpdate);
-  }
-
-	return (m_searchResult.Count() > 0);
-}
-
-/** Returns the last search result for this module. */
-sword::ListKey& CSwordModuleInfo::searchResult(const sword::ListKey* newResult) {
-	if (newResult) {
-		m_searchResult.copyFrom( *newResult );
-  }
-	return m_searchResult;
-}
-
-/** Clears the last search result. */
-void CSwordModuleInfo::clearSearchResult(){
-	m_searchResult.ClearList();
-}
-
-/** This interupts the search if this module is being searched. */
-void CSwordModuleInfo::interruptSearch(){
-	m_module->terminateSearch = true;
-}
-
-/** Returns the required Sword version for this module. Returns -1 if no special Sword version is required. */
-const sword::SWVersion CSwordModuleInfo::minimumSwordVersion(){
-	return sword::SWVersion( config(CSwordModuleInfo::MinimumSwordVersion).latin1() );
-}
-
-/** Returns the name of the module. */
-const QString CSwordModuleInfo::name() const {
-	return m_dataCache.name;
-}
-
-/** Returns true if this module is Unicode encoded. False if the charset is iso8859-1. */
-const bool CSwordModuleInfo::isUnicode(){
-	return m_dataCache.isUnicode;
-}
-
-const QString CSwordModuleInfo::config( const CSwordModuleInfo::ConfigEntry entry) {
-	switch (entry) {
-		case AboutInformation:
-		{
-			QString about = QString::fromLatin1(m_module->getConfigEntry("About"));
-			if (!about.isEmpty()) {	
-				sword::RTFHTML filter;
-				sword::SWBuf buf( about.local8Bit() );
-				filter.processText(buf, 0, 0);
-				about = QString::fromLocal8Bit(buf.c_str());
-			}
-			return about;
-		}
-		case CipherKey:
-      if (CBTConfig::getModuleEncryptionKey(name()).isNull()) { //fall back!
-  			return QString::fromLatin1( m_module->getConfigEntry("CipherKey") );
-      }
-      else {
-        return CBTConfig::getModuleEncryptionKey(name());
-      };
-		case AbsoluteDataPath: {
-			QString path = QString::fromLatin1(m_module->getConfigEntry("AbsoluteDataPath"));
-      path.replace(QRegExp("/./"), "/"); // make /abs/path/./modules/ looking better
-			//make sure we have a trailing slash!
-			if (path.right(1) != "/") {
-				path += "/";
-			}
-      return path;
-    }
-		case DataPath: { //make sure we remove the dataFile part if it's a Lexicon
-			QString path = QString::fromLatin1(m_module->getConfigEntry("DataPath"));
-			if ((type() == CSwordModuleInfo::GenericBook) || (type() == CSwordModuleInfo::Lexicon)) {
-				int pos = path.findRev("/"); //last slash in the string
-				if (pos != -1) {
-					path = path.left(pos+1); //include the slash
-				}
-			}
-			return path;
-		}
-		case Description:
-			return QString::fromLatin1(m_module->Description());
-		case ModuleVersion: {
-			QString version = QString::fromLatin1(m_module->getConfigEntry("Version"));
-      if (version.isEmpty())
-        version = "1.0";
-      return version;
-    }        
-		case MinimumSwordVersion: {
-			const QString version = QString::fromLatin1(m_module->getConfigEntry("MinimumVersion"));
-			return !version.isEmpty() ? version : QString::fromLatin1("0.0");
-		}
-		case TextDir: {
-			const QString dir = QString::fromLatin1(m_module->getConfigEntry("Direction"));
-			return !dir.isEmpty() ? dir : QString::fromLatin1("LtoR");
-		}		
-    case DisplayLevel: {
-			const QString level = QString::fromLatin1(m_module->getConfigEntry("DisplayLevel"));
-			return !level.isEmpty() ? level : QString::fromLatin1("1");
-		}
-    case GlossaryFrom: {
-      if (!category() == Glossary) {
-        return QString::null;
-      };
-      const QString lang = QString::fromLatin1(m_module->getConfigEntry("GlossaryFrom"));
-			return !lang.isEmpty() ? lang : QString::null;
-    }
-    case GlossaryTo: {
-      if (!category() == Glossary) {
-        return QString::null;
-      };
-      const QString lang = QString::fromLatin1(m_module->getConfigEntry("GlossaryTo"));
-			return !lang.isEmpty() ? lang : QString::null;
-    }
-		default:
-			return QString::null;
-	}
-}
-
-/** Returns true if the module supports the feature given as parameter. */
-const bool CSwordModuleInfo::has( const CSwordModuleInfo::Feature feature ){
-	switch (feature) {
-		case StrongsNumbers:
-			return m_module->getConfig().has("Feature", "StrongsNumber");
-		case GreekDef:
-			return m_module->getConfig().has("Feature", "GreekDef");		
-		case HebrewDef:
-			return m_module->getConfig().has("Feature", "HebrewDef");		
-		case GreekParse:
-			return m_module->getConfig().has("Feature", "GreekParse");		
-		case HebrewParse:
-			return m_module->getConfig().has("Feature", "HebrewParse");		
-	}
-	return false;
-}
-
-const bool CSwordModuleInfo::has( const CSwordBackend::FilterTypes option ){
-	//BAD workaround to see if the filter is GBF, OSIS or ThML!	
-  const QString name = backend()->configOptionName(option);
- 	if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("OSIS%1").arg(name).latin1()))
- 		return true;
-  if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("GBF%1").arg(name).latin1()))
- 		return true;
- 	if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("ThML%1").arg(name).latin1()))
- 		return true;
- 	if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("UTF8%1").arg(name).latin1()))
- 		return true; 		
- 	if (m_module->getConfig().has("GlobalOptionFilter", name.latin1()))
- 		return true;
- 	
- 	return false;
-}
-
-/** Returns the text direction of the module's text., */
-const CSwordModuleInfo::TextDirection CSwordModuleInfo::textDirection(){
-  if (config(TextDir) == "RtoL")
-    return CSwordModuleInfo::RightToLeft;
-  else
-    return CSwordModuleInfo::LeftToRight;
-}
-
-/** Writes the new text at the given position into the module. This does only work for writable modules. */
-void CSwordModuleInfo::write( CSwordKey* key, const QString& newText ){
-  module()->KeyText( key->key().local8Bit() );
-	//don't store a pointer to the const char* value somewhere because QCString doesn't keep the value of it
-	module()->setEntry( isUnicode() ? (const char*)newText.utf8() : (const char*)newText.local8Bit() );
-}
-
-/** Deletes the current entry and removes it from the module. */
-const bool CSwordModuleInfo::deleteEntry( CSwordKey* const key ){
-  module()->KeyText( key->key().local8Bit() );
-  if (module()) {
-    module()->deleteEntry();
-    return true;
-  };
-  return false;
-}
-
-/** Returns the language of the module. */
-const CLanguageMgr::Language CSwordModuleInfo::language() {
-  if (module()) {
-    if (category() == Glossary) {
-      //special handling for glossaries, we use the "from language" as language for the module
-      return languageMgr()->languageForAbbrev( config(GlossaryFrom) );
-    }
-    return languageMgr()->languageForAbbrev( module()->Lang() );
-  }
-  return CLanguageMgr::Language(); //default language
-}
-
-/** Returns true if this module may be written by the write display windows. */
-const bool CSwordModuleInfo::isWritable(){
-  return false;
-}
-
-/** Returns the category of this module. See CSwordModuleInfo::Category for possible values. */
-const CSwordModuleInfo::Category CSwordModuleInfo::category(){
-  const QString cat = QString::fromLatin1(m_module->getConfigEntry("Category"));
-  if (cat == QString::fromLatin1("Cults / Unorthodox / Questionable Material")) {
-    return Cult;
-  }
-  else if (cat == QString::fromLatin1("Daily Devotional") || m_module->getConfig().has("Feature", "DailyDevotion")) {
-    return DailyDevotional;
-  }
-  else if (cat == QString::fromLatin1("Glossaries") || m_module->getConfig().has("Feature", "Glossary")) { //alow both
-    return Glossary;
-  };
-  return CSwordModuleInfo::UnknownCategory;  
-}
diff --git a/bibletime/backend/cswordmoduleinfo.h b/bibletime/backend/cswordmoduleinfo.h
deleted file mode 100644
index 5104b96..0000000
--- a/bibletime/backend/cswordmoduleinfo.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/***************************************************************************
-                          cswordmoduleinfo.h  -  description
-                             -------------------
-    begin                : Wed Oct 11 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDMODULEINFO_H
-#define CSWORDMODULEINFO_H
-
-//BibleTime includes
-#include "cswordbackend.h"
-#include "clanguagemgr.h"
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qfont.h>
-#include <qmap.h>
-
-
-//Sword includes
-#include <listkey.h>
-#include <swversion.h>
-
-class sword::SWModule;
-class CSwordBackend;
-class CEntryDisplay;
-class CSwordKey;
-
-/**
-	* Base class for Sword modules.
-	* This is the base class for all Sword modules. Every class handling a special Sword module type
-	* does inherit from this class.
-	*
-  * @author The BibleTime team
-  * @version $Id: cswordmoduleinfo.h,v 1.44 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordModuleInfo : public CPointers  {
-public:
-  enum TextDirection { /* The text direction of the modules's text */
-    LeftToRight,
-    RightToLeft
-  };
-  enum ModuleType {
-		Bible,
-		Commentary,
-		Lexicon,
-		GenericBook,
-		Unknown
-	};
-  /**
- 	* This enum is used to give
- 	* back an error code after unlocking the module
- 	*/
-  enum UnlockErrorCode {
-		noError,	/* No error occured, everything worked ok. The key was written to the config*/
-		wrongUnlockKey, /* The wrong key was used. Module is not unlocked */				
-		notLocked, /* The module was not locked so it can't be unlocked */
-		noPermission /* The key was not written to config because we have no permissions*/
-	};	
-	enum ConfigEntry {
-		AboutInformation, /* The about information of a module which is stored in the config file*/
-		AbsoluteDataPath, /* The absolute data path stored in the config object */
-		CipherKey, /* The cipher key which was used to unlock the module. Not necessarily set.*/
-		DataPath, /* The relative path. See AbsoluteDataPath*/
-		Description, /* The module description stored in the config file */
-		ModuleVersion, /* The module's version.*/
-		MinimumSwordVersion, /* The required Sword Version of this module. Otherwise some things may not work (compression etc.).*/
-	  TextDir, /* The text direction */	
-    DisplayLevel, /* Mostly used for books. Gives the level which should contain the connected entries.*/
-    GlossaryFrom, /* lamguage from which the Glosaary tramslates */
-    GlossaryTo /* lamguages to which the glossary maps to */
-	};
-	enum Feature {
-		StrongsNumbers, /*Use for Bibles which have embedded strong numbers*/
-		GreekDef,
-		HebrewDef, 
-		GreekParse,
-		HebrewParse,
-    featureMin = StrongsNumbers,
-    featureMax = HebrewParse
-	};
-  enum Category {
-    UnknownCategory = 0, /* The category wasn't set or has an unknwon value */
-    Cult, /* The module is a cult / sect / questionable module */
-    DailyDevotional,
-    Glossary
-  };
-	
-	/**
-	* Returns the config entry which is pecified by the parameter.
-	*/
-	const QString config( const CSwordModuleInfo::ConfigEntry entry );
-	
-	CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-//	CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const backend );
-	CSwordModuleInfo( const CSwordModuleInfo& m );	
-  virtual CSwordModuleInfo* clone();	
-	virtual ~CSwordModuleInfo();	
-
-  /**
- 	* Returns the module object so all objects can access the original Sword module.
- 	*/
-  sword::SWModule* const module() const;
-  /**
- 	* Sets the unlock key of the modules and writes the key into the cofig file.
-	* @return True if the unlock process was succesful, if the key was wrong, or if the config file was write protected return false.
-	*/
-  const bool unlock( const QString& unlockKey );
-  /**
- 	* Returns the display object for this module. Normally every module should have a Display object.
- 	* Please don't use module()->Display() because this function does return the Sword display and does
- 	* render the text, too.
- 	* This function performs some casts to return the correct display. If it returns 0 there's no valid
- 	* display object.
- 	*/
-  CEntryDisplay* const getDisplay() const;
-  /**
- 	* This function does return true if the data files of the module are encrypted by the module author
- 	* (the on who made the module) no matter if it's locked or not.
- 	*
- 	*/
-  const bool isEncrypted() /*const*/;
-  /**
- 	* This function returns true if this module is locked (encrypted + correct cipher key),
- 	* otherwise return false.
- 	*/
-  const bool isLocked();
-
-  /**
-  * @return true if this module has a version number and false if it doesn't have one.
-  */
-  const bool hasVersion() const;
-  /**
-  * Returns true if something was found, otherwise return false.
-  * This function does start the Sword functions to search in the module and it does
-  * overwrite the variable containing the last search result.
-  */
-  virtual const bool search( const QString searchedText, const int searchOptions, sword::ListKey scope, void (*percent)(char, void*));
-  /**
-  * Returns the last search result for this module.
-  * The last result is cleared by @ref search
-  */
-  virtual sword::ListKey& searchResult( const sword::ListKey* newResult = 0 );
-  /**
-  * This interupts the search if this module is being searched.
-  */
-  virtual void interruptSearch();
-  /**
-  * Clears the last search result.
-  * This does immediately clean the last search result,
-  * no matter if search is in progress or not.
-  */
-  void clearSearchResult();
-  /**
-  * Returns the type of the module.
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Returns the required Sword version for this module.
-	* Returns -1 if no special Sword version is required.
-	*/
-  const sword::SWVersion minimumSwordVersion();
-  /**
-  * Returns the name of the module.
-  */
-  const QString name() const;
-  /**
-  * Snaps to the closest entry in the module if the current key is
-  * not present in the data files.
-  */
-  virtual const bool snap() {return false;};
-  const bool has( const CSwordModuleInfo::Feature );
-	const bool has( const CSwordBackend::FilterTypes option )	;
-  /**
-  * Returns the text direction of the module's text.,
-  */
-  virtual const CSwordModuleInfo::TextDirection textDirection();
-  /**
-  * Writes the new text at the given position into the module. This does only work for writabe modules.
-  */
-  virtual void write( CSwordKey* key, const QString& newText );
-  /**
-  * Deletes the current entry and removes it from the module.
-  */
-  const bool deleteEntry( CSwordKey* const key );
-  /**
-  * Returns the language of the module.
-  */
-  const CLanguageMgr::Language language();
-  /**
-  * Returns true if this module may be written by the write display windows.
-  */
-  virtual const bool isWritable();
-  /**
-  * Returns the category of this module. See CSwordModuleInfo::Category for possible values.
-  */
-  const CSwordModuleInfo::Category category();
-
-protected:
-  friend class CSwordBackend;
-  /**
-  * Returns true if this module is Unicode encoded. False if the charset is iso8859-1.
-	* Protected because it should not be used outside of the CSword*ModuleInfo classes.
-  */
-  const bool isUnicode();
-
-  virtual inline CSwordBackend* backend() const {
-    return m_backend;
-  }
-  virtual inline void backend( CSwordBackend* newBackend ) {
-    if (newBackend) {
-      m_backend = newBackend;
-    }
-  }
-
-private:
-	sword::SWModule* m_module;
-	sword::ListKey m_searchResult;
-	struct {
-		QString name;
-		bool isUnicode;
-	} m_dataCache;
-
-  CSwordBackend* m_backend;
-};
-
-typedef QPtrList<CSwordModuleInfo>	ListCSwordModuleInfo;
-
-inline const CSwordModuleInfo::ModuleType CSwordModuleInfo::type() const {
-	return CSwordModuleInfo::Unknown;
-}
-
-inline sword::SWModule* const CSwordModuleInfo::module() const {
-	return m_module;
-}
-
-#endif
diff --git a/bibletime/backend/cswordmodulesearch.cpp b/bibletime/backend/cswordmodulesearch.cpp
deleted file mode 100644
index 4449007..0000000
--- a/bibletime/backend/cswordmodulesearch.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/***************************************************************************
-                          cswordmodulesearch.cpp  -  description
-                             -------------------
-    begin                : Fri Oct 13 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordmodulesearch.h"
-#include "cswordmoduleinfo.h"
-#include "cswordbackend.h"
-#include "../frontend/cbtconfig.h"
-
-//Sword includes
-#include <swmodule.h>
-#include <swkey.h>
-#include <listkey.h>
-
-
-static CSwordModuleSearch* searcher = 0;
-
-void startSearchCallback(void* /*p*/){
-	if (searcher)
-		searcher->startSearch();
-}
-
-void percentUpdateDummy(char percent, void *p) {
-	searcher->percentUpdate(percent, p);
-};
-
-CSwordModuleSearch::CSwordModuleSearch() :
-	m_searchedText(QString::null),
-	m_searchOptions(0),m_foundItems(false),m_isSearching(false),m_terminateSearch(false)
-{
-	searcher = this;
-}
-
-CSwordModuleSearch::~CSwordModuleSearch(){
-	searcher = 0;
-}
-
-void CSwordModuleSearch::percentUpdate(char percent, void *){
-	cms_currentProgress = (int)percent;
-	if (cms_module_count > 1)
-	  cms_overallProgress = (int)((float)((cms_module_current - 1)*100+cms_currentProgress))/cms_module_count;
-	else
-	  cms_overallProgress = cms_currentProgress;
-	m_updateSig.activate();	
-}
-
-/** This function sets the modules which should be searched. */
-void CSwordModuleSearch::setModules( ListCSwordModuleInfo list ) {
-	m_moduleList = list;
-}
-
-/** Starts the search for the search text. */
-const bool CSwordModuleSearch::startSearch() {
-	backend()->setFilterOptions ( CBTConfig::getFilterOptionDefaults() );	
-	m_foundItems			= false;
-	m_terminateSearch = false;
-	m_isSearching 		= true;		
-		
-	cms_currentProgress = 0;
-	cms_overallProgress = 0;
-	cms_module_current = 0;
-	cms_module_count = m_moduleList.count();
-	
-	bool foundItems = false;
-	
-	for (m_moduleList.first(); m_moduleList.current() && !m_terminateSearch; m_moduleList.next()) {
-		cms_module_current++;
-		if ( m_moduleList.current()->search(m_searchedText, m_searchOptions, m_searchScope, &percentUpdateDummy) )
-			foundItems = true;
-	}
-	cms_currentProgress = 100;
-	cms_overallProgress = 100;
-	
-	m_foundItems = foundItems;		
-	m_isSearching = false;
-	m_terminateSearch = false;
-
-  m_finishedSig.activate();		
-	return true;
-}
-
-void CSwordModuleSearch::startSearchThread(void){
-	startSearch();
-}
-
-/** Sets the text which should be search in the modules. */
-void CSwordModuleSearch::setSearchedText( const QString text ){
-	m_searchedText = text;
-}
-
-/** Sets the search scope. */
-void CSwordModuleSearch::setSearchScope( sword::ListKey scope ) {
-  m_searchScope.copyFrom( scope );
-  if (!strlen(scope.getRangeText())) { //we can't search with an empty search scope, would crash
-    //reset the scope
-    resetSearchScope();
-    
-    //disable searching with a scope!
-    if (m_searchOptions | useScope) {
-//      qWarning("using the scope!");
-      //set back the scope flag
-    }
-  }
-}
-
-/** Sets the search scope back. */
-void CSwordModuleSearch::resetSearchScope() {
-	m_searchScope.ClearList();
-}
-
-/** Interrupts the current search. */
-void CSwordModuleSearch::interruptSearch() {
-	if (m_isSearching)
-		m_terminateSearch = true; //no other modules will be searched
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next())
-		m_moduleList.current()->interruptSearch(); //interrupt the current module
-}
-
-/** Returns true if in the last search the searcher found items, if no items were found return false. */
-const bool CSwordModuleSearch::foundItems() {
-	return m_foundItems;
-}
-
-/** Sets the options for this search. Options include theflags and search types of the Sword searc interface. */
-void CSwordModuleSearch::setSearchOptions( int options ){
-	m_searchOptions = options;
-}
-
-/** Returns the percent for the given type. */
-const int CSwordModuleSearch::getPercent( percentType type ){
-	switch (type) {
-		case currentModule:
-			return cms_currentProgress;
-		case allModules:
-			return cms_overallProgress;
-//		default:
-//			return 0;
-	};
-	return 0;
-}
-
-/** Returns a copy of the used search scope. */
-sword::ListKey& CSwordModuleSearch::scope() {
-	return m_searchScope;
-}
-
-void CSwordModuleSearch::connectPercentUpdate( QObject *receiver, const char *member ) {
-	m_updateSig.connect(receiver, member);
-};
-
-void CSwordModuleSearch::connectFinished( QObject *receiver, const char *member ) {
-	m_finishedSig.connect(receiver, member);
-};
-
-/** Should be called when the search finished. */
-void CSwordModuleSearch::searchFinished(){
-	m_finishedSig.activate();	
-}
diff --git a/bibletime/backend/cswordmodulesearch.h b/bibletime/backend/cswordmodulesearch.h
deleted file mode 100644
index 86d6a8b..0000000
--- a/bibletime/backend/cswordmodulesearch.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/***************************************************************************
-                          cswordmodulesearch.h  -  description
-                             -------------------
-    begin                : Fri Oct 13 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDMODULESEARCH_H
-#define CSWORDMODULESEARCH_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qsignal.h>
-
-//System includes
-#include <pthread.h>
-
-//Sword includes
-#include <listkey.h>
-
-//class ListKey;
-class CSwordModuleInfo;
-typedef QPtrList<CSwordModuleInfo> ListCSwordModuleInfo;
-
-/**
-	* CSwordModuleSearch manages the search on Sword modules. It manages the thread(s)
-	* and manages the different modules.
-  *
-  * @author The BibleTime team
-  * @version $Id: cswordmodulesearch.h,v 1.17 2004/01/27 15:38:16 joachim Exp $
-  */
-class CSwordModuleSearch: public CPointers {
-public:
-	enum scopeType {
-		Scope_NoScope,
-		Scope_LastSearch,
-		Scope_Bounds
-	};
-  enum searchOptions {
-  	exactPhrase		= 0x000000001,
-  	multipleWords	= 0x000000002,
-  	regExp				= 0x000000004,
-  	caseSensitive	= 0x000000008,  	
-  	useLastResult	= 0x000000010,
-  	useScope	 		= 0x000000020
-	};
-	enum percentType {
-  	currentModule,
-		allModules
-	};
-  /**
-  * This is used to show the selection in the searchscope dialog
-  */
-  enum SearchScope 		{ NoScope, LastSearch, Bounds	};
-
-  /** This is used to so show the selection of the searchdialog
-  *
-  */
-  enum SearchType 		{ MultiWord, ExactPhrase, RegEx	};
-
-
-	CSwordModuleSearch();
-	/**
-	* The destructor of this class. It cleans uop memory before it's deleted.
-	*/
-	virtual ~CSwordModuleSearch();
-  /**
- 	* Sets the text which should be search in the modules.
- 	*/
-  void setSearchedText( const QString );
-  /**
- 	* Starts the search for the search text.
- 	*/
-  const bool startSearch();
-  /**
- 	* This function sets the modules which should be searched.
- 	*/
-  void setModules( ListCSwordModuleInfo );
-  /**
- 	* Sets the search scope.
- 	*/
-  void setSearchScope( sword::ListKey scope );
-  /**
- 	*	Calls with true if you want to use the last searchresult as search scope.
- 	*/
-//  void useLastSearchResult( const bool );
-  /**
- 	* Sets the seaech scope back.
- 	*/
-  void resetSearchScope();
-  /**
- 	* Interrupts the current search.
- 	*/
-  void interruptSearch();
-  /**
- 	* @return "true" if in the last search the searcher found items, if no items were found return "false"
- 	*/
-  const bool foundItems();
-  /**
- 	* This functions starts the search: First it creates a new thread for the search and it calles the the
- 	* function to start the search.
- 	*/
-	void startSearchThread(void);
-  /**
- 	* Sets the options for this search. Options include the
-	* flags and search types of the Sword searc interface.
-	*/
-  void setSearchOptions( int options );
-  /**
- 	* Returns the percent for the given type.
- 	*/
-  const int getPercent( percentType type );
-	void percentUpdate(char percent, void *p);
-  /**
-  * Returns a copy of the used search scope.
-  */
-  sword::ListKey& scope();
-	void connectPercentUpdate( QObject *receiver, const char *member );
-	void connectFinished( QObject *receiver, const char *member );
-  void searchFinished();
-		
-protected:
-	QString m_searchedText;
-	sword::ListKey m_searchScope;
-	ListCSwordModuleInfo m_moduleList;
-
-	int m_searchOptions;
-
-	bool m_foundItems;
-	bool m_isSearching;
-	bool m_terminateSearch;
-
-	int cms_currentProgress;
-	int cms_overallProgress;
-	int cms_module_count;
-	int cms_module_current;
-
-private:
-	QSignal m_updateSig;
-	QSignal m_finishedSig;
-};
-
-#endif
diff --git a/bibletime/backend/cswordtreekey.cpp b/bibletime/backend/cswordtreekey.cpp
deleted file mode 100644
index c9444aa..0000000
--- a/bibletime/backend/cswordtreekey.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
-                          cswordtreekeyidx.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cswordtreekey.h"
-#include "cswordbookmoduleinfo.h"
-
-CSwordTreeKey::CSwordTreeKey( const CSwordTreeKey& k ) : CSwordKey(k), TreeKeyIdx(k) {
-  
-}
-
-CSwordTreeKey::CSwordTreeKey( const TreeKeyIdx *k, CSwordModuleInfo* module ) : CSwordKey(module), TreeKeyIdx(*k) {
-  
-}
-
-CSwordTreeKey* CSwordTreeKey::copy() const {
-	return new CSwordTreeKey(*this);
-}
-
-/** Sets the key of this instance */
-const QString CSwordTreeKey::key( ){
-  return QString::fromLocal8Bit( getFullName() ); //don't use fromUtf8
-}
-
-void CSwordTreeKey::key( const QString& newKey ){
-  if (newKey.isEmpty()) {
-    root();
-  }
-  else
-    TreeKeyIdx::operator = ((const char*)newKey.local8Bit());		//don't use Utf8! Doesn't work with umlauts!	
- 	
-  if (Error())
- 		root();
-}
-
-void CSwordTreeKey::key( const char* newKey ){
-	if (newKey) {
-		TreeKeyIdx::operator = (newKey);
-	}
-}
-
-CSwordModuleInfo* const CSwordTreeKey::module( CSwordModuleInfo* const newModule ) {
-	if (newModule && (newModule != m_module) && (newModule->type() == CSwordModuleInfo::GenericBook) ) {
-		m_module = newModule;
-
-		const QString oldKey = key();
-		CSwordBookModuleInfo* newBook = dynamic_cast<CSwordBookModuleInfo*>(newModule);
-		copyFrom(*(newBook->tree()));
-
-		key(oldKey); //try to restore our old key
-	}
-	return m_module;
-}
-
-/** Assignment operator. */
-CSwordTreeKey& CSwordTreeKey::operator = (const QString& keyname ){
-  key(keyname);
-  return *this;
-}
diff --git a/bibletime/backend/cswordtreekey.h b/bibletime/backend/cswordtreekey.h
deleted file mode 100644
index 98c78e3..0000000
--- a/bibletime/backend/cswordtreekey.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
-                          cswordtreekeyidx.h  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDTREEKEYIDX_H
-#define CSWORDTREEKEYIDX_H
-
-//BibleTime includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-//Sword includes
-#include <treekeyidx.h>
-
-/** BibleTime's implementation of Sword's TreeKeyIdx class.
-  * @author The BibleTime team
-  */
-class CSwordTreeKey : public CSwordKey, public sword::TreeKeyIdx  {
-public:
-	CSwordTreeKey( const CSwordTreeKey& k );
-	CSwordTreeKey( const sword::TreeKeyIdx *k, CSwordModuleInfo* module );
-	CSwordModuleInfo* const module( CSwordModuleInfo* const newModule );
-	virtual CSwordTreeKey* copy() const;
-  /**
-  * Returns the current key
-  */
-  virtual const QString key( );
-  /**
-  * Set the key. If the parameter is empty or null, the key will be set to "/"
-  */
-  virtual void key( const QString& key );
-  /**
-  * Set/get the key. If the parameter is not set (means equal to QString::null)
-  * the used key is returned. Otherwise the key is set and the new on ei returned.
-  */
-	virtual void key( const char* key );
-  /**
-  * Assignment operator.
-  */
-  virtual CSwordTreeKey& operator = (const QString& keyname );
-};
-
-#endif
diff --git a/bibletime/backend/cswordversekey.cpp b/bibletime/backend/cswordversekey.cpp
deleted file mode 100644
index cebf311..0000000
--- a/bibletime/backend/cswordversekey.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/***************************************************************************
-                          cswordversekey.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordversekey.h"
-#include "cswordbiblemoduleinfo.h"
-#include "cswordcommentarymoduleinfo.h"
-
-//Qt includes
-#include <qstringlist.h>
-
-//Sword includes
-#include <swmodule.h>
-
-CSwordVerseKey::CSwordVerseKey( CSwordModuleInfo* module ) : CSwordKey(module) {
-  if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module) ) {
-    key( bible->lowerBound().key() );
-  }
-}
-
-CSwordVerseKey::CSwordVerseKey( const CSwordVerseKey& k ) : CSwordKey(k), VerseKey(k) {
-
-}
-
-CSwordVerseKey::CSwordVerseKey( const VerseKey* k, CSwordModuleInfo* module) : CSwordKey(module), VerseKey(*k) {
-}
-
-/** Clones this object. */
-CSwordKey* CSwordVerseKey::copy() const {
-	return new CSwordVerseKey(*this);
-}
-
-/** Sets the module for this key */
-CSwordModuleInfo* const CSwordVerseKey::module( CSwordModuleInfo* const newModule ){
-	if (newModule && ( (newModule->type() == CSwordModuleInfo::Bible) || (newModule->type() == CSwordModuleInfo::Commentary) )) {
-	//	const QString& oldKey	= key();
-		m_module = newModule;
-	//	key(oldKey);
-
-		//check if the module contains the key we present
-		CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(newModule);
-   	if (_compare(bible->lowerBound()) < 0) {
-			qWarning("setting key to lower bound %s", bible->lowerBound().key().latin1());
-      key( bible->lowerBound() );
-    }
-    if (_compare(bible->upperBound()) > 0) {
-			qWarning("setting key to upper bound %s", bible->upperBound().key().latin1());
-      key( bible->upperBound() );
-    }
-	}
-	return dynamic_cast<CSwordBibleModuleInfo*>(m_module);
-}
-
-/** Returns the current book as Text, not as integer. */
-const QString CSwordVerseKey::book( const QString& newBook ) {
-	int min = 0;
-	int max = 1;
-	
-	if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module())) {
-		const bool hasOT = bible->hasTestament(CSwordBibleModuleInfo::OldTestament);		
-		const bool hasNT = bible->hasTestament(CSwordBibleModuleInfo::NewTestament);
-		if (hasOT && hasNT) {
-			min = 0;
-			max = 1;
-		}
-		else if (hasOT && !hasNT) {
-			min = 0;
-			max = 0;
-		}
-		else if (!hasOT && hasNT) {
-			min = 1;
-			max = 1;
-		}
-		else if (!hasOT && !hasNT) {
-			min = 0;
-			max = -1; //no loop
-		}
-  }
-
-	if (!newBook.isEmpty()) {
-		bool finished = false;
-		for (int testament = min; testament <= max && !finished; ++testament) {
-			for (int book = 0; book < BMAX[testament] && !finished; ++book) {
-				if ( !strcmp((const char*)newBook.local8Bit(),books[testament][book].name ) ) {
-					Testament(testament+1);
-					Book(book+1);
-					finished = true;
-				}
-			}
-		}
-	}
-	if ( Testament() >= min+1 && Testament() <= max+1 && Book() <= BMAX[min] )
-		return QString::fromLocal8Bit( books[Testament()-1][Book()-1].name );
-	return QString::fromLocal8Bit( books[min][0].name ); //return the first book, i.e. Genesis
-}
-
-/** Sets the key we use to the parameter. */
-const QString CSwordVerseKey::key(){	
-	return QString::fromLocal8Bit(getText()); //don't use fromUtf8 here!
-//	return QString::fromLocal8Bit((const char*)*this); //don't use fromUtf8 here!
-}
-
-void CSwordVerseKey::key( const QString& newKey ) {
-	if (newKey.isEmpty()) {
-    if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-      VerseKey::operator = ((const char*)bible->lowerBound().key().local8Bit());
-    }
-  }
-  else {
-    VerseKey::operator = ((const char*)newKey.local8Bit());
-  }
-}
-
-void CSwordVerseKey::key( const char* newKey ){
-  if (newKey && strlen(newKey)>0) {
-		VerseKey::operator = (newKey);
-	}
-  else if (!strlen(newKey)) {
-    if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-      VerseKey::operator = ((const char*)bible->lowerBound().key().local8Bit());
-    }
-  }
-}
-
-const bool CSwordVerseKey::next( const JumpType type ) {
-	//clear Error status
-	Error();
-
-	switch (type) {
-		case UseBook: {
-			if ((Book() <= 0) || (Book() >= BMAX[Testament()-1]) && (Testament() > 1)) {
-				return false;
-			}
-			Book(Book()+1);
-			break;
-		}
-		case UseChapter: {
-			Chapter(Chapter()+1);
-			break;
-		}
-		case UseVerse: {
-    	if (m_module && m_module->module()) {
-				//qWarning("module is %s", m_module->name().latin1());
-    		m_module->module()->SetKey(this);	//use this key as base for the next one!
-        m_module->module()->setSkipConsecutiveLinks(true);
-    		(*(m_module->module()) )++;
-        m_module->module()->setSkipConsecutiveLinks(false);
-
-    		if (!m_module->module()->Error()) {
-    			key( QString::fromLocal8Bit(m_module->module()->KeyText()) );//don't use fromUtf8
-        }
-    		else {
-					qWarning("VerseKey::next: module error");
-	    	  Verse(Verse()+1);
-	    	  break;
-	    	}
-    	}
-    	else {
-    	  Verse(Verse()+1);
-      }
-    	break;
-		}
-		default:
-			return false;
-	};
-
-  if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-    bool ret = true;
-    if (Error()) {
-      ret = false;
-		}
-		//check if the key if out of the modules bounds
-    else if (_compare(bible->lowerBound()) < 0) {
-      key( bible->lowerBound() );
-      ret = false;
-    }
-    if (_compare(bible->upperBound()) > 0) {
-      key( bible->upperBound() );
-      ret = false;
-    }
-    return ret;
-  }
-  else if (Error()) { //we have no module, so take care of VerseKey::Error()
-    return false;
-	}
-
-  return true;
-};
-
-const bool CSwordVerseKey::previous( const JumpType type ) {
-	switch (type) {
-		case UseBook: {
-			if (Book()<=1 || Book() > BMAX[Testament()-1] && Testament() > 1)
-				return false;
-			Book(Book()-1);
-			break;
-		}
-		case UseChapter: {
-			Chapter(Chapter()-1);
-			break;
-		}
-		case UseVerse: {
-    	if (m_module && m_module->module()) {
-    		m_module->module()->SetKey(this);	//use this key as base for the next one!
-        m_module->module()->setSkipConsecutiveLinks(true);
-    		( *( m_module->module() ) )--;
-        m_module->module()->setSkipConsecutiveLinks(true);      
-    		if (!m_module->module()->Error())
-    			key( QString::fromLocal8Bit(m_module->module()->KeyText()) );//don't use fromUtf8
-    		else
-	    	  Verse(Verse()-1);
-    	}
-    	else {
-    		Verse(Verse()-1);
-      }
-      break;
-		}
-		default:	
-			return false;
-	};
-
-  if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-    bool ret = true;
-    if (_compare(bible->lowerBound()) < 0 ) {
-      key( bible->lowerBound() );
-      ret = false;
-    }
-    if (_compare(bible->upperBound()) > 0 ) {
-      key( bible->upperBound() );
-      ret = false;
-    }
-    return ret;
-  }
-  else if (Error())
-    return false;
-  return true;
-};
-
-/** Assignment operator for more ease of use. */
-CSwordVerseKey& CSwordVerseKey::operator = (const QString& keyname){
-  key(keyname);
-  return *this;
-}
diff --git a/bibletime/backend/cswordversekey.h b/bibletime/backend/cswordversekey.h
deleted file mode 100644
index 18a30d4..0000000
--- a/bibletime/backend/cswordversekey.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/***************************************************************************
-                          cswordversekey.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************
-
- ***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDVERSEKEY_H
-#define CSWORDVERSEKEY_H
-
-//own includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qstring.h>
-
-//Sword includes
-#include <versekey.h>
-
-/**
-	* The CKey implementation for verse based modules (Bibles and Commentaries)
-	*
-	*	This class is the implementation of CKey for verse based modules like
-	*	Bibles and commentaries.
-	* This class provides the special functions to work with the verse based modules.
-	*
-	* Useful functions are
-	*	@see NextBook()
-	* @see PreviousBook()
-	* @see NextChapter()
-	* @see PreviousChapter()
-	* @see NextVerse()
-	* @see PreviousVerse().
-	*
-	* Call the constructor only with a valid verse based modules, otherwise this key will be invalid
-	* and the application will probably crash.
-	*
-	*	@version $Id: cswordversekey.h,v 1.15 2003/07/05 17:12:16 joachim Exp $
-  *	@author The BibleTime team
-  */
-class CSwordVerseKey : public CSwordKey,  public sword::VerseKey  {
-public:
-	enum JumpType {
-		UseBook,
-		UseChapter,
-		UseVerse
-	};
-
-	/**
-	* Constructor of this class.
-	*
-	* This function will construct a versekey with the current module position
-	* and it will setup the m_module members.
-	*
-	*/
-	CSwordVerseKey( CSwordModuleInfo* module );
-  /**
-  * Copy constructor.
-  */
-  CSwordVerseKey( const CSwordVerseKey& k );
-  /**
-  * VerseKey based constructor.
-  */
-  CSwordVerseKey( const sword::VerseKey* k, CSwordModuleInfo* module );
-  /**
-  * Clones this object.
-  */
-  virtual CSwordKey* copy() const;
-  /**
-  * Set/get the key. If the parameter is not set (means equal to QString::null)
-  * the used key is returned. Otherwise the key is set and the new on ei returned.
-  */
-  virtual const QString key();
-  /**
-  * Set the current key.
-  */
-  virtual void key( const QString& );
-  /**
-  * Set/get the key. If the parameter is not set (means equal to QString::null)
-  * the used key is returned. Otherwise the key is set and the new on ei returned.
-  */
-	virtual void key( const char* key );
-	
-	/**
-	* Jumps to the next entry of the given type
-	*/
-	const bool next( const JumpType type );
-	/**
-	* Jumps to the previous entry of the given type
-	*/
-	const bool previous ( const JumpType type );	
-  /**
-  * This functions returns the current book as localised text, not as book numer.
-  *
-  * Use "char Book()" to retrieve the book number of the current book.
-  * @return The name of the current book
-  */
-  const QString book(const QString& newBook = QString::null);
-  /**
-  * Sets the module for this key
-  */
-  virtual CSwordModuleInfo* const module( CSwordModuleInfo* const newModule = 0 );
-  /**
-	* Assignment operator for more ease of use.
-	*/
-  virtual CSwordVerseKey& operator = (const QString& keyname);
-};
-
-#endif
diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
deleted file mode 100644
index f3c94ba..0000000
--- a/bibletime/bibletime.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/***************************************************************************
-                          bibletime.cpp  -  The main class of BibleTime
-                             -------------------
-    begin                : Mit Jan 19 12:57:15 CET 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//local includes
-#include "config.h"
-#include "bibletime.h"
-
-//frontend includes
-#include "frontend/cmdiarea.h"
-#include "frontend/kstartuplogo.h"
-#include "frontend/mainindex/cmainindex.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/ctoolclass.h"
-#include "util/cpointers.h"
-
-//backend includes
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordcommentarymoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-
-//printing includes
-#include "printing/cprinter.h"
-
-//Qt includes
-#include <qsplitter.h>
-
-//KDE includes
-#include <kaction.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kaccel.h>
-#include <kmenubar.h>
-#include <ktoolbar.h>
-#include <krandomsequence.h>
-
-BibleTime::BibleTime()
-  : KMainWindow(0,0, WType_TopLevel /*| WDestructiveClose*/),
-	  m_initialized(false),
-	  m_moduleList(0),
-	  m_progress(0),
-	  m_currentProfile(0),
-    m_splitter(0),
-    m_mdi(0),
-    m_profileMgr(),
-    m_backend(0),
-    m_printer(0),
-    m_mainIndex(0)
-{
-	setHelpMenuEnabled(false);
-
-  initBackends();
-	initPrinter();
-	initView();
-	initActions();
-
-	createGUI("bibletimeui.rc");
-	initMenubar();
-	initConnections();
-
-	readSettings();
-
-	setPlainCaption("BibleTime " VERSION);
-
-  // we don't save the geometry, it's stored in the startup profile
-  setAutoSaveSettings(QString::fromLatin1("MainWindow"), true);
-}
-
-/** Saves the properties of BibleTime to the application wide configfile  */
-void BibleTime::saveSettings(){
-	if (m_mdi) {
-		m_mdi->saveSettings();
-  }
-
-  accel()->writeSettings();
-
- 	CBTConfig::set(CBTConfig::toolbar, m_viewToolbar_action->isChecked());
- 	CBTConfig::set(CBTConfig::mainIndex, m_viewMainIndex_action->isChecked());
-
- 	if (m_viewMainIndex_action->isChecked()) {	//only save changes when the groupmanager is visible
- 		CBTConfig::set(CBTConfig::splitterSizes, m_splitter->sizes());
-  }
-
- 	if (m_windowAutoTile_action->isChecked())	{
- 		CBTConfig::set(CBTConfig::autoTile, true);
- 		CBTConfig::set(CBTConfig::autoCascade, false);
- 	}
- 	else if ( m_windowAutoTile_action->isChecked() ) {
-		CBTConfig::set(CBTConfig::autoTile, false);
- 		CBTConfig::set(CBTConfig::autoCascade, true);	
- 	}
- 	else {
-		CBTConfig::set(CBTConfig::autoTile, false);
- 		CBTConfig::set(CBTConfig::autoCascade, false);	
- 	}
-
-	if ( CBTConfig::get(CBTConfig::restoreWorkspace) ) {
-		if (CProfile* p = m_profileMgr.startupProfile()) {
-			saveProfile(p);
-    }
-	}
-}
-
-/** Reads the settings from the configfile and sets the right properties. */
-void BibleTime::readSettings(){
-	accel()->readSettings(KGlobal::config());
-
- 	m_viewToolbar_action->setChecked( CBTConfig::get(CBTConfig::toolbar) );
- 	slotToggleToolbar();
-		
- 	m_viewMainIndex_action->setChecked( CBTConfig::get(CBTConfig::mainIndex) );
- 	slotToggleGroupManager();
-		
- 	m_splitter->setSizes( CBTConfig::get(CBTConfig::splitterSizes) );		
-
- 	if ( CBTConfig::get(CBTConfig::autoTile) ) {
- 		m_windowAutoTile_action->setChecked( true );
- 		m_windowAutoCascade_action->setChecked( false );
- 		m_mdi->setGUIOption( CMDIArea::autoTile );
- 	}
- 	else if ( CBTConfig::get(CBTConfig::autoCascade) ) {
- 		m_windowAutoCascade_action->setChecked(true);
- 		m_windowAutoTile_action->setChecked(false);
- 		m_mdi->setGUIOption( CMDIArea::autoCascade );
- 	}
- 	else {
- 		m_mdi->setGUIOption( CMDIArea::Nothing );		
- 		m_windowAutoTile_action->setChecked(false);
- 		m_windowAutoCascade_action->setChecked(false);		
- 	}
-}
-
-/** Creates a new presenter in the MDI area according to the type of the module. */
-CDisplayWindow* BibleTime::createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& key) {
-  kapp->setOverrideCursor( waitCursor );
-
-//  qWarning("will create now displayWindow (bibletime)");
-  CDisplayWindow* displayWindow = CDisplayWindow::createReadInstance(modules, m_mdi);
-//  qWarning("created displayWindow (bibletime)");
-  if ( displayWindow ) {
-  	displayWindow->init(key);
-		displayWindow->show();
-	}
-
-  kapp->restoreOverrideCursor();  
-	return displayWindow;
-}
-
-
-/** Creates a new presenter in the MDI area according to the type of the module. */
-CDisplayWindow* BibleTime::createReadDisplayWindow(CSwordModuleInfo* module, const QString& key) {
-	ListCSwordModuleInfo list;
-	list.append(module);
-
-	return createReadDisplayWindow(list, key);
-}
-
-CDisplayWindow* BibleTime::createWriteDisplayWindow(CSwordModuleInfo* module, const QString& key, const CDisplayWindow::WriteWindowType& type) {
-  kapp->setOverrideCursor( waitCursor );
-
-	ListCSwordModuleInfo modules;
-	modules.append(module);
-
-  CDisplayWindow* displayWindow = CDisplayWindow::createWriteInstance(modules, m_mdi, type);
-  if ( displayWindow ) {
-  	displayWindow->init(key);
-		displayWindow->show();
-	}
-
-  kapp->restoreOverrideCursor();
-	return displayWindow;
-}
-
-/** Refreshes all presenters.*/
-void BibleTime::refreshDisplayWindows() {
-	unsigned int index;				
-	for ( index = 0; index < m_mdi->windowList().count(); index++) {
-		if (CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index))) {
-   		window->reload();
-    }
-	}
-}
-
-/** Called before quit. */
-bool BibleTime::queryExit(){
-  if (!m_initialized) {
-  	return false;
-  }
-	saveSettings();
-	return true;
-}
-
-/** Called before a window is closed */
-bool BibleTime::queryClose(){
-  bool ret = true;
-	for ( unsigned int index = 0; index < m_mdi->windowList().count(); ++index) {
-		if (CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index))) {
-   		ret = ret && window->queryClose();
-    }
-	}	
-	return ret;
-}
-
-/** Reimplementation used for sessions management. */
-void BibleTime::saveProperties(KConfig* /*myConfig*/){
-
-}
-
-/** Reimplementation used for session management. */
-void BibleTime::readProperties(KConfig* /*myConfig*/){
-
-}
-
-/** Restores the workspace if the flag for this is set in the config. */
-void BibleTime::restoreWorkspace(){	
-	if (CProfile* p = m_profileMgr.startupProfile()) {
-		loadProfile(p);
-  }
-}
-
-/** Sets the caption of the mainwindow */
-void BibleTime::setCaption( const QString& ){
-	KMainWindow::setPlainCaption( KApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
-}
-
-/** Sets the plain caption of the main window */
-void BibleTime::setPlainCaption( const QString& ){
-	KMainWindow::setPlainCaption( KApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
-}
-
-/** Processes the commandline options given to BibleTime. */
-void BibleTime::processCommandline(){
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-  if (CBTConfig::get(CBTConfig::crashedLastTime) || CBTConfig::get(CBTConfig::restoreWorkspace)) {
-    if (!CBTConfig::get(CBTConfig::crashedTwoTimes) && !args->isSet("ignore-session")) { //restore workspace if it crashed only once
-      restoreWorkspace();
-    }
-  }
-
-  //open every time a module if the command line option was set.
-  if ( args->isSet("open-default-bible") && !CBTConfig::get(CBTConfig::crashedLastTime) && !CBTConfig::get(CBTConfig::crashedTwoTimes)) { //restore workspace if it crashed ony once
-    QString bibleKey = args->getOption("open-default-bible");    
-    CSwordModuleInfo* bible = CPointers::backend()->findModuleByDescription(CBTConfig::get(CBTConfig::standardBible));
-    if (bibleKey == "<random>") {
-      CSwordVerseKey vk(0);
-      const int maxIndex = 32400;
-
-      KRandomSequence rs;
-      int newIndex = rs.getLong(maxIndex);
-      vk.setPosition(sword::TOP);
-      vk.Index(newIndex);
-      bibleKey = vk.key();
-    }
-    createReadDisplayWindow(bible, bibleKey);
-//    if (isVisible())
-      m_mdi->myTile();//we are sure only one window is open, which should be displayed fullscreen in the working area
-  }
-}
-
-void BibleTime::polish(){
-  m_initialized = true;
-  KMainWindow::polish();
-  applyMainWindowSettings(KGlobal::config(), QString::fromLatin1("MainWindow"));
-}
-
diff --git a/bibletime/bibletime.h b/bibletime/bibletime.h
deleted file mode 100644
index d22e5f5..0000000
--- a/bibletime/bibletime.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/***************************************************************************
-                          bibletime.h  -  description
-                             -------------------
-    begin                : Mit Jan 19 12:57:15 CET 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
-***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BIBLETIME_H
-#define BIBLETIME_H
-
-//KDE includes
-#include <kmainwindow.h>
-
-//Frontend includes
-#include "frontend/cprofilemgr.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-
-//Backend includes
-#include "backend/cswordmoduleinfo.h"
-
-//forward class declarations
-
-//BT classes
-class CMDIArea;
-class CProfile;
-class CDisplayWindow;
-class CMainIndex;
-
-//KDE classes
-class KToggleAction;
-class KAccel;
-class KPopupMenu;
-class KAction;
-class KActionMenu;
-
-//QT classes
-class QPopupMenu;
-class QProgressDialog;
-class QSplitter;
-
-/**
- 	*	@page backend The structure of the backend
- 	*
- 	*	The backend implementation for Sword is called CSwordBackend, the classes we use
- 	* to work with keys are called CSwordVerseKey and CSwordLDKey, both are derived from
- 	* the class CSwordKey.
- 	* The CSwordKey derived classes used for Sword do also inherit the classes VerseKey (CSwordVerseKey)
- 	*	and SWKey (CSwordLDKey).
- 	*	
- 	*	The classes used to handle all module based stuff are derived from CModuleInfo.
- 	*	The module classes are: CSwordModuleInfo (for Sword modules), CSwordBibleModuleInfo (for bibles), CSwordCommentaryModuleInfo (for commentaries) and
- 	*	CSwordLexiconModuleInfo (for lexicons).
- 	*	Have a look at the class documentation of the mentioned classes to learn how the
- 	*	structure of them looks like and which class inherits which other class.
- 	*
- 	*	The first objects which should be created in the application is the backend (for Sword the class is called CSwordBackend).
- 	*	Then create all the different module classes for the correct Sword modules. Have a look at
- 	* BibleTime::initBackens() to see how it's done in BibleTime.@br
- 	*	Later you can work with them for example by using the CSwordKey and CSwordModuleInfo derived class.
- 	*/
-
-/**
- 	*	@page frontend The structure of the frontend
- 	*	
- 	*
- 	*	The frontend contains the classes which interact with the user. For example the main index,
- 	* the display windows, the searchdialog or the other parts.
- 	* The main index is implemented in the class CGroupManager, the items of the main index are implemented in the class CGroupManagerItem.
- 	* Each CGroupManagerItem has a type() function which returns the type of the object (Module, Bookmark or Group).<BR>
- 	* The display windows are all derived from the base class CPresenter. The display windows which handle Sword modules are all derived from the CSwordPresenter class.
- 	* The display windows which provide functionality are CBiblePresenter for Bibles, CCommentaryPresenter for commentaries and CLexiconPresenter for lexicon and dictionaries.
- 	* CSwordPresenter provides the essential base functions which are reimplemented in the derived classes (for example CSwordPresenter::lookup).<BR>
- 	* Another important part of the frontend are the keychoosers. They provide an interface to choose a key of a module. The interface for different module types is different.
- 	* The base class is CKeyChooser which is the factory for the derived classes. Use the function CKeyChooser::createInstance to get the correct
- 	* keychooser implementation for the desired module.<BR>
- 	*/
-
-/** @mainpage BibleTime - sourcecode documentation
- *
- *	This is the sourcecode documentation of BibleTime, a Bible study tool for KDE/Linux.
- *	BibleTime is devided in two major parts, the backend and the frontend.<BR>
- *	Documentation for the backend: @ref backend<BR>
- *	Documentation for the frontend: @ref frontend.<BR>
- */
-
-/** The main class of BibleTime. Here are the main widgets created.
-	*
-	* This is the main class of BibleTime! This class creates the GUI, the KAction objects
-	* and connects to some slots. Please insert the creation of actions in initActions,
-	* the creation of widgets into initView and the connect(...) calls into initConnections.
-	* Reading from a config file on creation time should go into readSettings(), saving into
-	* saveSettings().
-	* This is the general way of all BibleTime classes.
-	*/
-class BibleTime : public KMainWindow {
-	friend class CMDIArea;
-	Q_OBJECT
-public:
-	/**
-	* construtor of BibleTime
-	*/
-	BibleTime();
-	
-  virtual void polish();
-  /**
-	* Reads the settings from the configfile and sets the right properties.
-	*/
-	void readSettings();
-	/**
-	* Saves the settings of this class
-	*/
-	void saveSettings();
-	/**
-	* Restores the workspace if the flaf for this is set in the config.
-	*/
-	void restoreWorkspace();
-	/**
-	* Apply the settings given by the profile p
-	*/
-	void applyProfileSettings( CProfile* p );
-	/**
-	* Stores the settings of the mainwindow in the profile p
-	*/
-	void storeProfileSettings( CProfile* p );
-
-public slots:
-	/**
-	* Shows the daily tip
-	*/
-	void slotHelpTipOfDay();
-	/**
-	* Opens the optionsdialog of BibleTime.
-	*/
-	void slotSettingsOptions();
-	/**
-	* Opens the optionsdialog of BibleTime.
-	*/
-	void slotSwordSetupDialog();
-	/**
-	* Opens the handbook.
-	*/
-	void openOnlineHelp_Handbook();
-	/**
-	* Opens the bible study howto.
-	*/
-	void openOnlineHelp_Howto();
-	/**
-	* Sets the plain caption of the main window
-	*/
-	virtual void setPlainCaption( const QString& );
-	/**
-	* Sets the caption of the mainwindow
-	*/
-	virtual void setCaption(const QString&);
-  /**
-  * Processes the commandline options given to BibleTime.
-  */
-  void processCommandline();
-
-protected: // Protected methods
-	/**
-	* Initializes the view of this widget
-	*/
-	void initView();
-	/**
-	* Initializes the menubar of BibleTime.
-	*/
-	void initMenubar();
-	/**
-	* Initializes the SIGNAL / SLOT connections
-	*/
-	void initConnections();
-	/**
-	* Initializes the backend
-	*/
-	void initBackends();
-	/**
-	* Initializes the action objects of the GUI
-	*/
-	void initActions();
-	/**
-	* Refreshes all presenter supporting at least in of the features given as parameter.
-	*/
-	void refreshDisplayWindows();
-	/**
-	* Called before a window is closed
-	*/
-	bool queryClose();
-	/**
-	* Called before quit.
-	*/
-	bool queryExit();
-	/**
-	* Initializes the CPrinter object.
-	*/
-	void initPrinter();
-	/**
-	* Reimplementation used for session management.
-	*/
-	void readProperties(KConfig* config);
-	/**
-	* Reimplementation used for sessions management.
-	*/
-	void saveProperties(KConfig* myConfig);	
-
-protected slots:
-	/**
- 	* Creates a new presenter in the MDI area according to the type of the module.
- 	*/
-	CDisplayWindow* createReadDisplayWindow(ListCSwordModuleInfo, const QString&);
-	CDisplayWindow* createReadDisplayWindow(CSwordModuleInfo*, const QString&);
-	CDisplayWindow* createWriteDisplayWindow(CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType&);  
-	/** 	
- 	* Is called when the window menu is about to show ;-)
- 	*/
-	void slotWindowMenuAboutToShow();
-	/**
- 	* This slot is connected with the windowAutoTile_action object
- 	*/
-	void slotAutoTile();
-	/**
- 	* This slot is connected with the windowAutoCascade_action object
- 	*/
-	void slotAutoCascade();
-	/**
-	* Is called when a client was selected in the window menu
-	*/
-	void slotWindowMenuActivated( int );
-	/**
- 	* Shows/hides the toolbar
- 	*/
-	void slotToggleToolbar();
-	/**
-	* Opens a toolbar editor
-	*/
-	void slotSettingsToolbar();
-	/**
-	* Shows or hides the groupmanager.
-	*/
-	void slotToggleGroupManager();
-	/**
-	* Starts printing and opens the printerdialog at first.
-	*/
-	void slotFilePrint();
-	/**
- 	* Enables the "Clear printer queue" action
- 	*/
-	void slotSetPrintingStatus();
-	/**
-	* Saves to the profile with the menu id ID
-	*/
-	void saveProfile(int ID);
-	/**
-	* Saves the current settings into the currently activatred profile.
-	*/
-	void saveProfile(CProfile* p);
-	/**
-	* Saves the current settings into the currently activatred profile.
-	*/
-	void editProfiles();
-	/**
-	* Loads the profile with the menu id ID
-	*/
-	void loadProfile(int ID);
-	/**
-	* Loads the profile with the menu ID id
-	*/
-	void loadProfile(CProfile* p);
-	/**
-	* Toggles between normal and fullscreen mode.
-	*/
-	void toggleFullscreen();
-	/**
-	* Is called when settings in the optionsdialog have been
-	* changed (ok or apply)
-	*/
-	void slotSettingsChanged();
-	/**
-	* Is called when settings in the sword setup dialog have been
-	* changed (ok or apply)
-	*/
-	void slotSwordSetupChanged();
-	/**
-	 * Called when search button is pressed
-	 **/
-	void slotSearchModules();
-	/**
-	 * Called for search default bible
-	 **/
-	void slotSearchDefaultBible();
-	/**
-	 * Called when back button pressed
-	 **/
-//	void slotBack();
-	/**
-	 * Called when forward button pressed
-	 **/
-//	void slotForward();
-  /**
-   Saves current settings into a new profile.
-  */
-  void saveToNewProfile();
-  /**
-  * Slot to refresh the save profile and load profile menus.
-  */
-  void refreshProfileMenus();
-	
-
-private slots: // Private slots
-	/**
-	* No descriptions
-	*/
-	void slotPrintedPercent(const int index);
-	/**
-	* Printing was finished
-	*/
-	void slotPrintingFinished();
-	/**
-	* Aborts the printing
-	*/
-	void slotAbortPrinting();
-	/**
-	* Printing was started
-	*/
-	void slotPrintingStarted();
-
-private:
-  QPopupMenu* m_windowMenu;
-	QPopupMenu* m_editMenu;
-
-	/** FILE menu actions */
-	KAction* m_fileClearQueue_action;
-	KAction* m_filePrint_action;
-
-	/** VIEW menu actions */
-	KToggleAction*	m_viewToolbar_action;
-	KToggleAction*	m_viewMainIndex_action;
-
-	/** WINDOW menu actions */
-	KAction*	m_windowCascade_action;
-	KAction*	m_windowTile_action;
-	KToggleAction*	m_windowAutoCascade_action;
-	KToggleAction*	m_windowAutoTile_action;
-	KAction*	m_windowCloseAll_action;
-
-	KActionMenu*	m_windowSaveProfile_action;
- 	KAction*	m_windowSaveToNewProfile_action;
-	KActionMenu*	m_windowLoadProfile_action;
-	KAction*	m_windowEditProfiles_action;
-	KToggleAction*	m_windowFullscreen_action;
-
-	KHelpMenu* m_helpMenu;
-
-
-	bool m_initialized;
-	/**
-	* The list of installed SWORD modules
-	*/
-  ListCSwordModuleInfo* m_moduleList;
-	QProgressDialog* m_progress;
-
-  CProfile* m_currentProfile;
-	//KAccel* m_keyAccel;
-	QSplitter* m_splitter;
-	CMDIArea* m_mdi;
-
-	CProfileMgr m_profileMgr;
-	CSwordBackend* m_backend;
-	CPrinter* m_printer;
-
-	CMainIndex* m_mainIndex;
-
-
-};
-
-#endif
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
deleted file mode 100644
index e0984d7..0000000
--- a/bibletime/bibletime_init.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-/***************************************************************************
-                          bibletime_init.cpp  -  functions to initialize BibleTime on startup
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "bibletime.h"
-
-#include "backend/cswordbackend.h"
-
-#include "frontend/mainindex/cmainindex.h"
-#include "frontend/cprofilemgr.h"
-#include "frontend/cprofile.h"
-#include "frontend/cmdiarea.h"
-#include "frontend/kstartuplogo.h"
-#include "frontend/cswordsetupdialog.h"
-
-#include "backend/clanguagemgr.h"
-
-#include "printing/cprinter.h"
-
-#include "config.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/cpointers.h"
-#include "util/cresmgr.h"
-
-//system includes
-#include <stdlib.h>
-
-//QT includes
-#include <qpopupmenu.h>
-#include <qsplitter.h>
-#include <qguardedptr.h>
-#include <qlistview.h>
-
-//KDE includes
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kconfigbase.h>
-#include <ktoolbar.h>
-#include <kiconloader.h>
-#include <kstddirs.h>
-#include <kstdaction.h>
-#include <kmenubar.h>
-#include <kaccel.h>
-#include <klocale.h>
-#include <kaction.h>
-#include <khelpmenu.h>
-#include <kglobal.h>
-#include <kpopupmenu.h>
-
-/**Initializes the view of this widget*/
-void BibleTime::initView(){
-	KStartupLogo::setStatusMessage(i18n("Creating BibleTime's GUI") + QString::fromLatin1("..."));	
-
-	m_splitter = new QSplitter(this, "mainsplitter");
-//  m_splitter->setOpaqueResize( true );
-	setCentralWidget(m_splitter);	
-
-	m_mainIndex = new CMainIndex(m_splitter);
-	m_mainIndex->initTree();
-	m_mainIndex->setFocusPolicy(WheelFocus);       	
-
-	m_mdi = new CMDIArea(m_splitter, "mdiarea" );
-	m_mdi->setFocusPolicy(ClickFocus);
-
-	m_helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true, actionCollection());
-}
-
-/** Initializes the action objects of the GUI */
-void BibleTime::initActions() {
-	KStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + QString::fromLatin1("..."));
-	KAction* action = 0;
-
-	m_fileClearQueue_action = new KAction(i18n("Clear print queue"),
-    CResMgr::mainMenu::file::clearQueue::icon,
-    CResMgr::mainMenu::file::clearQueue::accel,
-    m_printer, SLOT(clearQueue()), actionCollection(),
-    CResMgr::mainMenu::file::clearQueue::actionName
-  );
-	m_fileClearQueue_action->setEnabled(false);
-	m_fileClearQueue_action->setToolTip( CResMgr::mainMenu::file::clearQueue::tooltip );
-	m_fileClearQueue_action->setWhatsThis( CResMgr::mainMenu::file::clearQueue::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_fileClearQueue_action->plugAccel( accel() );
-  #endif
-
-
-  //work around KDE 3.1 error messages
-//	if ( KAction* oldAction = actionCollection()->action(KStdAction::stdName(KStdAction::Print)) ) {
-//		actionCollection()->remove( oldAction );
-//  }
-  m_filePrint_action = KStdAction::print(this, SLOT( slotFilePrint() ), actionCollection());
-	m_filePrint_action->setEnabled(false);
-	m_filePrint_action->setToolTip( CResMgr::mainMenu::file::print::tooltip );
-	m_filePrint_action->setWhatsThis( CResMgr::mainMenu::file::print::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_filePrint_action->plugAccel( accel() );
-  #endif
-
-
-//	if ( KAction* oldAction = actionCollection()->action( KStdAction::stdName( KStdAction::Quit ) ) ) {	 //delete quit action if KDE created it
-//		actionCollection()->remove( oldAction );
-//  }
-  action = KStdAction::quit(kapp, SLOT( quit() ), actionCollection());
-	action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::file::quit::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  action = new KAction(i18n("Search in open module(s)"),
-    CResMgr::mainMenu::mainIndex::search::icon,
-    CResMgr::mainMenu::mainIndex::search::accel,
-    this, SLOT(slotSearchModules()), actionCollection(),
-    CResMgr::mainMenu::mainIndex::search::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::mainIndex::search::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  action = new KAction(i18n("Search in default bible"),
-    CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
-    CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
-    this, SLOT(slotSearchDefaultBible()), actionCollection(),
-    CResMgr::mainMenu::mainIndex::searchdefaultbible::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::mainIndex::searchdefaultbible::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	action->plugAccel( accel() );
-  #endif
-
-  m_viewToolbar_action = KStdAction::showToolbar(this, SLOT( slotToggleToolbar() ), actionCollection());
-	m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip );
-	m_viewToolbar_action->setWhatsThis( CResMgr::mainMenu::view::showToolBar::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_viewToolbar_action->plugAccel( accel() );
-  #endif
-
-
-  m_viewMainIndex_action = new KToggleAction(i18n("&Show main index"),
-    CResMgr::mainMenu::view::showMainIndex::icon,
-    CResMgr::mainMenu::view::showMainIndex::accel,
-		this, SLOT(slotToggleGroupManager()), actionCollection(),
-    CResMgr::mainMenu::view::showMainIndex::actionName);
-	m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip );
-	m_viewMainIndex_action->setWhatsThis( CResMgr::mainMenu::view::showMainIndex::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    m_viewMainIndex_action->plugAccel( accel() );
-  #endif
-
-  action = KStdAction::preferences(this, SLOT( slotSettingsOptions() ), actionCollection());
-	action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::settings::optionsDialog::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	action->plugAccel( accel() );
-  #endif
-
-  action = new KAction(i18n("Configure &Sword"),
-    CResMgr::mainMenu::settings::swordSetupDialog::icon,
-    CResMgr::mainMenu::settings::swordSetupDialog::accel,
-		this, SLOT( slotSwordSetupDialog() ), actionCollection(),
-    CResMgr::mainMenu::settings::swordSetupDialog::actionName
-  );
-	action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::settings::swordSetupDialog::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  action = KStdAction::configureToolbars(this, SLOT( slotSettingsToolbar() ), actionCollection());
-	action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::settings::editToolBar::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  m_windowCascade_action = new KAction(i18n("&Cascade"),
-    CResMgr::mainMenu::window::cascade::icon,
-    CResMgr::mainMenu::window::cascade::accel,
-		m_mdi, SLOT(myCascade()), actionCollection(),
-    CResMgr::mainMenu::window::cascade::actionName
-  );
-	m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip );
-	m_windowCascade_action->setWhatsThis( CResMgr::mainMenu::window::cascade::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowCascade_action->plugAccel( accel());
-  #endif
-
-
-  m_windowTile_action = new KAction(i18n("&Tile"),
-    CResMgr::mainMenu::window::tile::icon,
-    CResMgr::mainMenu::window::tile::accel,
-    m_mdi, SLOT(myTile()), actionCollection(),
-    CResMgr::mainMenu::window::tile::actionName
-	);
-	m_windowTile_action->setToolTip( CResMgr::mainMenu::window::tile::tooltip );
-	m_windowTile_action->setWhatsThis( CResMgr::mainMenu::window::tile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowTile_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowAutoCascade_action 	= new KToggleAction(i18n("&Auto cascade"),
-    CResMgr::mainMenu::window::autoCascade::icon,
-		CResMgr::mainMenu::window::autoCascade::accel,
-    this, SLOT(slotAutoCascade()), actionCollection(),
-    CResMgr::mainMenu::window::autoCascade::actionName
-  );
-	m_windowAutoCascade_action->setToolTip( CResMgr::mainMenu::window::autoCascade::tooltip );
-	m_windowAutoCascade_action->setWhatsThis( CResMgr::mainMenu::window::autoCascade::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowAutoCascade_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowAutoTile_action = new KToggleAction(i18n("A&uto Tile"),
-    CResMgr::mainMenu::window::autoTile::icon,
-		CResMgr::mainMenu::window::autoTile::accel,
-    this, SLOT(slotAutoTile()), actionCollection(),
-    CResMgr::mainMenu::window::autoTile::actionName
-  );
-	m_windowAutoTile_action->setToolTip( CResMgr::mainMenu::window::autoTile::tooltip );
-	m_windowAutoTile_action->setWhatsThis( CResMgr::mainMenu::window::autoTile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowAutoTile_action->plugAccel( accel() );
-  #endif
-
-
-  m_windowCloseAll_action = new KAction(i18n("&Close all"),
-    CResMgr::mainMenu::window::closeAll::icon,
-    CResMgr::mainMenu::window::closeAll::accel,
-    m_mdi, SLOT(deleteAll()), actionCollection(),
-    CResMgr::mainMenu::window::closeAll::actionName
-  );
-	m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip );
-	m_windowCloseAll_action->setWhatsThis( CResMgr::mainMenu::window::closeAll::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowCloseAll_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowSaveProfile_action = new KActionMenu(i18n("&Save session"),
-    CResMgr::mainMenu::window::saveProfile::icon,
-    actionCollection(),
-    CResMgr::mainMenu::window::saveProfile::actionName
-  );
-	m_windowSaveProfile_action->setToolTip( CResMgr::mainMenu::window::saveProfile::tooltip );
-	m_windowSaveProfile_action->setWhatsThis( CResMgr::mainMenu::window::saveProfile::whatsthis );
-  #if KDE_VERSION_MINOR < 1                           
-  	m_windowSaveProfile_action->plugAccel( accel() );
-  #endif
-
-
-  m_windowSaveToNewProfile_action = new KAction(i18n("&Save as new session"),
-    CResMgr::mainMenu::window::saveToNewProfile::icon,
-    CResMgr::mainMenu::window::saveToNewProfile::accel,
-    this, SLOT(saveToNewProfile()), actionCollection(),
-    CResMgr::mainMenu::window::saveToNewProfile::actionName
-  );
-	m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip );
-	m_windowSaveToNewProfile_action->setWhatsThis( CResMgr::mainMenu::window::saveToNewProfile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowSaveToNewProfile_action->plugAccel( accel() );
-  #endif
-  
-
-	m_windowLoadProfile_action = new KActionMenu(i18n("&Load session"),
-    CResMgr::mainMenu::window::loadProfile::icon,
-    actionCollection(),
-    CResMgr::mainMenu::window::loadProfile::actionName
-  );
-	m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::loadProfile::tooltip );
-	m_windowLoadProfile_action->setWhatsThis( CResMgr::mainMenu::window::loadProfile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowLoadProfile_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowEditProfiles_action = new KAction(i18n("&Configure sessions"),
-    CResMgr::mainMenu::window::setupProfiles::icon,
-    CResMgr::mainMenu::window::setupProfiles::accel,
-    this, SLOT(editProfiles()), actionCollection(),
-    CResMgr::mainMenu::window::setupProfiles::actionName
-  );
-	m_windowEditProfiles_action->setToolTip( CResMgr::mainMenu::window::setupProfiles::tooltip );
-	m_windowEditProfiles_action->setWhatsThis( CResMgr::mainMenu::window::setupProfiles::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowEditProfiles_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"),
-    CResMgr::mainMenu::window::showFullscreen::icon,
-		CResMgr::mainMenu::window::showFullscreen::accel,
-    this, SLOT(toggleFullscreen()), actionCollection(),
-    CResMgr::mainMenu::window::showFullscreen::actionName
-  );
-	m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
-	m_windowFullscreen_action->setWhatsThis( CResMgr::mainMenu::window::showFullscreen::whatsthis );
-	m_windowFullscreen_action->setShortcutConfigurable(true);
-  #if KDE_VERSION_MINOR < 1
-  	m_windowFullscreen_action->plugAccel( accel() );
-  #endif
-
-	QPtrList<CProfile> profiles = m_profileMgr.profiles();
-	KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
-	KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
-	connect(loadPopup, SIGNAL(activated(int)), SLOT(loadProfile(int)));
-	connect(savePopup, SIGNAL(activated(int)), SLOT(saveProfile(int)));
-	for (CProfile* p = profiles.first(); p; p = profiles.next()) {
-		savePopup->insertItem(p->name());
-		loadPopup->insertItem(p->name());
-	}
-
-	if ( actionCollection()->action( KStdAction::stdName(KStdAction::HelpContents) )) {	 //delete help action if KDE created it
-		actionCollection()->remove(actionCollection()->action(KStdAction::stdName(KStdAction::HelpContents)) );
-  }
-
-  action = new KAction(i18n("&Handbook"),
-    CResMgr::mainMenu::help::handbook::icon,
-    CResMgr::mainMenu::help::handbook::accel,
-    this, SLOT(openOnlineHelp_Handbook()), actionCollection(),
-    CResMgr::mainMenu::help::handbook::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::help::handbook::whatsthis  );
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-
-	action = new KAction(i18n("&Bible Study Howto"),
-    CResMgr::mainMenu::help::bibleStudyHowTo::icon,
-    CResMgr::mainMenu::help::bibleStudyHowTo::accel,
-    this, SLOT(openOnlineHelp_Howto()), actionCollection(),
-    CResMgr::mainMenu::help::bibleStudyHowTo::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::help::bibleStudyHowTo::whatsthis  );
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-
-	action = KStdAction::whatsThis(this, SLOT(whatsThis()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::whatsThis::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::whatsThis::whatsthis);
-  #if KDE_VERSION_MINOR < 1
-	action->plugAccel( accel() );
-  #endif
-
-	action = KStdAction::reportBug(m_helpMenu, SLOT(reportBug()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::bugreport::whatsthis);
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-//	action->setIcon(ICON_BUG_REPORT);
-
-	action = new KAction(i18n("&Daily tip"),
-    CResMgr::mainMenu::help::dailyTip::icon,
-    CResMgr::mainMenu::help::dailyTip::accel,
-    this, SLOT(slotHelpTipOfDay()), actionCollection(),
-    CResMgr::mainMenu::help::dailyTip::actionName
-  );
-	action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::dailyTip::whatsthis);
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-  
-	if ( actionCollection()->action( KStdAction::stdName( KStdAction::AboutApp ) ) ) {	 //delete About KDE action if KDE created it
-		actionCollection()->remove(actionCollection()->action(KStdAction::stdName( KStdAction::AboutApp )));
-  }
-  action = KStdAction::aboutApp(m_helpMenu, SLOT(aboutApplication()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::aboutBibleTime::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::aboutBibleTime::whatsthis);
-
-	//delete About KDE action if KDE created it already
-	if ( actionCollection()->action( KStdAction::stdName( KStdAction::AboutKDE ) ) ) {	 //delete About KDE action if KDE created it
-		actionCollection()->remove(actionCollection()->action(KStdAction::stdName( KStdAction::AboutKDE )));
-  }
-	action = KStdAction::aboutKDE(m_helpMenu, SLOT(aboutKDE()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::aboutKDE::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::aboutKDE::whatsthis);
-}
-
-/** Initializes the menubar of BibleTime. */
-void BibleTime::initMenubar(){
-	//get the window and edit menus using the actions and their properties
-	m_windowMenu = dynamic_cast<QPopupMenu*>(m_windowTile_action->container(0));
-}
-
-/** Initializes the SIGNAL / SLOT connections */
-void BibleTime::initConnections(){
-	connect(m_mdi, SIGNAL(sigSetToplevelCaption(const QString&)),
-		this, SLOT(setPlainCaption(const QString&)));
-	connect(m_mdi, SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)),
-		this, SLOT(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)));
-
-	if (m_windowMenu) {
-		connect(m_windowMenu, SIGNAL(aboutToShow()),
-			this, SLOT(slotWindowMenuAboutToShow()));
-		connect(m_windowMenu, SIGNAL(activated(int)),
-			this, SLOT(slotWindowMenuActivated(int)));
-	}
-	else {
-		qWarning("Main window: can't find window menu");
-  }
-
-
-	connect(m_mainIndex, SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)),
-		this, SLOT(createReadDisplayWindow(ListCSwordModuleInfo,const QString&)));
-	connect(m_mainIndex, SIGNAL(createWriteDisplayWindow(CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType&)),
-		this, SLOT(createWriteDisplayWindow(CSwordModuleInfo*,const QString&, const CDisplayWindow::WriteWindowType&)));
-    
-
-  //connect to the signals of the printer object
-  connect(m_printer, SIGNAL(addedFirstQueueItem()),
-		this, SLOT(slotSetPrintingStatus()));
-	connect(m_printer, SIGNAL(printingFinished()),
-		this, SLOT(slotPrintingFinished()));
-	connect(m_printer, SIGNAL(queueCleared()),
-		this, SLOT(slotSetPrintingStatus()));
-
-  //if we use KDE 3.1 we do not use our own printing status window, KDE >= 3.1 has a better one
-#ifdef KDE_VERSION_MINOR
-#if KDE_VERSION_MINOR < 1
-  connect(m_printer, SIGNAL(printingStarted()),
-		this, SLOT(slotPrintingStarted()));		
-	connect(m_printer, SIGNAL(printingFinished()),
-		this, SLOT(slotSetPrintingStatus()));		
-  connect(m_printer, SIGNAL(printingInterrupted()),
-		this, SLOT(slotPrintingFinished()));
-	connect(m_printer, SIGNAL(percentCompleted(const int)),
-		this, SLOT(slotPrintedPercent(const int)));
-#endif
-#endif
-
-	connect(m_printer, SIGNAL(printingInterrupted()),
-		this, SLOT(slotSetPrintingStatus()));
-
-}
-
-/** Initializes the backend */
-void BibleTime::initBackends(){
-	KStartupLogo::setStatusMessage(i18n("Initializing Sword") + QString::fromLatin1("..."));
-
-	m_backend = new CSwordBackend();
-	CPointers::setBackend(m_backend);
-	const CSwordBackend::LoadError errorCode = m_backend->initModules();
-
-	m_moduleList = 0;
-	if ( errorCode == CSwordBackend::NoError ) {	//no error
-		m_moduleList = &(m_backend->moduleList());
-	}
-	else {
-		m_moduleList = 0;
-		//show error message that initBackend failed
-		switch (errorCode) {
-			case CSwordBackend::NoSwordConfig: //mods.d or mods.conf missing
-			{
-				KStartupLogo::hideSplash();
-        CSwordSetupDialog dlg;
-        dlg.showPart( CSwordSetupDialog::Sword );
-        dlg.exec();
-				break;
-	    }
-
-			case CSwordBackend::NoModules: //no modules installed, but config exists
-			{
-				KStartupLogo::hideSplash();
-        CSwordSetupDialog dlg;
-        dlg.showPart( CSwordSetupDialog::Install );
-        dlg.exec();
-				break;
-		  }
-
-			default: //unknown error
-			{
-				KStartupLogo::hideSplash();
-        CSwordSetupDialog dlg;
-        dlg.showPart( CSwordSetupDialog::Sword );
-       	dlg.exec();
-				break;
-		  }
-		}
-	}
-	m_backend->booknameLanguage( CBTConfig::get(CBTConfig::language) );
-}
-
-/** Initializes the CPrinter object. */
-void BibleTime::initPrinter() {
-	KStartupLogo::setStatusMessage(i18n("Initializing print system") + QString::fromLatin1("..."));
-	CPointers::setPrinter( (m_printer = new CPrinter(this)) );
-}
-
-/** Apply the settings given by the profile p*/
-void BibleTime::applyProfileSettings( CProfile* p ){
-	if (!p) {
-		return;
-  }
-
-	if (m_initialized) //on startup KDE sets the main geometry
-    setGeometry( p->geometry() );
-	m_windowFullscreen_action->setChecked( p->fullscreen() );  //set the fullscreen button state
-	toggleFullscreen();  
-}
-
-/** Stores the settings of the mainwindow in the profile p */
-void BibleTime::storeProfileSettings( CProfile* p ){
-  if (!p || !m_windowFullscreen_action) {
-    return;
-  }
-  p->setFullscreen( m_windowFullscreen_action->isChecked() );
-	p->setGeometry(geometry());
-}
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
deleted file mode 100644
index 644c69f..0000000
--- a/bibletime/bibletime_slots.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-/***************************************************************************
-                          bibletime_slots.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "bibletime.h"
-#include "config.h"
-
-#include "backend/cswordversekey.h"
-
-#include "util/ctoolclass.h"
-
-#include "frontend/cmdiarea.h"
-#include "frontend/cprofilemgr.h"
-#include "frontend/cprofile.h"
-#include "frontend/cprofilewindow.h"                       	
-#include "frontend/coptionsdialog.h"
-#include "frontend/cswordsetupdialog.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cinputdialog.h"
-#include "frontend/mainindex/cmainindex.h"
-#include "frontend/mainindex/cindexitem.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cbiblereadwindow.h"
-#include "frontend/searchdialog/csearchdialog.h"
-
-#include "printing/cprinter.h"
-
-#include <errno.h>
-
-//QT includes
-#include <qprogressdialog.h>
-#include <qlistview.h>
-#include <qwhatsthis.h>
-#include <qvaluelist.h>
-#include <qclipboard.h>
-//#include <qxembed.h>
-#include <qinputdialog.h>
-
-//KDE includes
-#include <kaction.h>
-#include <kapplication.h>
-#include <kaboutkde.h>
-#include <kaboutdialog.h>
-#include <kbugreport.h>
-#include <kaboutapplication.h>
-#include <kstandarddirs.h>
-#include <kmenubar.h>
-#include <kaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kedittoolbar.h>
-#include <kpopupmenu.h>
-#include <khelpmenu.h>
-#include <ktip.h>
-
-//Sword includes
-#include <versekey.h>
-
-/** Opens the optionsdialog of BibleTime. */
-void BibleTime::slotSettingsOptions(){
-	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", accel());
-  connect(dlg, SIGNAL(signalSettingsChanged()), SLOT(slotSettingsChanged()) );
-	
-	dlg->exec();
-	dlg->delayedDestruct();
-}
-
-/** Is called when settings in the optionsdialog were changed (ok or apply) */
-void BibleTime::slotSettingsChanged(){
- 	const QString language = CBTConfig::get(CBTConfig::language);
- 	m_backend->booknameLanguage(language);
-
- 	QListViewItemIterator it( m_mainIndex );
- 	CItemBase* item = 0;
- 	for ( ; it.current(); ++it ) {
- 		if ( (item = dynamic_cast<CItemBase*>(it.current())) ) {
-      item->update();
- 		}
-  }
-
-  refreshDisplayWindows();
-  refreshProfileMenus();
-}
-
-/** Opens the sword setup dialog of BibleTime. */
-void BibleTime::slotSwordSetupDialog(){
-	CSwordSetupDialog *dlg = new CSwordSetupDialog(this, "CSwordSetupDialog");
-  connect(dlg, SIGNAL(signalSwordSetupChanged()), SLOT(slotSwordSetupChanged()) );
-
-	dlg->exec();
-	dlg->delayedDestruct();
-}
-
-/** Is called when settings in the sword setup dialog were changed (ok or apply) */
-void BibleTime::slotSwordSetupChanged(){
-//  qWarning("swordChanged: start");
-  /*
-    Refresh everything here what might have changed
-    these are the mainindex, the searchdialog, the displaywindows
-    But at first we have to reset the Sword backend to reload the modules
-  */
-//  qWarning("swordChanged: reload bookmarks");
-  m_mainIndex->saveBookmarks();
-//  qWarning("swordChanged: reload modules");
-
-//  m_backend->reloadModules();
-	CPointers::deleteBackend();
-	m_backend = new CSwordBackend();
-	CPointers::setBackend(m_backend);
-	/*const CSwordBackend::LoadError errorCode = */ m_backend->initModules();
-
-//  qWarning("swordChanged: reload sword");
-  m_mainIndex->reloadSword();
-
-//  refresh display windows
-//  qWarning("swordChanged: reload windows");
-  refreshDisplayWindows();
-
-
-//  refreshProfileMenus();
-}
-
-
-
-/** Shows the daily tip */
-void BibleTime::slotHelpTipOfDay(){
-	KTipDialog::setShowOnStart( CBTConfig::get(CBTConfig::tips) );
-	KTipDialog::showTip(this, "bibletime/tips", true);
-}
-
-/** Is called just before the window menu is ahown. */
-void BibleTime::slotWindowMenuAboutToShow(){
-	if (!m_windowMenu) {
-		return;
-  }
-
-	if ( m_windowSaveProfile_action->isPlugged() )
-		m_windowSaveProfile_action->unplug(m_windowMenu);
-	if ( m_windowLoadProfile_action->isPlugged() )
-		m_windowLoadProfile_action->unplug(m_windowMenu);
-	if ( m_windowEditProfiles_action->isPlugged() )
-		m_windowEditProfiles_action->unplug(m_windowMenu);
-	if ( m_windowFullscreen_action->isPlugged() )
-		m_windowFullscreen_action->unplug(m_windowMenu);
-				
-	if ( m_windowCascade_action->isPlugged() )
-		m_windowCascade_action->unplug(m_windowMenu);
-	if ( m_windowTile_action->isPlugged() )
-		m_windowTile_action->unplug(m_windowMenu);
-	if ( m_windowAutoCascade_action->isPlugged() )
-		m_windowAutoCascade_action->unplug(m_windowMenu);
-	if ( m_windowAutoTile_action->isPlugged() )
-		m_windowAutoTile_action->unplug(m_windowMenu);
-	if ( m_windowCloseAll_action->isPlugged() )
-		m_windowAutoTile_action->unplug(m_windowMenu);
-
-	m_windowMenu->clear();
-			
-	m_windowSaveProfile_action->plug(m_windowMenu);	
-	m_windowSaveToNewProfile_action->plug(m_windowMenu);	
-    m_windowLoadProfile_action->plug(m_windowMenu);
-	m_windowEditProfiles_action->plug(m_windowMenu);	
-	m_windowMenu->insertSeparator();	
-	m_windowFullscreen_action->plug(m_windowMenu);				
-	m_windowMenu->insertSeparator();	
-	m_windowCascade_action->plug(m_windowMenu);
-	m_windowTile_action->plug(m_windowMenu);
-	m_windowAutoCascade_action->plug(m_windowMenu);
-	m_windowAutoTile_action->plug(m_windowMenu);
-	m_windowCloseAll_action->plug(m_windowMenu);	
-	
-	if ( m_mdi->windowList().isEmpty() ) {
-		m_windowCascade_action->setEnabled(false);
-		m_windowTile_action->setEnabled(false);		
-		m_windowCloseAll_action->setEnabled(false);		
-	}
-	else if (m_mdi->windowList().count() == 1) {
-		m_windowTile_action->setEnabled( false );
-		m_windowCascade_action->setEnabled( false );
-		m_windowCloseAll_action->setEnabled( true );
-		m_windowMenu->insertSeparator();
-	} else {
-		m_windowTile_action->setEnabled( !m_windowAutoTile_action->isChecked() && !m_windowAutoCascade_action->isChecked() );
-		m_windowCascade_action->setEnabled( !m_windowAutoCascade_action->isChecked() && !!m_windowAutoTile_action->isChecked());
-		m_windowCloseAll_action->setEnabled( true );
-		m_windowMenu->insertSeparator();		
-	}
-	
-	QWidgetList windows = m_mdi->windowList();
-	int i, id;
-	for ( i = 0; i < int(windows.count()); ++i ) {
-    QString caption;
-    if (CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.at(i)))
-      caption = QString::fromLatin1("%1 (%2)").arg(w->caption()).arg(w->key()->key());
-    else
-      caption = windows.at(i)->caption();
-		id = m_windowMenu->insertItem(QString::fromLatin1("&%1 ").arg(i+1) + caption /*+ windows.at()*/,
-			this, SLOT(slotWindowMenuActivated( int )) );
-		m_windowMenu->setItemParameter( id, i );
-	  m_windowMenu->setItemChecked( id, m_mdi->activeWindow() == windows.at(i) );
-	}
-}
-
-/** This slot is connected with the windowAutoTile_action object */
-void BibleTime::slotAutoTile(){
-	if (m_windowAutoTile_action->isChecked()) {
-		m_windowAutoCascade_action->setChecked(false);
-		m_mdi->setGUIOption( CMDIArea::autoTile );
-	}
-	else if (!m_windowAutoCascade_action->isChecked()) { //tile and cascade are enabled/disbled in  slotWindowMenuAboutToShow
-    m_mdi->setGUIOption( CMDIArea::Nothing );    
-  }
-}
-
-/** This slot is connected with the windowAutoCascade_action object */
-void BibleTime::slotAutoCascade(){
-	if (m_windowAutoCascade_action->isChecked()) {
-		m_windowAutoTile_action->setChecked(false);
-		m_mdi->setGUIOption( CMDIArea::autoCascade );
-	}
-	else if (!m_windowAutoTile_action->isChecked()) { //tile and cascade are enabled/disbled in  slotWindowMenuAboutToShow
-		m_mdi->setGUIOption( CMDIArea::Nothing );    
-  }
-}
-
-void BibleTime::slotWindowMenuActivated( int id ) {
-  if (!m_windowMenu)
-  	return;
-  	
-//  QString dummy;
-  QWidget* w = m_mdi->windowList().at( id );
-  if ( w )
-		w->setFocus();
-}
-
-
-/** Shows/hides the toolbar */
-void BibleTime::slotToggleToolbar(){
-	if (m_viewToolbar_action->isChecked())
-		toolBar("mainToolBar")->show();
-	else
-		toolBar("mainToolBar")->hide();
-}
-
-/** Shows or hides the groupmanager. */
-void BibleTime::slotToggleGroupManager() {
-	if (m_viewMainIndex_action->isChecked()) {
-		m_mainIndex->show();
-  }
-	else {
-		m_mainIndex->hide();
-  }
-}
-
-/** Opens a toolbar editor */
-void BibleTime::slotSettingsToolbar(){
-	KEditToolbar dlg(actionCollection());
-	if (dlg.exec()) {
-		createGUI();
-  }
-}
-
-/** Opens the print dialog. */
-void BibleTime::slotFilePrint(){
-	m_printer->setup(this);	//opens the printer dialog
-}
-
-/** Enables the "Clear printer queue" action */
-void BibleTime::slotSetPrintingStatus(){
-	const bool enable = (m_printer->queue().count() > 0);
-	m_filePrint_action->setEnabled( enable );
-	m_fileClearQueue_action->setEnabled( enable );
-}
-
-/** Printing was started */
-void BibleTime::slotPrintingStarted(){
-	m_progress = new QProgressDialog(i18n("Printing..."), i18n("Abort printing"),100,this, "progress", true);
-	connect(m_progress, SIGNAL(cancelled()), SLOT(slotAbortPrinting()));
-	m_progress->setProgress(0);
-	m_progress->setMinimumDuration(0);
-  m_progress->setCaption("BibleTime");
-	m_progress->show();
-}
-
-/** Printing was finished */
-void BibleTime::slotPrintingFinished(){
-	delete m_progress;
-	m_progress = 0;	
-}
-
-/** No descriptions */
-void BibleTime::slotPrintedPercent( const int percent ){
-	if (m_progress)
-		m_progress->setProgress(percent);
-}
-
-/** Aborts the printing */
-void BibleTime::slotAbortPrinting(){
-	m_printer->abort();
-	if (m_progress)
-		slotPrintingFinished();
-}
-
-
-void BibleTime::slotSearchModules() {
-  //get the modules of the open windows
-  ListCSwordModuleInfo modules;
-  
-	QWidgetList windows = m_mdi->windowList();
-	for ( int i = 0; i < static_cast<int>(windows.count()); ++i ) {
-    if (CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.at(i))) {
-      ListCSwordModuleInfo windowModules = w->modules();
-      for (CSwordModuleInfo* module = windowModules.first(); module; module = windowModules.next()) {
-        modules.append(module);
-      };
-    };
-  };
-  
-  CSearchDialog::openDialog(modules, QString::null);
-}
-
-/* Search default Bible slot
- * Call CSearchDialog::openDialog with only the default bible module
- */
-void BibleTime::slotSearchDefaultBible() {
-  ListCSwordModuleInfo module;
-  CSwordModuleInfo* bible = CPointers::backend()->findModuleByDescription(CBTConfig::get(CBTConfig::standardBible));
-  if(bible != 0)
-    module.append(bible);
-
-  CSearchDialog::openDialog(module, QString::null);
-}
-
-void BibleTime::openOnlineHelp_Handbook() {
-   kapp->invokeHelp("", "bibletime/handbook");
-}
-
-void BibleTime::openOnlineHelp_Howto() {
-  kapp->invokeHelp("", "bibletime/howto");
-}
-
-/** Saves the current settings into the currently activatred profile. */
-void BibleTime::saveProfile(int ID){
-	m_mdi->setUpdatesEnabled(false);
-
-  KPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
-	if ( CProfile* p = m_profileMgr.profile(popup->text(ID)) ) {
-		saveProfile(p);
-  }
-
-	m_mdi->setUpdatesEnabled(true);	
-}
-
-void BibleTime::saveProfile(CProfile* profile){
-	if (!profile) {
-		return;
-  }
-
-	//save mainwindow settings
-	storeProfileSettings(profile);
-			
-	QWidgetList windows = m_mdi->windowList();
-	QPtrList<CProfileWindow> profileWindows;
-	for (QWidget* w = windows.first(); w; w = windows.next()) {
-		CDisplayWindow* displayWindow = dynamic_cast<CDisplayWindow*>(w);
-		if (!displayWindow) {
-			continue;
-    }
-
-		CProfileWindow* profileWindow = new CProfileWindow();
-		displayWindow->storeProfileSettings(profileWindow);
-		profileWindows.append(profileWindow);
-	}
-	profile->save(profileWindows);
-
-//clean up memory - delete all created profile windows
-	profileWindows.setAutoDelete(true);
-	profileWindows.clear();
-}
-
-void BibleTime::loadProfile(int ID){	
-	KPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
-  if ( CProfile* p = m_profileMgr.profile( popup->text(ID) ) ) {
-    m_mdi->deleteAll();
-
-    loadProfile(p);
-  }
-}
-
-void BibleTime::loadProfile(CProfile* p){
-	if (!p)
-		return;
-    
-  QPtrList<CProfileWindow> windows = p->load();
-
-	//load mainwindow setttings
-	applyProfileSettings(p);
-
-	m_mdi->setUpdatesEnabled(false);//don't auto tile or auto cascade, this would mess up everything!!
-
-  QWidget* focusWindow = 0;
-  
-  for (CProfileWindow* w = windows.first(); w; w = windows.next()) {
-		const QString key = w->key();
-		QStringList usedModules = w->modules();
-		ListCSwordModuleInfo modules;
-		for ( QStringList::Iterator it = usedModules.begin(); it != usedModules.end(); ++it ) {
-			if (CSwordModuleInfo* m = m_backend->findModuleByName(*it)) {
-				modules.append(m);
-      }
-    }
-    if (!modules.count()) { //are the modules still installed? If not continue wih next session window
-      continue;
-    }
-
-    //is w->isWriteWindow is false we create a write window, otherwise a read window
-    CDisplayWindow* displayWindow = 0;
-    if (w->writeWindowType() > 0) { //create a write window
-      displayWindow = createWriteDisplayWindow(modules.first(), key, CDisplayWindow::WriteWindowType(w->writeWindowType()) );
-		}
-    else { //create a read window
-      displayWindow = createReadDisplayWindow(modules, key);
-		}
-    
-    if (displayWindow) { //if a window was created initialize it.
-      if (w->hasFocus()) {
-        focusWindow = displayWindow;
-      }
-
-//      displayWindow->parentWidget()->lower();
-      displayWindow->applyProfileSettings(w);
-    };
-	}
-
-	m_mdi->setUpdatesEnabled(true);
-
-  if (focusWindow) {
-//    focusWindow->parentWidget()->raise();
-//    focusWindow->setFocus();
-  }
-}
-
-void BibleTime::toggleFullscreen(){
-//  if (!isVisible())
-//    return;
-  
-	if (m_windowFullscreen_action->isChecked()) {
- 		showFullScreen();
-  }
-	else if (isVisible()){
-    showNormal();
-  }
-}
-
-void BibleTime::editProfiles(){
-	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", accel() );
-  connect(dlg, SIGNAL(signalSettingsChanged()), SLOT(slotSettingsChanged()) );
-	dlg->showPart(COptionsDialog::ViewProfiles);	
-	dlg->exec();
-
-	dlg->delayedDestruct();	
-}
-
-/** Saves current settings into a new profile. */
-void BibleTime::saveToNewProfile(){
-  bool ok = false;
-  const QString name = QInputDialog::getText(i18n("Session name:"), i18n("Please enter a name for the new session."), QLineEdit::Normal, QString::null, &ok, this);
-  if (ok && !name.isEmpty()) {
-    CProfile* profile = m_profileMgr.create(name);
-    saveProfile(profile);
-  };
-  refreshProfileMenus();
-}
-
-/** Slot to refresh the save profile and load profile menus. */
-void BibleTime::refreshProfileMenus(){
- 	//refresh the load profile and save profile menus
-	m_profileMgr.refresh();
- 	KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
- 	KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
- 	savePopup->clear();
- 	loadPopup->clear();
- 	QPtrList<CProfile> profiles = m_profileMgr.profiles();
- 	for (CProfile* p = profiles.first(); p; p = profiles.next()) {
-		savePopup->insertItem(p->name());
-		loadPopup->insertItem(p->name());
- 	}
-}
diff --git a/bibletime/bibletimeapp.cpp b/bibletime/bibletimeapp.cpp
deleted file mode 100644
index d5ed628..0000000
--- a/bibletime/bibletimeapp.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
-                          bibletimeapp.cpp  -  description
-                             -------------------
-    begin                : Sam Jul 12 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "bibletimeapp.h"
-
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-
-BibleTimeApp::BibleTimeApp(){
-  CResMgr::init_i18n();
-}
-
-BibleTimeApp::~BibleTimeApp(){
-  if (backend()) {
-    deleteBackend();
-  }
-
-  //we can set this safely now because we close now (hopyfully without crash)
-  CBTConfig::set(CBTConfig::crashedLastTime, false);
-  CBTConfig::set(CBTConfig::crashedTwoTimes, false);
-}
diff --git a/bibletime/bibletimeapp.h b/bibletime/bibletimeapp.h
deleted file mode 100644
index 28a3a5e..0000000
--- a/bibletime/bibletimeapp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
-                          bibletimeapp.h  -  description
-                             -------------------
-    begin                : Sam Jul 12 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BIBLETIMEAPP_H
-#define BIBLETIMEAPP_H
-
-//BibleTime
-#include "util/cpointers.h"
-
-//KDE
-#include <kapplication.h>
-
-/** The BibleTimeApp class is used to clean up all instances of the backend and to delete all created module objects.
-  * @author The BibleTime team
-  */
-class BibleTimeApp : public KApplication, public CPointers {
-public: 
-	BibleTimeApp();
-	virtual ~BibleTimeApp();
-};
-
-#endif
diff --git a/bibletime/dirlist b/bibletime/dirlist
deleted file mode 100644
index 08e65ca..0000000
--- a/bibletime/dirlist
+++ /dev/null
@@ -1,7 +0,0 @@
-total 320
-drwxrwxr-x   2 508      702          4096 Apr 13  2002 dead
-drwxrwxr-x   2 504      702          4096 Nov 24 02:25 locales.d
-drwxrwxr-x   2 504      702          8192 Jan 21 12:36 mods.d
--rw-rw-r--   1 526      702         69231 Jan 28 04:04 mods.d.tar.gz
--rw-rw-r--   1 526      702         63610 Mar  4  2003 mods.d.tar.gz.old
-drwxrwxr-x   6 504      702          4096 Oct  7  2002 modules
diff --git a/bibletime/frontend/Makefile.am b/bibletime/frontend/Makefile.am
deleted file mode 100644
index 163e94b..0000000
--- a/bibletime/frontend/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-INCLUDES = $(all_includes)
-libfrontend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libfrontend.a
-
-libfrontend_a_SOURCES = \
-btinstallmgr.cpp \
-cbtconfig.cpp \
-cinputdialog.cpp \
-coptionsdialog.cpp \
-cswordsetupdialog.cpp \
-cprofilemgr.cpp \
-cprofile.cpp \
-cprofilewindow.cpp \
-cexportmanager.cpp \
-cmdiarea.cpp \
-kstartuplogo.cpp \
-ctooltipmanager.cpp \
-ctooltip.cpp \
-cdragdropmgr.cpp
-
-all_headers = cmdiarea.h \
-btinstallmgr.h \
-cbtconfig.h \
-cinputdialog.h \
-coptionsdialog.h \
-cswordsetupdialog.h \
-cprofilemgr.h \
-cprofile.h \
-cprofilewindow.h \
-cexportmanager.h \
-cmdiarea.h \
-kstartuplogo.h \
-ctooltipmanager.h \
-ctooltip.h \
-cdragdropmgr.h
-
-EXTRA_DIST = $(libfrontend_a_SOURCES) $(all_headers)
-
-SUBDIRS = \
-mainindex \
-keychooser \
-displaywindow \
-display \
-searchdialog
-
-
-
-
diff --git a/bibletime/frontend/Makefile.in b/bibletime/frontend/Makefile.in
deleted file mode 100644
index 6847af6..0000000
--- a/bibletime/frontend/Makefile.in
+++ /dev/null
@@ -1,911 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-#>- libfrontend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libfrontend.a
-
-libfrontend_a_SOURCES = \
-btinstallmgr.cpp \
-cbtconfig.cpp \
-cinputdialog.cpp \
-coptionsdialog.cpp \
-cswordsetupdialog.cpp \
-cprofilemgr.cpp \
-cprofile.cpp \
-cprofilewindow.cpp \
-cexportmanager.cpp \
-cmdiarea.cpp \
-kstartuplogo.cpp \
-ctooltipmanager.cpp \
-ctooltip.cpp \
-cdragdropmgr.cpp
-
-
-all_headers = cmdiarea.h \
-btinstallmgr.h \
-cbtconfig.h \
-cinputdialog.h \
-coptionsdialog.h \
-cswordsetupdialog.h \
-cprofilemgr.h \
-cprofile.h \
-cprofilewindow.h \
-cexportmanager.h \
-cmdiarea.h \
-kstartuplogo.h \
-ctooltipmanager.h \
-ctooltip.h \
-cdragdropmgr.h
-
-
-EXTRA_DIST = $(libfrontend_a_SOURCES) $(all_headers)
-
-SUBDIRS = \
-mainindex \
-keychooser \
-displaywindow \
-display \
-searchdialog
-
-subdir = bibletime/frontend
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libfrontend_a_AR = $(AR) cru
-libfrontend_a_LIBADD =
-am_libfrontend_a_OBJECTS = btinstallmgr.$(OBJEXT) cbtconfig.$(OBJEXT) \
-	cinputdialog.$(OBJEXT) coptionsdialog.$(OBJEXT) \
-	cswordsetupdialog.$(OBJEXT) cprofilemgr.$(OBJEXT) \
-	cprofile.$(OBJEXT) cprofilewindow.$(OBJEXT) \
-	cexportmanager.$(OBJEXT) cmdiarea.$(OBJEXT) \
-	kstartuplogo.$(OBJEXT) ctooltipmanager.$(OBJEXT) \
-	ctooltip.$(OBJEXT) cdragdropmgr.$(OBJEXT)
-#>- libfrontend_a_OBJECTS = $(am_libfrontend_a_OBJECTS)
-#>+ 11
-libfrontend_a_final_OBJECTS = libfrontend_a.all_cpp.o 
-libfrontend_a_nofinal_OBJECTS = btinstallmgr.$(OBJEXT) cbtconfig.$(OBJEXT) \
-	cinputdialog.$(OBJEXT) coptionsdialog.$(OBJEXT) \
-	cswordsetupdialog.$(OBJEXT) cprofilemgr.$(OBJEXT) \
-	cprofile.$(OBJEXT) cprofilewindow.$(OBJEXT) \
-	cexportmanager.$(OBJEXT) cmdiarea.$(OBJEXT) \
-	kstartuplogo.$(OBJEXT) ctooltipmanager.$(OBJEXT) \
-	ctooltip.$(OBJEXT) cdragdropmgr.$(OBJEXT)\
-coptionsdialog.moc.o ctooltip.moc.o btinstallmgr.moc.o cmdiarea.moc.o cswordsetupdialog.moc.o cinputdialog.moc.o 
-@KDE_USE_FINAL_FALSE@libfrontend_a_OBJECTS = $(libfrontend_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libfrontend_a_OBJECTS = $(libfrontend_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/btinstallmgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbtconfig.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cdragdropmgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cexportmanager.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cinputdialog.Po ./$(DEPDIR)/cmdiarea.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/coptionsdialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprofile.Po ./$(DEPDIR)/cprofilemgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprofilewindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordsetupdialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ctooltip.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ctooltipmanager.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/kstartuplogo.Po
-#>+ 24
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/coptionsdialog.moc.P $(DEPDIR)/ctooltip.moc.P $(DEPDIR)/btinstallmgr.moc.P $(DEPDIR)/cmdiarea.moc.P $(DEPDIR)/cswordsetupdialog.moc.P $(DEPDIR)/cinputdialog.moc.P  $(DEPDIR)/libfrontend_a.all_cpp.P ./$(DEPDIR)/btinstallmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbtconfig.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cdragdropmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cexportmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cinputdialog.Po ./$(DEPDIR)/cmdiarea.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/coptionsdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofile.Po ./$(DEPDIR)/cprofilemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofilewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordsetupdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltip.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltipmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kstartuplogo.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/coptionsdialog.moc.P $(DEPDIR)/ctooltip.moc.P $(DEPDIR)/btinstallmgr.moc.P $(DEPDIR)/cmdiarea.moc.P $(DEPDIR)/cswordsetupdialog.moc.P $(DEPDIR)/cinputdialog.moc.P ./$(DEPDIR)/btinstallmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbtconfig.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cdragdropmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cexportmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cinputdialog.Po ./$(DEPDIR)/cmdiarea.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/coptionsdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofile.Po ./$(DEPDIR)/cprofilemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofilewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordsetupdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltip.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltipmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kstartuplogo.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libfrontend_a_SOURCES)
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libfrontend_a_SOURCES)
-
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libfrontend.a: $(libfrontend_a_OBJECTS) $(libfrontend_a_DEPENDENCIES) 
-	-rm -f libfrontend.a
-	$(libfrontend_a_AR) libfrontend.a $(libfrontend_a_OBJECTS) $(libfrontend_a_LIBADD)
-	$(RANLIB) libfrontend.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btinstallmgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbtconfig.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdragdropmgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cexportmanager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cinputdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmdiarea.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coptionsdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofilemgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofilewindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordsetupdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctooltip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctooltipmanager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstartuplogo.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LIBRARIES)
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-noinstLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-coptionsdialog.moc.cpp: $(srcdir)/coptionsdialog.h
-	$(MOC) $(srcdir)/coptionsdialog.h -o coptionsdialog.moc.cpp
-
-#>+ 2
-mocs: coptionsdialog.moc.cpp
-
-#>+ 3
-ctooltip.moc.cpp: $(srcdir)/ctooltip.h
-	$(MOC) $(srcdir)/ctooltip.h -o ctooltip.moc.cpp
-
-#>+ 2
-mocs: ctooltip.moc.cpp
-
-#>+ 3
-btinstallmgr.moc.cpp: $(srcdir)/btinstallmgr.h
-	$(MOC) $(srcdir)/btinstallmgr.h -o btinstallmgr.moc.cpp
-
-#>+ 2
-mocs: btinstallmgr.moc.cpp
-
-#>+ 3
-cmdiarea.moc.cpp: $(srcdir)/cmdiarea.h
-	$(MOC) $(srcdir)/cmdiarea.h -o cmdiarea.moc.cpp
-
-#>+ 2
-mocs: cmdiarea.moc.cpp
-
-#>+ 3
-cswordsetupdialog.moc.cpp: $(srcdir)/cswordsetupdialog.h
-	$(MOC) $(srcdir)/cswordsetupdialog.h -o cswordsetupdialog.moc.cpp
-
-#>+ 2
-mocs: cswordsetupdialog.moc.cpp
-
-#>+ 3
-cinputdialog.moc.cpp: $(srcdir)/cinputdialog.h
-	$(MOC) $(srcdir)/cinputdialog.h -o cinputdialog.moc.cpp
-
-#>+ 2
-mocs: cinputdialog.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  coptionsdialog.moc.cpp ctooltip.moc.cpp btinstallmgr.moc.cpp cmdiarea.moc.cpp cswordsetupdialog.moc.cpp cinputdialog.moc.cpp
-
-#>+ 2
-KDE_DIST=cprofilemgr.h cbtconfig.h ctooltipmanager.h kstartuplogo.h cexportmanager.h cprofilewindow.h cdragdropmgr.h cprofile.h cinputdialog.h ctooltip.h coptionsdialog.h btinstallmgr.h cmdiarea.h cswordsetupdialog.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libfrontend_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/btinstallmgr.cpp $(srcdir)/cbtconfig.cpp $(srcdir)/cinputdialog.cpp $(srcdir)/coptionsdialog.cpp $(srcdir)/cswordsetupdialog.cpp $(srcdir)/cprofilemgr.cpp $(srcdir)/cprofile.cpp $(srcdir)/cprofilewindow.cpp $(srcdir)/cexportmanager.cpp $(srcdir)/cmdiarea.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/ctooltipmanager.cpp $(srcdir)/ctooltip.cpp $(srcdir)/cdragdropmgr.cpp coptionsdialog.moc.cpp ctooltip.moc.cpp btinstallmgr.moc.cpp cmdiarea.moc.cpp cinputdialog.moc.cpp cswordsetupdialog.moc.cpp 
-	@echo 'creating libfrontend_a.all_cpp.cpp ...'; \
-	rm -f libfrontend_a.all_cpp.files libfrontend_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libfrontend_a.all_cpp.final; \
-	for file in btinstallmgr.cpp cbtconfig.cpp cinputdialog.cpp coptionsdialog.cpp cswordsetupdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp cmdiarea.cpp kstartuplogo.cpp ctooltipmanager.cpp ctooltip.cpp cdragdropmgr.cpp coptionsdialog.moc.cpp ctooltip.moc.cpp btinstallmgr.moc.cpp cmdiarea.moc.cpp cinputdialog.moc.cpp cswordsetupdialog.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libfrontend_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libfrontend_a.all_cpp.final; \
-	done; \
-	cat libfrontend_a.all_cpp.final libfrontend_a.all_cpp.files > libfrontend_a.all_cpp.cpp; \
-	rm -f libfrontend_a.all_cpp.final libfrontend_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libfrontend_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
deleted file mode 100644
index 8e11278..0000000
--- a/bibletime/frontend/btinstallmgr.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/***************************************************************************
-                          btinstallmgr.cpp  -  description
-                             -------------------
-    begin                : Mit Sep 24 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "btinstallmgr.h"
-#include "util/cpointers.h"
-
-#include <qfile.h>
-#include <qfileinfo.h>
-
-#include <kapplication.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
-
-#include <filemgr.h>
-#include <swconfig.h>
-#include <swbuf.h>
-#include <map>
-#include <utility>
-
-using namespace sword;
-
-const QString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() {
-//  Q_ASSERT( CPointers::backend()->sysconfig );
-	return QString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME"));
-}
-
-QStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) {
-//  qWarning("BTInstallMgr::Tool::sourceList( sword::InstallMgr* mgr )");
-  Q_ASSERT(mgr);
-  Q_ASSERT(mgr->installConf);
-
-  QStringList names;
-
-  //add Sword remote sources
-	for (InstallSourceMap::iterator it = mgr->sources.begin(); it != mgr->sources.end(); it++)
-	{
-    names << QString::fromLocal8Bit(it->second->caption);
-  }
-
-  // Add local directory sources
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  sword::SectionMap::iterator sourcesSection = config.Sections.find("Sources");
-	if (sourcesSection != config.Sections.end()) {
-		sword::ConfigEntMap::iterator sourceBegin = sourcesSection->second.lower_bound("DIRSource");
-		sword::ConfigEntMap::iterator sourceEnd = sourcesSection->second.upper_bound("DIRSource");
-
-		while (sourceBegin != sourceEnd) {
-			InstallSource is("DIR", sourceBegin->second.c_str());
-      names << QString::fromLatin1(is.caption.c_str());
-
-      sourceBegin++;
-		}
-	}
-
-  return names;
-}
-
-QStringList BTInstallMgr::Tool::LocalConfig::targetList() {
-  QStringList names = CPointers::backend()->swordDirList();
-  return names;
-}
-
-void BTInstallMgr::Tool::LocalConfig::setTargetList( const QStringList& targets ) {
-  //saves a new Sworc config using the provided target list
-  QString filename = KGlobal::dirs()->saveLocation("data", "bibletime/") + "sword.conf"; //default is to assume the real location isn't writable
-  bool directAccess = false;
-
-  QFileInfo i(LocalConfig::swordConfigFilename());
-	QFileInfo dirInfo(i.dirPath(true));
-
-  if ( i.exists() && i.isWritable() ) { //we can write to the file ourself
-    filename = LocalConfig::swordConfigFilename();
-    directAccess = true;
- 	}
-	else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th eparent is writable for us, create it
-    filename = LocalConfig::swordConfigFilename();
-    directAccess = true;
-	}
-
-  bool setDataPath = false;
-  SWConfig conf(filename.local8Bit());
-  conf.Sections.clear();
-
-  for (QStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
-    QString t = *it;
-    if (t.contains( QString::fromLatin1("%1/.sword").arg(getenv("HOME")) )) {
-      //we don't want HOME/.sword in the config
-      continue;
-    }
-    else {
-//      conf["Install"][!setDataPath ? "DataPath" : "AugmentPath"] = t.local8Bit();
-	    conf["Install"].insert( std::make_pair(!setDataPath ? "DataPath" : "AugmentPath", t.local8Bit()) );
-
-      setDataPath = true;
-    }
-  }
-  conf.Save();
-
-  if (!directAccess) { //use kdesu to move the file to the right place
-   KProcess *proc = new KProcess;
-   *proc << "kdesu";
-   *proc << QString::fromLatin1("-c") << QString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename());
-//   KApplication::connect(proc, SIGNAL(processExited(KProcess *)),
-//      this, SLOT(slot_swordConfigWritten(KProcess *)));
-   proc->start(KProcess::Block);
-  }
-}
-
-sword::InstallSource BTInstallMgr::Tool::RemoteConfig::source( sword::InstallMgr* mgr, const QString& name ) {
-  Q_ASSERT(mgr);
-
-  InstallSourceMap::iterator source = mgr->sources.find(name.latin1());
-  if (source != mgr->sources.end()) {
-  	return *(source->second);
-  }
-  else { //not found in Sword, may be a local DIR source
-		SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-		SectionMap::iterator sourcesSection = config.Sections.find("Sources");
-		if (sourcesSection != config.Sections.end()) {
-			ConfigEntMap::iterator sourceBegin =
-					sourcesSection->second.lower_bound("DIRSource");
-			ConfigEntMap::iterator sourceEnd =
-					sourcesSection->second.upper_bound("DIRSource");
-
-			while (sourceBegin != sourceEnd) {
-      	InstallSource is("DIR", sourceBegin->second.c_str());
-        if (!strcmp(is.caption, name.latin1()) ) { //found local dir source
-        	return is;
-				}
-
-				sourceBegin++;//next source
-			}
-		}
-  }
-
-	InstallSource is("EMPTY");   //default return value
-	is.caption = "unknown caption";
-	is.source = "unknown source";
-	is.directory = "unknown dir";
-	
-	return is;
-}
-
-const bool BTInstallMgr::Tool::RemoteConfig::isRemoteSource( sword::InstallSource* is ) {
-  Q_ASSERT(is);
-  if (is)
-    return !strcmp(is->type, "FTP");
-  else
-    return false;
-}
-
-void BTInstallMgr::Tool::RemoteConfig::addSource( sword::InstallSource* is ) {
-  if (!is) {
-    return;
-  }
-
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  if (!strcmp(is->type, "FTP")) {
-		//make sure the path doesn't have a trailing slash, sword doesn't like it
-		if (is->directory[ is->directory.length()-1 ] == '/') {
-			is->directory--; //make one char shorter
-		}
-
-    config["Sources"].insert( std::make_pair("FTPSource", is->getConfEnt()) );
-  }
-  else if (!strcmp(is->type, "DIR")) {
-    config["Sources"].insert( std::make_pair("DIRSource", is->getConfEnt()) );
-  }
-  config.Save();
-}
-
-void BTInstallMgr::Tool::RemoteConfig::initConfig() {
-  //Do only continue if the config does not yet exist...
-  if (QFile::exists(configFilename())) {
-    return;
-  }
-
-  QFile::remove(configFilename());
-
-//remote sources will be setup by the manage sources dialog
-
-	SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  config["General"]["PassiveFTP"] = "true";
-	config.Save();
-}
-
-const QString BTInstallMgr::Tool::RemoteConfig::configPath() {
-	const char *envhomedir  = getenv("HOME");
-	QString confPath = QString::fromLatin1((envhomedir) ? envhomedir : ".");
-	confPath += QString::fromLatin1("/.sword/InstallMgr");
-
-  return confPath;
-}
-
-const QString BTInstallMgr::Tool::RemoteConfig::configFilename() {
-  return (configPath() + "/InstallMgr.conf").latin1();
-}
-
-void BTInstallMgr::Tool::RemoteConfig::removeSource( sword::InstallMgr* mgr, sword::InstallSource* is) {
-  Q_ASSERT(mgr);
-  Q_ASSERT(is);
-
-}
-
-void BTInstallMgr::Tool::RemoteConfig::resetRemoteSources() {
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  config["Sources"].erase( //remove all FTP sources
-		config["Sources"].lower_bound("FTPSource"),
-		config["Sources"].upper_bound("FTPSource")
-	);
-	config.Save();
-}
-
-void BTInstallMgr::Tool::RemoteConfig::resetLocalSources() {
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  config["Sources"].erase( //remove all FTP sources
-		config["Sources"].lower_bound("DIRSource"),
-		config["Sources"].upper_bound("DIRSource")
-	);
-	config.Save();
-}
-
-CSwordBackend* BTInstallMgr::Tool::backend( sword::InstallSource* const is) {
-  if (!is)
-    return 0;
-
-  CSwordBackend* ret = 0;
-  if (RemoteConfig::isRemoteSource(is)) {
-    ret = new CSwordBackend( QString::fromLatin1(is->localShadow.c_str()) );
-	}
-  else {
-//		qWarning("constructing a backend in %s", is->directory.c_str());
-    ret = new CSwordBackend( QString::fromLatin1(is->directory.c_str()) );
-	}
-
-	if (ret) {
-    ret->initModules();
-	}
-
-  return ret;
-}
-
-
-
-BTInstallMgr::BTInstallMgr() : InstallMgr(Tool::RemoteConfig::configPath().latin1()) {
-}
-
-BTInstallMgr::~BTInstallMgr(){
-}
-
-void BTInstallMgr::statusUpdate(double dltotal, double dlnow) {
-	//qWarning("total: %d; now: %d", dltotal, dlnow);
-  int totalPercent = (int)((float)(dlnow + m_completedBytes+1) / (float)(m_totalBytes) * 100);
-
-	if (totalPercent > 100) {
-		totalPercent = 100;
-	}
-	else if (totalPercent < 0) {
-		totalPercent = 0;
-	}
-
-  int filePercent  = (int)((float)(dlnow + 1) / (float)(dltotal) * 100);
-	if (filePercent > 100) {
-		filePercent = 100;
-	}
-	else if (filePercent < 0) {
-		filePercent = 0;
-	}
-
-  emit completed(totalPercent, filePercent);
-  KApplication::kApplication()->processEvents();
-}
-
-void BTInstallMgr::preDownloadStatus(long totalBytes, long completedBytes, const char*) {
-  emit downloadStarted( "unkown filename" );
-
-	m_completedBytes = completedBytes;
-  m_totalBytes = totalBytes;
-  KApplication::kApplication()->processEvents();
-}
diff --git a/bibletime/frontend/btinstallmgr.h b/bibletime/frontend/btinstallmgr.h
deleted file mode 100644
index 5f7debb..0000000
--- a/bibletime/frontend/btinstallmgr.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************
-                          btinstallmgr.h  -  description
-                             -------------------
-    begin                : Mit Sep 24 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BTINSTALLMGR_H
-#define BTINSTALLMGR_H
-
-
-//BibleTIme includes
-#include "backend/cswordbackend.h"
-
-
-//sword includes
-#include <installmgr.h>
-
-//Qt includes
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qstringlist.h>
-
-typedef QPtrList<sword::InstallSource> InstallSourceList;
-
-/**Our own reimplementation to provide status bar updates.
-  *@author The BibleTime team
-  */  
-class BTInstallMgr : public QObject, public sword::InstallMgr {
-  Q_OBJECT
-public:
-  class Tool {
-  public:
-    class LocalConfig {
-    public:
-      static const QString swordConfigFilename();
-      static QStringList targetList();
-      static void setTargetList( const QStringList& );      
-    private:
-      LocalConfig() {};
-    };
-
-    class RemoteConfig {
-    public:
-      static void initConfig();
-      static const QString configPath();
-      static const QString configFilename();
-
-			static void resetRemoteSources();
-			static void resetLocalSources();
-
-      static QStringList sourceList( sword::InstallMgr* );
-      static sword::InstallSource source( sword::InstallMgr*, const QString& name );
-      static const bool isRemoteSource( sword::InstallSource* is );
-      static void addSource( sword::InstallSource* );
-      static void removeSource( sword::InstallMgr*, sword::InstallSource* );
-
-
-    private:
-      RemoteConfig() {};
-    };
-
-    static CSwordBackend* backend( sword::InstallSource* const );
-
-  private:
-    Tool() {};    
-  };
-
-	BTInstallMgr();
-	virtual ~BTInstallMgr();
-
-protected:
-  virtual void statusUpdate(double dltotal, double dlnow);
-	virtual void preDownloadStatus(long totalBytes, long completedBytes, const char *message);
-
-  long m_totalBytes;
-  long m_completedBytes;
-  
-signals: // Signals
-  void completed( const int, const int );
-  /**
-  * Emitted when a new file gets downloaded.
-  */
-  void downloadStarted( const QString& );
-};
-
-#endif
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
deleted file mode 100644
index 9df717b..0000000
--- a/bibletime/frontend/cbtconfig.cpp
+++ /dev/null
@@ -1,536 +0,0 @@
-/***************************************************************************
-                          cbtconfig.cpp  -  description
-                             -------------------
-    begin                : Mon Nov 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cbtconfig.h"
-#include "backend/cswordmoduleinfo.h"
-#include "util/cpointers.h"
-
-
-//Qt includes
-#include <qapplication.h>
-#include <qfontdatabase.h>
-#include <qstring.h>
-#include <qstringlist.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kaccel.h>
-
-
-/* 	No constructor and destructor, because this class only contains static methods.
-		It won't be instantiated. */
-
-const QString CBTConfig::getKey( const CBTConfig::strings ID){
-	switch ( ID ){
-		case bibletimeVersion:			        return "bibletimeVersion";
-		case language: 							        return "language";
-		case standardBible: 				        return "standardBible";
-		case standardCommentary: 		        return "standardCommentary";
-		case standardLexicon: 			        return "standardLexicon";
-		case standardDailyDevotional:	      return "standardDailyDevotional";    
-		case standardHebrewStrongsLexicon: 	return "standardHebrewLexicon";
-		case standardGreekStrongsLexicon: 	return "standardGreekLexicon";
-		case standardHebrewMorphLexicon:	  return "standardHebrewMorphLexicon";
-		case standardGreekMorphLexicon:		  return "standardGreekMorphLexicon";
-	}
-	return QString::null;
-}
-
-const QString CBTConfig::getDefault( const CBTConfig::strings ID){
-	switch ( ID ){
-		case bibletimeVersion:			return ( "NOT YET INSTALLED" );
-		// main() will realize this and set the value to VERSION
-		case language: 							return (KGlobal::locale()->language()).local8Bit();
-		case standardBible: 				return "KJV";  // no effect
-		case standardCommentary: 		return "MHC";
-		case standardLexicon: 			return "ISBE";
-		case standardDailyDevotional: 			return ""; //no default
-		case standardHebrewStrongsLexicon:  return "StrongsHebrew";
-		case standardGreekStrongsLexicon: 	return "StrongsGreek";
-		case standardHebrewMorphLexicon:	  return "StrongsHebrew"; //warning this is wrong
-		case standardGreekMorphLexicon:		  return "StrongsGreek";  //but imo has no effect
-	}
-	return QString::null;
-}
-
-const QString CBTConfig::getKey( const CBTConfig::bools ID){
-	switch ( ID ){
-		case firstSearchDialog:		return "firstSearchDialog";
-		case readOldBookmarks:		return "readOldBookmarks";
-
-		case toolbar:							return "toolbar";
-		case mainIndex:						return "mainIndex";
-
-		case autoTile:						return "autoTile";
-		case autoCascade:					return "autoCascade";
-
-		case lexiconCache: 				return "lexicon_chache";
-
-		case lineBreaks: 					return "lineBreaks";
-		case verseNumbers: 				return "verseNumbers";
-		case scroll:			 				return "scroll";
-
-		case tips: 								return "RunOnStart";
-		case logo: 								return "logo";
-		case restoreWorkspace: 		return "restoreWorkspace";
-		case crashedLastTime: 		return "crashedLastTime";
-		case crashedTwoTimes: 		return "crashedTwoTimes";
-	}
-	return QString::null;	
-}
-
-const QString CBTConfig::getKey( const CBTConfig::ints ID){
-	switch ( ID ){
-		case footnotes: 					return "footnotes";
-		case strongNumbers:  			return "strongNumbers";
-  	case headings: 						return "headings";
-  	case morphTags: 					return "morphTags";
-		case lemmas: 							return "lemmas";
-		case hebrewPoints: 				return "hebrewPoints";
-		case hebrewCantillation: 	return "hebrewCantillation";
-		case greekAccents: 				return "greekAccents";
-		case textualVariants:			return "textualVariants";
-    case transliteration:     return "transliteration";
-    case scriptureReferences: return "scriptureReferences";
-  }
-  return QString::null;
-}
-
-const bool CBTConfig::getDefault( const CBTConfig::bools ID){
-	switch ( ID ){
-		case firstSearchDialog:		return true;
-    case readOldBookmarks:    return false;
-
-		case toolbar:							return true;
-		case mainIndex:						return true;
-
-		case autoTile:						return true;
-		case autoCascade:					return false;
-
-		case lexiconCache: 				return true;
-
-		case lineBreaks: 					return false;
-		case verseNumbers: 				return true;
-		case scroll:			 				return true;
-
-		case tips: 								return true;
-		case logo: 								return true;
-		case restoreWorkspace: 		return true;
-		case crashedLastTime: 		return false;
-		case crashedTwoTimes: 		return false;    
-	}
-	return false;
-}
-
-const int CBTConfig::getDefault( const CBTConfig::ints ID){
-	switch ( ID ){
-		case footnotes: 					return true;
-		case strongNumbers:  			return false;
-  	case headings: 						return true;
-  	case morphTags: 					return false;
-		case lemmas: 							return false;
-		case hebrewPoints: 				return true;
-		case hebrewCantillation: 	return true;
-		case greekAccents: 				return true;
-		case textualVariants:			return false;
-    case transliteration:     return 0;
-    case scriptureReferences:	return true;
-  }
-  return 0;
-}
-
-const QString CBTConfig::getKey( const CBTConfig::colors ID){
-	switch ( ID ){
-		case textColor: 							return "textColor";
-		case backgroundColor: 				return "backgroundColor";
-		case background2Color: 				return "background2Color";
-		case highlightedVerseColor: 	return "highlightedVerseClolor";
-		case footnotesColor: 					return "footnotesColor";
-		case strongsColor: 						return "strongsColor";
-		case morphsColor: 						return "morphsColor";
-		case jesuswordsColor: 				return "jesuswordsColor";
-		case swordRefColor: 					return "swordRefColor";
-	}
-	return QString::null;
-}
-
-const QColor CBTConfig::getDefault( const CBTConfig::colors ID){
-	switch ( ID ){
-		case textColor: 							return QColor(Qt::black);
-		case backgroundColor: 				return QColor(QString::fromLatin1("#fffaee"));
-		case background2Color: 				return QColor(QString::fromLatin1("#f1f1f1"));
-		case highlightedVerseColor:		return QColor(Qt::red);
-		case footnotesColor: 					return QColor(QString::fromLatin1("#515151"));
-		case strongsColor: 						return QColor(Qt::darkBlue);
-		case morphsColor: 						return QColor(Qt::darkBlue);
-		case jesuswordsColor: 				return QColor(QString::fromLatin1("#ad0000"));
-		case swordRefColor: 					return QColor(Qt::blue);
-	}
-	return Qt::blue;
-}
-
-const QString CBTConfig::getKey( const CBTConfig::intLists ID){
-	switch ( ID ){
-		case splitterSizes: return "splitterSizes";
-	}
-	return QString::null;
-}
-
-const QValueList<int> CBTConfig::getDefault( const CBTConfig::intLists ID){
-	switch ( ID ){
-		case splitterSizes: return QValueList<int>();
-	}
-	return QValueList<int>();
-}
-
-const QString CBTConfig::getKey( const CBTConfig::stringLists ID){
-	switch ( ID ){
-		case searchCompletionTexts:
-      return QString::fromLatin1("searchCompletionTexts");
-		case searchTexts:
-      return QString::fromLatin1("searchTexts");
-	}
-	return QString::null;
-}
-
-const QStringList CBTConfig::getDefault( const CBTConfig::stringLists ID){
-	switch ( ID ){
-		case searchTexts: {
-      QStringList list;
-      list.append(QString::null);
-			return list;
-    }
-		case searchCompletionTexts:
-			return QStringList();
-	}
-	return QStringList();
-}
-
-const QString CBTConfig::getKey( const CBTConfig::stringMaps ID) {
-	switch (ID) {
-    case searchScopes:
-      return QString::fromLatin1("SearchScopes");
-  };
-	return QString::null;
-}
-
-const CBTConfig::StringMap CBTConfig::getDefault( const CBTConfig::stringMaps ID){
-	switch ( ID ){
-    case searchScopes: {
-      CBTConfig::StringMap map;
-      map.insert(i18n("Old testament"),         QString::fromLatin1("Gen - Mal"));
-  	  map.insert(i18n("Moses/Pentateuch/Torah"),QString::fromLatin1("Gen - Deut"));
-  	  map.insert(i18n("History"),               QString::fromLatin1("Jos - Est"));
-  	  map.insert(i18n("Prophets"),              QString::fromLatin1("Isa - Mal"));
-   	  map.insert(i18n("New testament"),         QString::fromLatin1("Mat - Rev"));
-  	  map.insert(i18n("Gospels"), 		          QString::fromLatin1("Mat - Joh"));
-  	  map.insert(i18n("Letters/Epistles"), 	    QString::fromLatin1("Rom - Jude"));
-  	  map.insert(i18n("Paul's Epistles"), 	    QString::fromLatin1("Rom - Phile"));
-
-      //make the list to the current bookname language!
-      CBTConfig::StringMap::Iterator it;
-      sword::VerseKey vk;
-      vk.setLocale("en");
-      
-      for (it = map.begin(); it != map.end(); ++it) {
-        sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true);
-        QString data;
-        for (int i = 0; i < list.Count(); ++i) {
-          data += QString::fromLocal8Bit(list.GetElement(i)->getRangeText()) + "; ";
-     	  }
-        map[it.key()] = data; //set the new data
-      };      
-
-      return map;
-    };
-    default:
-      return CBTConfig::StringMap();
-	}
-	return CBTConfig::StringMap();
-}
-
-
-const QString CBTConfig::getKey( const CLanguageMgr::Language& language ){
-	return language.name();
-}
-
-const QFont CBTConfig::getDefault( const CLanguageMgr::Language& /*language*/ ){
-  //language specific lookup of the font name
-  return KApplication::font();
-}
-
-
-const QString CBTConfig::get( const CBTConfig::strings ID){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "strings");
-	return config->readEntry(getKey(ID),getDefault(ID));
-}
-
-const bool CBTConfig::get( const CBTConfig::bools ID){
-	//special behaviour for the KTipDialog class
-	KConfig* config = KGlobal::config();	
-	KConfigGroupSaver groupSaver(config, (ID == CBTConfig::tips) ? "TipOfDay" : "bools");
-	return config->readBoolEntry(getKey(ID),getDefault(ID));
-}
-
-const int CBTConfig::get( const CBTConfig::ints ID){
-	KConfig* config = KGlobal::config();	
-	KConfigGroupSaver groupSaver(config, "ints");		
-	return config->readBoolEntry(getKey(ID), getDefault(ID));
-}
-
-
-const QColor CBTConfig::get( const CBTConfig::colors ID){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "colors");
-	QColor defaultColor = getDefault(ID);
-	return config->readColorEntry(getKey(ID),&defaultColor);
-}
-
-const QValueList<int> CBTConfig::get( const CBTConfig::intLists ID ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "lists");
-	return config->readIntListEntry(getKey(ID));
-}
-
-const QStringList	CBTConfig::get( const CBTConfig::stringLists ID ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "stringlists");
-	return config->readListEntry(getKey(ID));
-}
-
-const CBTConfig::StringMap CBTConfig::get( const CBTConfig::stringMaps ID ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, getKey(ID));
-
-  if (config->hasGroup(getKey(ID))) {
-	  CBTConfig::StringMap map = config->entryMap(getKey(ID));
-    switch (ID) {
-      case searchScopes: { //make sure we return the scopes in the chosen language. saved keys are in english
-        CBTConfig::StringMap::Iterator it;
-        sword::VerseKey vk;
-
-        for (it = map.begin(); it != map.end(); ++it) {
-          sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true);
-          QString data;
-          for (int i = 0; i < list.Count(); ++i) {
-            data += QString::fromLocal8Bit(list.GetElement(i)->getRangeText()) + "; ";
-       	  }
-          map[it.key()] = data; //set the new data
-        };
-        return map;
-      }
-      default:
-        return getDefault(ID);
-    }
-  }
-  return getDefault(ID);
-}
-
-const CBTConfig::FontSettingsPair	CBTConfig::get( const CLanguageMgr::Language& language ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "font standard settings");
-
-  FontSettingsPair settings;
-  settings.first = config->readBoolEntry(getKey(language));
-
-  config->setGroup("fonts");
- 
-  settings.second = settings.first ? config->readFontEntry(getKey(language)) : KApplication::font();
-
-  return settings;
-}
-
-void CBTConfig::set( const CBTConfig::strings ID, const QString value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "strings");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set(const  CBTConfig::bools ID,const  bool value ){
-	KConfig* config = KGlobal::config();
-	//special behaviour to work with KTipDialog class of KDE
-	KConfigGroupSaver groupSaver(config, (ID == CBTConfig::tips) ? "TipOfDay" : "bools");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set(const CBTConfig::ints ID, const int value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "ints");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::colors ID, const QColor value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "colors");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::intLists ID, const QValueList<int> value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "lists");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::stringLists ID, const QStringList value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "stringlists");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::stringMaps ID, const CBTConfig::StringMap value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, getKey(ID));  
-  config->deleteGroup(getKey(ID)); //make sure we only save the new entries and don't use old ones
-  config->sync();  
-  config->setGroup(getKey(ID));
-  
-  switch (ID) {
-    case searchScopes: {
-      /**
-      * We want to make sure that the search scopes are saved with english key names so loading them
-      * will always work with each locale set.
-      */
-      CBTConfig::StringMap::ConstIterator it;
-      QString data = QString::null;
-
-      sword::VerseKey vk;
-      for (it = value.begin(); it != value.end(); ++it) {
-        sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true);
-        data = QString::null;
-        for (int i = 0; i < list.Count(); ++i) {
-          if ( sword::VerseKey* range = dynamic_cast<sword::VerseKey*>(list.GetElement(i)) ) {
-            range->setLocale("en");
-            data += QString::fromLocal8Bit( range->getRangeText() ) + ";";
-          }
-        }
-        config->writeEntry(it.key(), data);
-      }
-      break;
-    }
-    default: {
-      for (CBTConfig::StringMap::ConstIterator it = value.begin(); it != value.end(); ++it) {
-        config->writeEntry(it.key(), it.data());
-      }
-      break;
-    }
-  };
-}
-
-
-void CBTConfig::set( const CLanguageMgr::Language& language, const FontSettingsPair& value ){
-	KConfig* config = KGlobal::config();
-
-  KConfigGroupSaver groupSaver(config, "fonts");
-	config->writeEntry(getKey(language), value.second);
-  
-  config->setGroup("font standard settings");  
-	config->writeEntry(getKey(language), value.first);
-}
-
-
-const CSwordBackend::DisplayOptions CBTConfig::getDisplayOptionDefaults(){
-  CSwordBackend::DisplayOptions options;
-
-	options.lineBreaks   = 	get(CBTConfig::lineBreaks);
-  options.verseNumbers = 	get(CBTConfig::verseNumbers);
-
-	return options;
-}
-
-const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults(){
-
-  CSwordBackend::FilterOptions options;
-
-  options.footnotes =						get(CBTConfig::footnotes);
-  options.strongNumbers = 			get(CBTConfig::strongNumbers);
-  options.headings = 						get(CBTConfig::headings);
-  options.morphTags = 					get(CBTConfig::morphTags);
-  options.lemmas = 							get(CBTConfig::lemmas);
-  options.hebrewPoints = 				get(CBTConfig::hebrewPoints);
-  options.hebrewCantillation = 	get(CBTConfig::hebrewCantillation);
-  options.greekAccents = 				get(CBTConfig::greekAccents);
-  options.textualVariants = 		get(CBTConfig::textualVariants);
-  options.transliteration = 		get(CBTConfig::transliteration);
-  options.scriptureReferences = get(CBTConfig::scriptureReferences);
-
-	return options;
-}
-
-void CBTConfig::setupAccel(const CBTConfig::keys type, KAccel* const accel) {
-//	KConfig* config = KGlobal::config();	
-	
-	switch (type) {
-		case writeWindow : {
-			accel->setConfigGroup("Writewindow shortcuts");
-			break;
-		};
-		case readWindow : {
-			accel->setConfigGroup("Readwindow shortcuts");
-			break;
-		};
-		case bookWindow : {
-			accel->setConfigGroup("Book shortcuts");
-			break;
-		};
-		case bibleWindow : {
-			accel->setConfigGroup("Bible shortcuts");
-			break;
-		};
-		case commentaryWindow : {
-			accel->setConfigGroup("Commentary shortcuts");
-			break;
-		};
-		case lexiconWindow : {
-			accel->setConfigGroup("Lexicon shortcuts");					
-			break;
-		};
-		case application : {
-			accel->setConfigGroup("Application shortcuts");				
-			break;
-		};
-	};
-}
-
-const QString CBTConfig::getModuleEncryptionKey( const QString& module ) {
-	KConfig* config = KGlobal::config();
-  KConfigGroupSaver groupSaver(config, "Module keys");
-
-  return config->readEntry(module, QString::null);
-}
-  
-void CBTConfig::setModuleEncryptionKey( const QString& module, const QString& key ) {
-//  if (CSwordModuleInfo* const mod = CPointers::backend()->findModuleByName(module) ) {
-//    // if an empty key is set for an unencrypted module do nothing
-//    if (key.isEmpty() && !mod->isEncrypted()) {
-//      return;
-//    }
-//  }
-//  else if (key.isEmpty()) {
-//    return;
-//  };
-  
-  KConfig* config = KGlobal::config();
-  KConfigGroupSaver groupSaver(config, "Module keys");
-
-  config->writeEntry(module, key);
-};
diff --git a/bibletime/frontend/cbtconfig.h b/bibletime/frontend/cbtconfig.h
deleted file mode 100644
index d55ac33..0000000
--- a/bibletime/frontend/cbtconfig.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/***************************************************************************
-                          cbtconfig.h  -  description
-                             -------------------
-    begin                : Mon Nov 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBTCONFIG_H
-#define CBTCONFIG_H
-
-#include <qstring.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qvaluelist.h>
-#include <qmap.h>
-
-#include "backend/cswordbackend.h"
-#include "backend/clanguagemgr.h"
-
-//Forward declarations
-class KAccel;
-
-/**
- * This class is the interface to the config object of BibleTime
- * @author The BibleTime team
- */
-class CBTConfig {
-public:
-  typedef QMap<QString, QString> StringMap;
-	enum strings {
-		bibletimeVersion,
-		language,
-		standardBible,
-		standardCommentary,
-		standardLexicon,
-		standardDailyDevotional,    
-		standardHebrewStrongsLexicon,
-		standardGreekStrongsLexicon,
-		standardHebrewMorphLexicon,
-		standardGreekMorphLexicon
-	};
-//	enum fonts {
-//		standard,
-//		unicode
-//	};
-	enum colors {
-		textColor,
-		backgroundColor,
-		background2Color,
-		highlightedVerseColor,
-		footnotesColor,
-		strongsColor,
-		morphsColor,
-		jesuswordsColor,
-		swordRefColor  //SWORD hyperlink
-	};
-	enum bools {
-		firstSearchDialog,
-    readOldBookmarks,
-
-		toolbar,
-		mainIndex,
-
-		autoTile,
-		autoCascade,
-
-		lexiconCache,
-
-		lineBreaks,
-		verseNumbers,
-		scroll,
-
-		tips,
-		logo,
-		restoreWorkspace,
-    crashedLastTime,
-    crashedTwoTimes
-	};
-	enum ints {
-  	footnotes,
-  	strongNumbers,
-  	headings,
-  	morphTags,
-		lemmas,
-		hebrewPoints,
-		hebrewCantillation,
-		greekAccents,
-		textualVariants,
-    transliteration,
-    scriptureReferences
-  };
-  enum intLists {
-		splitterSizes
-	};
-	enum stringLists {
-		searchCompletionTexts,
-		searchTexts
-	};
-	enum keys {		
-	  readWindow,		
-		writeWindow,		
-	  bookWindow,
-		bibleWindow,
-		commentaryWindow,
-		lexiconWindow,
-		application
-	};
-  enum stringMaps {
-    searchScopes
-  };
-  typedef std::pair<bool, QFont> FontSettingsPair;
-  
-  static const QString 		get( const CBTConfig::strings );
-  static const bool 			get( const CBTConfig::bools );
-  static const int   			get( const CBTConfig::ints );
-  static const QColor 		get( const CBTConfig::colors );
-  static const QValueList<int>	get( const CBTConfig::intLists );
-  static const QStringList	get( const CBTConfig::stringLists );
-  static const CBTConfig::StringMap	get( const CBTConfig::stringMaps );
-
-  static const FontSettingsPair	get( const CLanguageMgr::Language& );
-	
-	static const QString 				 getDefault( const CBTConfig::strings );
-	static const bool		 				 getDefault( const CBTConfig::bools );
-	static const int		 				 getDefault( const CBTConfig::ints );
-	static const QColor	 				 getDefault( const CBTConfig::colors );
-	static const QValueList<int> getDefault( const CBTConfig::intLists );
-	static const QStringList		 getDefault( const CBTConfig::stringLists );
-	static const CBTConfig::StringMap  		 getDefault( const CBTConfig::stringMaps );
-  static const QFont 		       getDefault( const CLanguageMgr::Language& );
-    
-	static void set( const CBTConfig::strings, 	const QString value );
-	static void set( const CBTConfig::bools, 		const bool value );
-	static void set( const CBTConfig::ints, 		const int value );
-	static void set( const CBTConfig::colors, 	const QColor value );
-	static void set( const CBTConfig::intLists,	const QValueList<int> value );
-  static void set( const CBTConfig::stringLists, const QStringList value);
-  static void set( const CBTConfig::stringMaps, const CBTConfig::StringMap value);
-  static void	set( const CLanguageMgr::Language& language, const FontSettingsPair& fontSettings );    
-
-  static const CSwordBackend::FilterOptions getFilterOptionDefaults();
-  static const CSwordBackend::DisplayOptions getDisplayOptionDefaults();
-  static void setupAccel(const CBTConfig::keys type, KAccel* const accel);
-
-  static const QString getModuleEncryptionKey( const QString& name );
-  static void setModuleEncryptionKey( const QString& name, const QString& key );
-  
-private:
-	static const QString getKey( const CBTConfig::strings );
-	static const QString getKey( const CBTConfig::bools );
-	static const QString getKey( const CBTConfig::ints );
-	static const QString getKey( const CBTConfig::colors );
-	static const QString getKey( const CBTConfig::intLists );
-	static const QString getKey( const CBTConfig::stringLists );
-	static const QString getKey( const CBTConfig::stringMaps );
-	static const QString getKey( const CLanguageMgr::Language& );    
-};
-
-
-#endif
diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp
deleted file mode 100644
index 6707772..0000000
--- a/bibletime/frontend/cdragdropmgr.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/***************************************************************************
-                          cdragdropdmgr.cpp  -  description
-                             -------------------
-    begin                : Mit Nov 27 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cdragdropmgr.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "util/cpointers.h"
-
-//Sword includes
-#include "versekey.h"
-
-//Qt includes
-#include <qevent.h>
-#include <qdom.h>
-
-CDragDropMgr::BTDrag::BTDrag( const QString& xml, QWidget* dragSource, const char* name)
-  : QTextDrag(xml, dragSource, name)
-{
-  
-};
-
-//static function to see whether we can decode tje given mime type
-bool CDragDropMgr::BTDrag::canDecode( const QMimeSource * mime ) {
-  if ( mime->provides("BibleTime/DND") ) { //we can decode this type!
-    return true;
-  }
-  return false; //not yet implemented
-};
-
-bool CDragDropMgr::BTDrag::provides( const char* type ) const {
-  return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND
-};
-
-const char* CDragDropMgr::BTDrag::format( int i ) const {
-  if ( i == 0) { //we support only one format!
-    return "BibleTime/DND";
-  };
-  return 0;
-};
-
-bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str) {
-  if (canDecode(e)) {
-    str = QString( e->encodedData( "BibleTime/DND" ) );
-    return true;
-  }
-  return false;  
-};
-
-bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str, QCString& /*subtype*/) {
-  return decode(e, str);
-};
-
-QByteArray CDragDropMgr::BTDrag::encodedData( const char* /*type*/ ) const {
-  return QTextDrag::encodedData("text/plain"); //hack because QTextDrag only accepts text/plainand not our BibleTime/DND type
-};
-
-///////////////////////////// new class //////////////////////
-
-CDragDropMgr::Item::Item( const QString& text )
-  : m_type(Text),
-    m_bookmarkModuleName(QString::null),
-    m_bookmarkKey(QString::null),
-    m_bookmarkDescription(QString::null),
-    m_text(text)
-{
-  
-}
-
-CDragDropMgr::Item::Item( const QString& moduleName, const QString& key, const QString& description  )
-  : m_type(Bookmark),
-    m_bookmarkModuleName(moduleName),
-    m_bookmarkKey(key),
-    m_bookmarkDescription(description),
-    m_text(QString::null)
-{
-  //we have to make sure the key is saved in it's english representation, so we convert it
-  if (CSwordModuleInfo* mod = CPointers::backend()->findModuleByName( moduleName )) {
-    if (mod->type() == CSwordModuleInfo::Bible || mod->type() == CSwordModuleInfo::Commentary) {
-      CSwordVerseKey vk(0);
-      vk.key( key );
-      vk.setLocale("en");
-      
-      m_bookmarkKey = vk.key();
-//      qWarning("english key of %s is %s", key.latin1(), m_bookmarkKey.latin1());
-    }
-  }
-}
-
-CDragDropMgr::Item::~Item(){
-  
-}
-
-const CDragDropMgr::Item::Type& CDragDropMgr::Item::type() const {
-  //returns the type of drag & drop action this item represents
-  return m_type;
-}
-
-/** Returns the text which is used by this DragDrop Item, only valid if type() == Text */
-const QString& CDragDropMgr::Item::text() const {
-//  Q_ASSERT(!m_text.isEmpty()); 
-  return m_text;
-}
-
-/** Returns the key, ony valid if type() == Bookmark */
-const QString& CDragDropMgr::Item::bookmarkKey() const {
-//  Q_ASSERT(!m_bookmarkKey.isEmpty());
-  return m_bookmarkKey;
-}
-
-/** Returns the bookmark module, ony valid if type() == Bookmark */
-const QString& CDragDropMgr::Item::bookmarkModule() const {
-//  Q_ASSERT(!m_bookmarkModuleName.isEmpty());
-  return m_bookmarkModuleName;
-}
-
-/** Returns the bookmark description, ony valid if type() == Bookmark */
-const QString& CDragDropMgr::Item::bookmarkDescription() const {
-//  Q_ASSERT(!m_bookmarkDescription.isEmpty());  
-  return m_bookmarkDescription;
-}
-
-////////////////////////////////// NEW CLASS //////////////////////////
-
-CDragDropMgr::CDragDropMgr(){
-}
-
-CDragDropMgr::~CDragDropMgr(){
-}
-
-const bool CDragDropMgr::canDecode( const QMimeSource* const mime ) {
-  if (CDragDropMgr::BTDrag::canDecode(mime)) {
-    return true;
-  }
-  else if( QTextDrag::canDecode(mime) ) {
-    qWarning("QTextDrag can decode this mime!");
-    return true;
-  };
-  return false;
-};
-
-QDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource ) {
-  if ( items.count() ) {
-    //process the items and set the data to the dragobject we return later
-    QDomDocument doc("DOC");
-    doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-    QDomElement content = doc.createElement("BibleTimeDND");
-    content.setAttribute("syntaxVersion", "1.0");
-    doc.appendChild(content);
-    
-    CDragDropMgr::ItemList::iterator it;
-    for ( it = items.begin(); it != items.end(); ++it ) {
-      Item item = (*it);
-      if (item.type() == Item::Bookmark) { //a bookmark was dragged
-        //append the XML stuff for a bookmark
-        QDomElement bookmark = doc.createElement("BOOKMARK");
-        bookmark.setAttribute("key", item.bookmarkKey());
-        bookmark.setAttribute("description", item.bookmarkDescription());
-        bookmark.setAttribute("moduleName", item.bookmarkModule());
-
-        content.appendChild(bookmark);       
-      }
-      else if (item.type() == Item::Text) { //plain text was dragged
-        //append the XML stuff for plain text
-        QDomElement plainText = doc.createElement("TEXT");
-        plainText.setAttribute("text", item.text());
-
-        content.appendChild(plainText);        
-      }
-    }    
-  
-    BTDrag* dragObject = new BTDrag( doc.toString(), dragSource );
-//    qWarning("DND data created: %s", (const char*)doc.toString().utf8());
-    return dragObject;
-  };
-  return 0;
-};
-
-CDragDropMgr::ItemList CDragDropMgr::decode( const QMimeSource* const  src) {
-  //if the drag was started by another widget which doesn't use CDragDropMgr (a drag created by QTextDrag)
-  if (canDecode(src) && QTextDrag::canDecode(src)) { //if we can decode but it's a QTextDrag and not a BTDrag object
-    QString text;
-    QTextDrag::decode(src, text);
-//    qWarning(text.latin1());
-
-    CDragDropMgr::ItemList dndItems;
-    dndItems.append( Item(text) );
-    return dndItems;
-  }
-  else if (!canDecode(src)){ //if we can't decode it
-    return CDragDropMgr::ItemList();
-  };
-
-  QString xmlData;
-  BTDrag::decode(src, xmlData);
-
-  if (xmlData.isEmpty()) { //something went wrong!
-//    qWarning("CDragDropMgr::decode: empty xml data!");
-    return CDragDropMgr::ItemList();    
-  }
-//  else {
-//    qWarning("Drag&Drop data is: %s", xmlData.latin1());
-//  }
-
-  //we can handle the dropEvent and have xml data to work on!
-  ItemList dndItems;
-
-	QDomDocument doc;
-	doc.setContent( xmlData );
-
-  QDomElement document = doc.documentElement();
-  if( document.tagName() != "BibleTimeDND" ) { //BibleTime was used in syntax version 1.0
-		qWarning("DragDropMgr::decode: Missing BibleTimeDND doc");
-		return CDragDropMgr::ItemList();
-	}
-	// see if there's a section with the name MAINWINDOW
-  QDomElement elem = document.firstChild().toElement();
-  while (!elem.isNull()) {
-  		if (elem.tagName() == "BOOKMARK") { //we found a bookmark!
-//        qWarning("found a bookmark!");
-        const QString key = elem.hasAttribute("key") ? elem.attribute("key") : QString::null;
-        const QString moduleName = elem.hasAttribute("moduleName") ? elem.attribute("moduleName") : QString::null;
-        const QString description = elem.hasAttribute("description") ? elem.attribute("description") : QString::null;
-        
-        dndItems.append( CDragDropMgr::Item(moduleName, key, description) );
-      }
-      else if (elem.tagName() == "TEXT") { //we found a plain text passage!
-        const QString text = elem.hasAttribute("text") ? elem.attribute("text") : QString::null;
-        dndItems.append( CDragDropMgr::Item(text) );
-      };
-      elem = elem.nextSibling().toElement();
-  };
-  
-  return dndItems;
-};
-
-/** Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text), which shouldn't happen, it return Item::Unknown. */
-CDragDropMgr::Item::Type CDragDropMgr::dndType( const QMimeSource* e ){
-  ItemList dndItems = decode(e);
-  if (dndItems.isEmpty()) {//wrong dropEvent or something strange
-    return Item::Unknown;
-  };
-
-  //check whether all items have the ssame type, if they do return the type
-  //as soon as two items have different types return Item::Unknown
-  ItemList::Iterator it;
-  Item::Type type = Item::Unknown;
-  for( it = dndItems.begin(); it != dndItems.end(); ++it ) {
-    if( type == Item::Unknown) { //if Unknown is set this is the first loop, don't return Unknown
-      type = (*it).type();      
-    }
-    else if (type != (*it).type() ) {//items have different type, return Item::Unknown
-      return Item::Unknown;
-    };
-  };
-  return type;
-}
diff --git a/bibletime/frontend/cdragdropmgr.h b/bibletime/frontend/cdragdropmgr.h
deleted file mode 100644
index 41d01c5..0000000
--- a/bibletime/frontend/cdragdropmgr.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/***************************************************************************
-                          cdragdropdmgr.h  -  description
-                             -------------------
-    begin                : Mit Nov 27 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CDRAGDROPMGR_H
-#define CDRAGDROPMGR_H
-
-//Qt includes
-#include <qstring.h>
-#include <qcstring.h>
-#include <qdragobject.h>
-#include <qvaluelist.h>
-
-//forward declarations
-class QDropEvent;
-class QWidget;
-
-/** This class is the drag'n' drop manager for BibleTime.
- * The dnd is managed by XML code, which defines the type of the drag/drop, the items and the action (moe, copy etc.).
- * It's possible to create the XML code by passing a list of keys etc.
- *
- * Functions:
- *  - dnd_type(), returns either CDragDropMgr::Action_Drag or CDragDropMgr::Action_Drop
- *  - dnd_action(), returns either CDragDropMgr::Move or CDragDropMgr::Copy
- *  - dnd_acceptDrop(), returns true or false. True if the drop could be handled by the CDragDropMgr class, otherwise false
- *
- *
- * The functions which create the XML stuff can't be reimplemented, too. Otherwise we could not guarantee for good XML code
- * which works everywhere.
- *
- * @author The BibleTime team
- */
-class CDragDropMgr  {
-public:
-  //The class which represents one single drag&drop entry (e.g. a bookmark or a portion of text)
-  class Item {
-  public:
-    /**
-    * The possible types of Drag&Drop actions.
-    */
-    enum Type {
-      Bookmark = 0, /* A bookmark: Has a key, a module and a description*/
-      Text, /* Simple text, e.g. can be dropped on a module to start a search in this module using the dropped text */
-      Unknown /* For situatiosn like CDragDropMgr::dndType */
-    };
-    /**
-    * This function returns the type of drag this item has
-    */
-    const CDragDropMgr::Item::Type& type() const;
-    /**
-    * Returns the key, ony valid if type() == Bookmark
-    */
-    const QString& bookmarkKey() const;
-    /**
-    * Returns the module name, ony valid if type() == Bookmark
-    */
-    const QString& bookmarkModule() const;
-    /**
-    * Returns the bookmark description, ony valid if type() == Bookmark
-    */
-    const QString& bookmarkDescription() const;
-    /**
-    * Returns the text which is used by this DragDrop Item, only valid if type() == Text
-    */
-    const QString& text() const;
-
-//  protected:
-    friend class CDragDropMgr;
-    /*
-    * We use protected constructor and destructor because creation of objects
-    * of this class sould only be possible for CDragDropMgr
-    */
-
-    /** Constructor for a text item
-    * This constructor automatically sets the type member to Text
-    * This is also the default constructor
-    */
-    Item(const QString& text = QString::null );
-    /** Constructor for a Bookmark item
-    * This constructor automatically sets the type member to Bookmark
-    */
-    Item(const QString& moduleName, const QString& key, const QString& description);
-    virtual ~Item();
-
-  private:
-    Type m_type; //the member to save the type of the action
-    QString m_bookmarkModuleName; //the modules which is used by this item, only valid for type() == Bookmark
-    QString m_bookmarkKey; //the key of a bookmark, only valid if type() == Bookmark
-    QString m_bookmarkDescription; //the description of a bookmark, only valid if type() == Bookmark    
-    QString m_text; //the text of this item, only valid if type() == Text    
-  }; //end of class CDragDropMgr::Item
-
-  //the item list we're using
-  typedef QValueList<Item> ItemList;
-  
-  /** Return whether the drop should be accepted
-  * This functions tests whether the drop should be accepted or not. It returns true if the drop object
-  * is supported by the CDragDropMgr and if it cotains valid data. Oterwise this function returns false.
-  */
-  static const bool canDecode( const QMimeSource* const mime );
-  /**
-  * This function returns the drag object with the data which represents the items given as parameter
-  * If the list is invalid or empty we return NULL.
-  */
-  static QDragObject* const dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource );
-
-  /**
-  * Decodes the XML stuff we passed to the dragObject at creation time.
-  * Returns a list of CDragDropMgr::Item objects.
-  * If it's a wrong dropEvent we return an empty ist
-  */
-  static CDragDropMgr::ItemList decode( const QMimeSource* const src  ); 
-  /**
-  * Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text),
-  * which shouldn't happen, it return Item::Unknown.
-  * It also returns Unknown if the drop event is not supported.
-  */
-  static CDragDropMgr::Item::Type dndType( const QMimeSource* e );
-  
-protected:
-  //The class which represents our XML drag object stuff
-  class BTDrag : public QTextDrag {
-  public:
-    BTDrag( const QString& xml, QWidget* dragSource = 0, const char* name = 0);
-    //reimplemented static publoc function to provide functionality for BibleTime XML drags
-    static bool canDecode( const QMimeSource * e );
-    virtual bool provides( const char* type ) const;
-    virtual const char* format( int i = 0 ) const;
-
-    virtual QByteArray encodedData( const char* type ) const;
-    
-  protected:
-    friend class CDragDropMgr;
-    //made protected because the BibleTime classes may not manage the data of BTDrag
-//    virtual void setText(const QString& text);
-
-    //made protected because the BibleTime classes should not manage the DRag&Drop stuff themself
-    static bool decode(const QMimeSource* e, QString& str);
-    static bool decode(const QMimeSource* e, QString& str, QCString& subtype);
-  };
-
-  //protected constructor and destructor because we do not allow inheritance, functionality is provided by static functions
-	CDragDropMgr();
-	virtual ~CDragDropMgr();  
-};
-
-#endif
diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp
deleted file mode 100644
index cdf971a..0000000
--- a/bibletime/frontend/cexportmanager.cpp
+++ /dev/null
@@ -1,496 +0,0 @@
-/***************************************************************************
-                          cexportmanager.cpp  -  description
-                             -------------------
-    begin                : Mon Feb 25 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cexportmanager.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/creferencemanager.h"
-#include "backend/cswordversekey.h"
-#include "backend/centrydisplay.h"
-
-#include "printing/cprintitem.h"
-#include "printing/cprinter.h"
-
-#include "util/ctoolclass.h"
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qclipboard.h>
-#include <qptrlist.h>
-#include <qprogressdialog.h>
-
-//KDE includes
-#include <kprogress.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <kapplication.h>
-
-//Sword includes
-#include <swkey.h>
-#include <listkey.h>
-
-
-CExportManager::CExportManager(const QString& caption, const bool showProgress, const QString& progressLabel, const CSwordBackend::FilterOptions filterOptions, const CSwordBackend::DisplayOptions displayOptions) {
-  m_caption = !caption.isEmpty() ? caption : QString::fromLatin1("BibleTime");
-  m_progressLabel = progressLabel;
-  m_filterOptions = filterOptions;
-  m_displayOptions = displayOptions;
-  m_showProgress = showProgress;
-  m_progressDialog = 0;
-};
-
-const bool CExportManager::saveKey(CSwordKey* key, const Format format, const bool addText) {
-  if (!key)
-    return false;
-
-  const QString filename = getSaveFileName(format);
-  if (filename.isEmpty())
-    return false;
-
-  QString text = QString::null;
-  bool hasBounds = false;
-  if (addText) { //add the text of the key to the content of the file we save
-    CPointers::backend()->setFilterOptions(m_filterOptions);
-    CPointers::backend()->setDisplayOptions(m_displayOptions);
-
-    CSwordModuleInfo* module = key->module();
-  	if (CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key) ) { //we can have a boundary
-      if (vk->isBoundSet()) {//we have a valid boundary!
-        hasBounds = true;
-        CSwordVerseKey startKey(module);
-        CSwordVerseKey stopKey(module);
-
-    		startKey.key(vk->LowerBound());
-    		stopKey.key(vk->UpperBound());
-
-        QString entryText;
-        if (format == HTML) {
-          text = QString::fromLatin1("<html><head><meta http-equiv=Content-Type content=\"text/html; charset=utf-8\"><style type=\"text/css\">%1</style></head><body>")
-                   .arg(htmlCSS(module));
-        };
-
-        //add the heading
-        if (startKey < stopKey) { //we have a boundary
-          QString bound = QString::fromLatin1("%1 - %2").arg(startKey.key()).arg(stopKey.key());
-          text +=
-            (format == HTML)
-            ? QString::fromLatin1("<h3>%1</h3><br/>").arg(bound)
-            : QString::fromLatin1("%1\n\n").arg(bound);
-
-         	while ( (startKey < stopKey) || (startKey == stopKey) ) {
-            entryText = (format == HTML) ? startKey.renderedText(CSwordKey::HTMLEscaped) : startKey.strippedText();
-
-         		text += ((bool)m_displayOptions.verseNumbers ? QString::fromLatin1("%1 ").arg(startKey.Verse()) : QString::null)
-+ entryText + lineBreak(format);
-
-            startKey.next(CSwordVerseKey::UseVerse);
-          }
-        }
-        else {
-          hasBounds = false;
-        };
-      }
-  	}
-
-    if (!hasBounds) { //no verse key, so we can't have a boundary!
-      text =
-        (format == HTML)
-        ? QString::fromLatin1("<html><head><title>%1</title><meta http-equiv=Content-Type content=\"text/html; charset=utf-8\"></head><body><h3>%2 (%3)</h3><br/>%4") //HTML escaped text
-            .arg(key->key())
-            .arg(key->key())
-            .arg(module->name())
-            .arg(key->renderedText(CSwordKey::HTMLEscaped))
-        : QString::fromLatin1("%1 (%2)\n\n%3") //plain text
-            .arg(key->key())
-            .arg(module->name())
-            .arg(key->strippedText());
-      //we should only add the reference if the key has no bounds
-      text +=
-        lineBreak(format) +
-        QString::fromLatin1("(%1, %1)")
-            .arg(key->key())
-            .arg(module->name());
-    }
-
-    if (format == HTML) {
-      text += QString::fromLatin1("</body></html>");
-    };
-  }
-  else { //don't add the text of the key, we
-    text = key ? key->key() : QString::null;
-  	return true;
-  }
-
-	CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale);
-	return true;
-};
-
-const bool CExportManager::saveKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText) {
-  if (!list)
-    return false;
-  const QString filename = getSaveFileName(format);
-  if (filename.isEmpty())
-    return false;
-
-  setProgressRange(list->Count());
- 	util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(module));
- 	QString text;
- 	(*list) = sword::TOP;
- 	while (!list->Error() && !progressWasCancelled()) {
- 		if (!key)
- 			break;
-    key->key((const char*)(*list));
-
-    if (addText) {
- 			text += QString::fromLatin1("%1:%2\t%3\n").arg( key->key() ).arg(lineBreak(format)).arg( (format == HTML) ? key->renderedText(CSwordKey::HTMLEscaped) : key->strippedText() );
-    }
- 		else {
- 			text += key->key() + lineBreak(format);
-    }
-
-    incProgress();
- 		(*list)++;
- 	}
-
-  if (!progressWasCancelled()) {
- 		CToolClass::savePlainFile(filename, text);
- 		closeProgressDialog();
- 		return true;
- 	}
-	return false;
-};
-
-const bool CExportManager::saveKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText ) {
-  if (!list.count())
-    return false;
-
-	const QString filename = getSaveFileName(format);
-  if (filename.isEmpty())
-    return false;
-
-	QString text;
-  setProgressRange(list.count());
-  for (CSwordKey* k = list.first(); k && !progressWasCancelled(); k = list.next()) {
- 		if (addText) {
- 			text += QString::fromLatin1("%1:%2\t%3\n").arg( k->key() ).arg(lineBreak(format)).arg( (format == HTML) ? k->renderedText(CSwordKey::HTMLEscaped) : k->strippedText() );
-		}
- 		else {
- 			text += k->key() + lineBreak(format);
-		}
-    incProgress();
-  };
-
-  if (!progressWasCancelled()) {
- 		CToolClass::savePlainFile(filename, text);
- 		closeProgressDialog();
- 		return true;
- 	}
-  return false;
-};
-
-const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bool addText) {
-  if (!key)
-    return false;
-
-  QString text = QString::null;
-  if (addText) {
-    CPointers::backend()->setFilterOptions(m_filterOptions);
-    CPointers::backend()->setDisplayOptions(m_displayOptions);
-
-    CSwordModuleInfo* module = key->module();
-  	if (CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key) ) {
-      CSwordVerseKey startKey(module);
-      CSwordVerseKey stopKey(module);
-
-  		startKey.key(vk->LowerBound());
-  		stopKey.key(vk->UpperBound());
-      QString entryText;
-  		while ( startKey < stopKey || startKey == stopKey ) {
-        entryText = (format == HTML) ? startKey.renderedText() : startKey.strippedText();
-
-  			text += ((bool)m_displayOptions.verseNumbers ? QString::fromLatin1("%1 ").arg(startKey.Verse()) : QString::null)
-+ entryText + lineBreak(format);
-
-        startKey.next(CSwordVerseKey::UseVerse);
-  		}
-  	}
-    else {
-      text = (format == HTML) ? key->renderedText() : key->strippedText();
-    }
-    text += "\n" + QString::fromLatin1("(%1, %1)").arg(key->key()).arg(module->name());
-  }
-  else { //don't add text
-//    text = key ? key->key() : QString::null;
-    if (CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key)) { //make sure VerseKeys are localized!
-//      CSwordVerseKey vk( *key );
-      vk->setLocale( backend()->booknameLanguage().latin1() );
-
-      text = vk->key();      
-    }
-    else {
-      text = key->key();
-    }
-  	return true;
-  }
-  KApplication::clipboard()->setText(text);
-	return true;
-};
-
-const bool CExportManager::copyKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText) {
-  if (!list)
-    return false;
-
-  setProgressRange(list->Count());
- 	util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(module));
-
- 	QString text;
- 	*list = sword::TOP;
- 	while (!list->Error() && !progressWasCancelled()) {
- 		if (!key)
- 			break;
-
-    key->key((const char*)(*list));
- 		if (addText)
-// 			text += QString::fromLatin1("%1:%2\t%3\n").arg( key->key() ).arg(lineBreak(format)).arg( (format == HTML) ? key->renderedText() : key->strippedText() );
- 			text += QString::fromLatin1("%1\t%3\n").arg( key->key() ).arg( (format == HTML) ? key->renderedText() : key->strippedText() );
-
- 		else
- 			text += key->key() + lineBreak(format);
-    incProgress();
- 		(*list)++;
- 	}
-
-  if (!progressWasCancelled()) {
-    KApplication::clipboard()->setText(text);
-		closeProgressDialog();
-   	return true;
- 	}
-	return false;
-};
-
-
-const bool CExportManager::copyKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText ) {
-  if (!list.count())
-    return false;
-
-  QString text;
-  setProgressRange(list.count());
-  for (CSwordKey* k = list.first(); k && !progressWasCancelled(); k = list.next()) {
- 		if (addText)
-// 			text += QString::fromLatin1("%1:%2\t%3\n").arg( k->key() ).arg(lineBreak(format)).arg( (format == HTML) ? k->renderedText() : k->strippedText() );
- 			text += QString::fromLatin1("%1\t%3\n").arg( k->key() ).arg( (format == HTML) ? k->renderedText() : k->strippedText() );
-
- 		else
- 			text += k->key() + lineBreak(format);
-    incProgress();
-  };
-
-  if (!progressWasCancelled()) {
-    KApplication::clipboard()->setText(text);
- 		closeProgressDialog();
- 		return true;
- 	}
-  return false;
-};
-
-const bool CExportManager::printKeyList(sword::ListKey* list, CSwordModuleInfo* module) {
-  setProgressRange(list->Count()+1);
-	QPtrList<CPrintItem> itemList;
-	QString startKey, stopKey;
-
-	(*list) = sword::TOP;
-	while (!list->Error() && !progressWasCancelled()) {
-		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(list);
-		if (vk) {
-			startKey = QString::fromLocal8Bit((const char*)(vk->LowerBound()) );
-			stopKey = QString::fromLocal8Bit((const char*)(vk->UpperBound()) );
-		}
-		else {
-			startKey = QString::fromLocal8Bit((const char*)*list);
-			stopKey = QString::null;
-		//add all items to the queue
-	  }
-    itemList.append( new CPrintItem(module, startKey, stopKey, QString::null, m_displayOptions, m_filterOptions) );
-    incProgress();    
-		(*list)++;
-	}
-
-	//add all items to the queue
-	if (progressWasCancelled()) {
-		itemList.setAutoDelete(true);
-		itemList.clear();//delete all items
-		return false;
-	}
-
-  printer()->appendItems(itemList);
-  closeProgressDialog();    //close the dialog
-	return true;
-};
-
-const bool CExportManager::printKeyList( const PrintItemList& list, CSwordModuleInfo* module ){
-  if (!list.count() || !module)
-    return false;
-  setProgressRange(list.count()+1);
-//  KApplication::kApplication()->processEvents(); //do not lock the GUI!
-    
-  PrintItemList::ConstIterator it;
-  for ( it = list.begin(); (it != list.end()) && !progressWasCancelled(); ++it ) {
-    printer()->appendItem( new CPrintItem(module,(*it).first,(*it).second, QString::null, m_displayOptions, m_filterOptions) );
-//  	KApplication::kApplication()->processEvents(); //do not lock the GUI!    
-  }
-  
-  closeProgressDialog(); //to close the dialog
-	return true;
-}
-
-const bool CExportManager::printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description ){
-	printer()->appendItem( new CPrintItem(module, startKey, stopKey, description, m_displayOptions, m_filterOptions) );
-	return true;
-}
-
-const bool CExportManager::printKey( CSwordKey* key, const QString& description ){
-	printer()->appendItem( new CPrintItem(key->module(),key->key(), key->key(), description, m_displayOptions, m_filterOptions) );
-	return true;
-}
-
-/** Prints a key using the hyperlink created by CReferenceManager. */
-const bool CExportManager::printByHyperlink( const QString& hyperlink ){
- 	QString moduleName;
-  QString keyName;
-  CReferenceManager::Type type;
-
-  CReferenceManager::decodeHyperlink(hyperlink, moduleName, keyName, type);
-  if (moduleName.isEmpty()) {
-  	moduleName = CReferenceManager::preferredModule(type);
-	}
-
- 	if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-    QString startKey = keyName;
-    QString stopKey = keyName;
-
-    //check if we have a range of entries or a single one
-    if (module->type() == CSwordModuleInfo::Bible || module->type() == CSwordModuleInfo::Commentary) {
-     sword:: ListKey verses =sword:: VerseKey().ParseVerseList((const char*)keyName.local8Bit(), "Genesis 1:1", true);
-    	for (int i = 0; i < verses.Count(); ++i) {
-    		sword::VerseKey* element = dynamic_cast<sword::VerseKey*>(verses.GetElement(i));
-    		if (element)
-        	CExportManager::printKey(module,QString::fromLocal8Bit((const char*)element->LowerBound()), QString::fromLocal8Bit((const char*)element->UpperBound()) );
-    		else
-					CExportManager::printKey(module,(const char*)*verses.GetElement(i),(const char*)*verses.GetElement(i));
-    	}
-		}
-  	else {
-			CExportManager::printKey(module,keyName,keyName);
-    }
-	}
-  return true;
-}
-
-/** Returns the string for the filedialogs to show the correct files. */
-const QString CExportManager::filterString( const Format format ){
-  switch (format) {
-    case HTML:
-      return i18n("*.html *.htm | HTML files\n *.* | All files (*.*)");
-    case Text:
-      return i18n("*.txt | Text files\n *.* | All files (*.*)");
-    default:
-      return i18n("All files (*.*)");
-  };
-}
-
-/** Returns a filename to save a file. */
-const QString CExportManager::getSaveFileName(const Format format){
-  return KFileDialog::getSaveFileName(QString::null, filterString(format), 0, m_caption);
-}
-
-/** Returns a string containing the linebreak for the current format. */
-const QString CExportManager::lineBreak(const Format format){
-  if (static_cast<bool>(m_displayOptions.lineBreaks))
-    return (format == HTML) ? QString::fromLatin1("<BR>\n") : QString::fromLatin1("\n");
-  else
-    return QString::null;
-}
-
-/** Returns the CSS string used in HTML pages. */
-const QString CExportManager::htmlCSS(CSwordModuleInfo* module){
-  CEntryDisplay* display = module ? module->getDisplay() : 0;
-  if (!display) {
-    return QString::null;
-  }
-
-  QString css = QString::null;
-  for (int i = CEntryDisplay::MinType; i <= CEntryDisplay::MaxType; ++i) {
-    CEntryDisplay::StyleType type = static_cast<CEntryDisplay::StyleType>(i);
-    if (type != CEntryDisplay::Body && type != CEntryDisplay::Background) {
-      css += display->cssString( type );
-    }
-  }
-  return css;
-}
-
-/** No descriptions */
-void CExportManager::setProgressRange( const int items ){
-  if (QProgressDialog* dlg = progressDialog()) {
-    dlg->setTotalSteps(items);
-    dlg->setProgress(0);
-  	dlg->setMinimumDuration(0);
-    dlg->show();
-    dlg->repaint();
-  	KApplication::kApplication()->processEvents(); //do not lock the GUI!    
-  }
-}
-
-/** Creates the progress dialog with the correct settings. */
-QProgressDialog* const CExportManager::progressDialog(){
-  if (!m_showProgress) {
-    return 0;
-  };
-  if (!m_progressDialog) {
-    m_progressDialog = new QProgressDialog( m_caption, m_progressLabel, 1, 0, "progress", true );
-    m_progressDialog->setCaption("BibleTime");
-  };
-  return m_progressDialog;
-}
-
-/** Increments the progress by one item. */
-void CExportManager::incProgress(){
-  if (QProgressDialog* dlg = progressDialog()) {
-    KApplication::kApplication()->processEvents(); //do not lock the GUI!
-    dlg->setProgress( dlg->progress() + 1 );
-    dlg->repaint();
-    KApplication::kApplication()->processEvents(); //do not lock the GUI!
-  }
-}
-
-/** No descriptions */
-const bool CExportManager::progressWasCancelled(){
-  if (QProgressDialog* dlg = progressDialog()) {
-    return dlg->wasCancelled();
-  };
-  return true;
-}
-
-/** Closes the progress dialog immediatly. */
-void CExportManager::closeProgressDialog(){
-  if (QProgressDialog* dlg = progressDialog()) {
-    dlg->repaint();
-    dlg->close();
-    dlg->reset();
-  }
-  KApplication::kApplication()->processEvents(); //do not lock the GUI!
-}
diff --git a/bibletime/frontend/cexportmanager.h b/bibletime/frontend/cexportmanager.h
deleted file mode 100644
index 4ed1171..0000000
--- a/bibletime/frontend/cexportmanager.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
-                          cexportmanager.h  -  description
-                             -------------------
-    begin                : Mon Feb 25 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CEXPORTMANAGER_H
-#define CEXPORTMANAGER_H
-
-//BibleTime includes
-#include "cbtconfig.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qptrlist.h>
-
-class ListKey;
-class CSwordKey;
-class CSwordModuleInfo;
-class QProgressDialog;
-
-typedef std::pair<QString, QString> QStringPair;
-typedef QValueList<QStringPair> PrintItemList;
-
-/**Contains the functions to export text to disk, clipboard or printer.
-  *@author The BibleTime team
-  */
-class CExportManager : CPointers {
-public:
-  enum Format {
-    HTML,
-    Text
-  };
-  
-  CExportManager(const QString& caption, const bool showProgress = true, const QString& progressLabel = QString::null, const CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(), const CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults());
-  const bool saveKey(CSwordKey* key, const Format format, const bool addText);
-  const bool saveKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText);
-  const bool saveKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText );
-
-  const bool copyKey(CSwordKey* key, const Format format, const bool addText);
-  const bool copyKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText);
-  const bool copyKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText );  
-
-  const bool printKey(CSwordKey* key, const QString& description = QString::null);
-  const bool printByHyperlink(const QString& hyperlink);  
-  const bool printKeyList(sword::ListKey* list, CSwordModuleInfo* module);
-  const bool printKeyList(const PrintItemList& list,CSwordModuleInfo* module);  
-  const bool printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description = QString::null );
-
-protected: // Protected methods
-  /**
-  * Returns the string for the filedialogs to show the correct files.
-  */
-  const QString filterString( const Format format );
-  /**
-  * Returns a filename to save a file.
-  */
-  const QString getSaveFileName(const Format format);
-  /**
-  * Returns a string containing the linebreak for the current format.
-  */
-  const QString lineBreak( const Format format );
-
-private:
-  QString m_caption;
-  QString m_progressLabel;
-  bool m_showProgress;
-  CSwordBackend::FilterOptions m_filterOptions;
-  CSwordBackend::DisplayOptions m_displayOptions;
-
-  QProgressDialog* m_progressDialog;
-  
-  /**
-  * Creates the progress dialog with the correct settings.
-  */  
-  QProgressDialog* const progressDialog();
-  /**
-  * Returns the CSS string used in HTML pages.
-  */
-  void setProgressRange( const int item );
-  const QString htmlCSS(CSwordModuleInfo* module);
-  /**
-  * Increments the progress by one item.
-  */
-  inline void incProgress();
-  const bool progressWasCancelled();
-  /**
-  * Closes the progress dialog immediatly.
-  */
-  void closeProgressDialog();
-};
-
-#endif
diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp
deleted file mode 100644
index 61d6b51..0000000
--- a/bibletime/frontend/cinputdialog.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************
-                          cinputdialog.cpp  -  description
-                             -------------------
-    begin                : Sun May 13 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "cinputdialog.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qtextedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kseparator.h>
-
-CInputDialog::CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) {
-	setPlainCaption(caption);
-	
-	QVBoxLayout* topLayout = new QVBoxLayout(this, 5,5);
-		
-	QLabel* l = new QLabel(description, this);
-	topLayout->addWidget(l);
-	
-	topLayout->addSpacing(10);
-	
-	m_editWidget = new QTextEdit(this, "edit widget");
-	m_editWidget->setWordWrap( QTextEdit::WidgetWidth );
-	m_editWidget->setText(text);
-	if (!text.isEmpty())
-		m_editWidget->selectAll();
-	
-	topLayout->addWidget(m_editWidget);
-
-	KSeparator* separator = new KSeparator(KSeparator::HLine, this);
-	topLayout->addWidget(separator);
-		
-	QHBoxLayout* buttonLayout = new QHBoxLayout(topLayout);	
-	
-	buttonLayout->addStretch(2);		
-
-	QPushButton* cancel = new QPushButton(this);
-	cancel->setText(i18n("Cancel"));	
-	connect(cancel, SIGNAL(clicked()), SLOT(reject()));	
-	buttonLayout->addWidget(cancel,1);	
-
-	buttonLayout->addSpacing(15);	
-
-	QPushButton* clear = new QPushButton(this);
-	clear->setText(i18n("Clear"));	
-	connect(clear, SIGNAL(clicked()),m_editWidget, SLOT(clear()));	
-	buttonLayout->addWidget(clear,1);	
-
-	buttonLayout->addSpacing(15);	
-			
-	QPushButton* ok = new QPushButton(this);
-	ok->setText(i18n("Ok"));
-	connect(ok, SIGNAL(clicked()), SLOT(accept()));
-	buttonLayout->addWidget(ok,1);
-	
-	m_editWidget->setFocus();
-}
-
-//CInputDialog::~CInputDialog(){
-//}
-
-/** Returns the text entered at the moment. */
-const QString CInputDialog::text() {
-	return m_editWidget->text();
-}
-
-/** A static function to get some using CInputDialog. */
-const QString CInputDialog::getText( const QString& caption, const QString& description, const QString& text, bool* ok, QWidget* parent, bool modal){
-	CInputDialog* dlg = new CInputDialog(caption, description, text, parent, "", modal);	
-	QString ret = QString::null;
-		
-	const bool isOk = (dlg->exec() == CInputDialog::Accepted);
-	if (isOk)
-		ret = dlg->text();
-	if (ok)
-		*ok = isOk;
-	delete dlg;
-	return ret;
-}
diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h
deleted file mode 100644
index 8fa2c11..0000000
--- a/bibletime/frontend/cinputdialog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
-                          cinputdialog.h  -  description
-                             -------------------
-    begin                : Sun May 13 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CINPUTDIALOG_H
-#define CINPUTDIALOG_H
-
-//KDE includes
-#include <kdialog.h>
-
-class QTextEdit;
-class QWidget;
-
-/** This is a small input dialog with
-	* a multiline edit for the text input.
-  * @author The BibleTime team
-  */
-class CInputDialog : public KDialog  {
-   Q_OBJECT
-public: 	
-	CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent=0, const char *name=0, const bool modal = true);
-  /**
- 	* A static function to get some using CInputDialog.
- 	*/
-  static const QString getText( const QString& caption, const QString& description, const QString& text = QString::null, bool* ok = 0, QWidget* parent = 0, bool modal = true);
-  /**
- 	* Returns the text entered at the moment.
- 	*/
-  const QString text();
-//	~CInputDialog();
-
-private:
-	QTextEdit* m_editWidget;
-};
-
-#endif
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
deleted file mode 100644
index c1d35bc..0000000
--- a/bibletime/frontend/cmdiarea.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/***************************************************************************
-                          cmdiarea.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cmdiarea.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "config.h"
-
-//KDE includes
-#include <kpopupmenu.h>
-#include <kapplication.h>
-#include <klocale.h>
-
-//QT includes
-#include <qobjectlist.h>
-#include <qtimer.h>
-#include <qevent.h>
-#include <qwhatsthis.h>
-#include <qtimer.h>
-
-
-CMDIArea::CMDIArea(QWidget *parent, const char *name )
-	: QWorkspace(parent, name),
-    m_guiOption(Nothing),
-    m_childEvent(false),
-    m_deleting(false),
-    m_appCaption(QString::null)
-{			
-	initView();
-	initConnections();
-	readSettings();
-//  setAcceptDrops(true);
-}
-
-CMDIArea::~CMDIArea(){
-}
-
-/** Initializes the view of the MDI area */
-void CMDIArea::initView(){
-//	QWhatsThis::add(this, WT_MDI_AREA_WIDGET );
-	setPaletteBackgroundColor( parentWidget()->paletteBackgroundColor() );	//work around a KDE bug (IMHO was in KDE 2.x)
-}
-
-/** Initilizes the connectiosn to SIGNALS */
-void CMDIArea::initConnections(){
-	connect(this, SIGNAL(windowActivated(QWidget*)),
-		this, SLOT(slotClientActivated(QWidget*)));
-}
-
-/** Called whan a client window was activated */
-void CMDIArea::slotClientActivated(QWidget* client){
-	if (!client || !isUpdatesEnabled()) {
-    return;
-  }
-
-	CDisplayWindow* sp = dynamic_cast<CDisplayWindow*>(client);	
-	if (!sp || !sp->isReady())
-		return;
-
-  QWidgetList windows = windowList();
-  for ( QWidget* w = windows.first(); w; w = windows.next() ) {
-
-//Don't use!! It would disable accel enabling for the active window, see CDisplayWindow::windowActivated
-/*    if (w == client)
-        continue;
-*/
-
-   	CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(w);	
-		window->windowActivated( (window == sp) ? true : false);
-	}	
-	
-	emit sigSetToplevelCaption( ( m_appCaption = client->caption().stripWhiteSpace() ) );	
-}
-
-/** Reimplementation. Used to make use of the fixedGUIOption part. */
-void CMDIArea::childEvent( QChildEvent * e ){
-	QWorkspace::childEvent(e);
-
-	if ( m_childEvent || !isUpdatesEnabled() || !e) {
-    if (windowList().count() == 0) {
-      m_deleting = false;
-    }
-		return;
-  }
-  
-	m_childEvent = true;
-	
-	if (!windowList().count()) {
-		m_appCaption = QString::null;
-		emit sigSetToplevelCaption( KApplication::kApplication()->makeStdCaption(m_appCaption) );
-		emit sigLastPresenterClosed();
-	}	
-
-  if (!m_deleting && isUpdatesEnabled() && (e->inserted() || e->removed()) ) {
-		switch (m_guiOption) {
-	 		case autoTile:
-				QTimer::singleShot(0, this, SLOT(myTile()));
-	 			break;
-	 		case autoCascade:
-				myCascade();
-	 			break;
-	 		default:
-	 			break;
-		}
-
-	}
-
-  m_childEvent = false;
-
-  if (windowList().count() == 0) {
-    m_deleting = false;
-  }
-}
-
-/** Reimplementation */
-void CMDIArea::resizeEvent(QResizeEvent* e){
-	QWorkspace::resizeEvent(e);	
-
-  if (m_deleting ||  !isUpdatesEnabled()) {
-    return;
-  };
-  
-  switch (m_guiOption) {
- 		case autoTile:
-			myTile();
- 			break;
- 		case autoCascade:
-			myCascade();
- 			break;
- 		default:
- 			break;
-	}
-}
-
-/**  */
-void CMDIArea::saveSettings(){
-}
-
-/**  */
-void CMDIArea::readSettings(){
-}
-
-/** Deletes all the presenters in the MDI area. */
-void CMDIArea::deleteAll(){	
-  /*
-  will be set to false in childEvent, deleting windows is processed in the background, i.e.
-  control leaves this function
-  */
-  m_deleting = true;
-
-  QWidgetList windows( windowList() ); //copy pointers
-  windows.setAutoDelete( false );
-  const int count = windows.count();
-  for (int i = count-1; i >= 0; --i) {
-    QWidget* w = windows.at(i);
-    windows.remove(i);
-    delete w;
-  };
-
-//  m_deleting = false;
-}
-
-/** Enable / disable autoCascading */
-void CMDIArea::setGUIOption( const MDIOption& newOption ){
-	//now do the initial action
-	switch (( m_guiOption = newOption )) { //set new value and decide what to do
- 		case autoTile:
-			myTile();
- 			break;
- 		case autoCascade:
-			myCascade();
- 			break;
- 		default:
- 			break;
- 	}
-}
-
-/**  */
-void CMDIArea::myTile(){
-	if (m_deleting || !isUpdatesEnabled() || !windowList().count() )	{
-    return;
-  }
-
-	if ((windowList().count() == 1) && windowList().at(0)) {
-		m_appCaption = windowList().at(0)->caption();
-		windowList().at(0)->parentWidget()->showMaximized();
-	}
-	else {
-    QWidget* active = activeWindow();
-	  tile();
-    active->setFocus();
-  }
-}
-
-/**  */
-void CMDIArea::myCascade(){
-	if (m_deleting || !isUpdatesEnabled() || !windowList().count() ) {
-		return;
-  }
-    
-	if ((windowList().count() == 1) && windowList().at(0)) {
-    m_appCaption = windowList().at(0)->caption();
-		windowList().at(0)->parentWidget()->showMaximized();
-	}
- 	else {
-    QWorkspace::cascade();
-  }
-}
-
-/** This works around a problem/limitation in QWorkspace. QWorkspace sets every time the  application caption on its on way. This confuses BibleTime - wrong captions are generated. This function returns the right caption (using the MDI child). */
-const QString CMDIArea::currentApplicationCaption() const {
-	return m_appCaption;
-}
-
-/** Emits the signal to create a new display window in the MDI area. */
-void CMDIArea::emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName ) {
-  emit createReadDisplayWindow(modules, keyName);
-}
-
diff --git a/bibletime/frontend/cmdiarea.h b/bibletime/frontend/cmdiarea.h
deleted file mode 100644
index 978363a..0000000
--- a/bibletime/frontend/cmdiarea.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/***************************************************************************
-                          cmdiarea.h  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMDIAREA_H
-#define CMDIAREA_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-#include "backend/cswordmoduleinfo.h"
-
-//Qt includes
-#include <qworkspace.h>
-#include <qptrlist.h>
-#include <qstrlist.h>
-#include <qevent.h>
-
-class KPopupMenu;
-class CSwordModuleInfo;
-class CSwordKey;
-
-/** The MDI widget we use in BibleTime.
-	* Enhances QWorkspace.
-  * @author The BibleTime Team
-  */
-class CMDIArea : public QWorkspace, public CPointers  {
-   Q_OBJECT
-
-public:
-	/**
-	* The options you can set for this widget.
-	*/
-	enum MDIOption {
-		autoTile,
-		autoCascade,
-		Nothing
-	};	
-	CMDIArea(QWidget *parent=0, const char *name = 0 );
-	~CMDIArea();
-  /**
-  */
-  void readSettings();
-  /**
-  */
-  void saveSettings();
-  /**
-  * Enable / disable autoCascading
-  */
-  void setGUIOption( const MDIOption& newOption );
-  /**
-  * This works around a problem/limitation in QWorkspace. QWorkspace sets every time the 	
-  * application caption on its on way. This confuses BibleTime - wrong captions are generated.
-	* This function returns the right caption (using the MDI child).
-	*/
-  const QString currentApplicationCaption() const;
-
-public slots:
-  /**
-  * Called whan a client window was activated
-  */
-	void slotClientActivated(QWidget* client);
-  /**
-  * Deletes all the presenters in the MDI area.
-  */
-  void deleteAll();
-  /** Our own cascade version which, if only one window is left, shows this maximized.  
- 	* Also necessary for autoCasacde feature
- 	*/
-  void myCascade();
-  /** Our own cascade version which, if only one window is left, shows this maximized.
- 	* Also necessary for autoTile feature
- 	*/
-  void myTile();
-  /**
-  * Emits the signal to create a new display window in the MDI area.
-  */
-  void emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName );
-
-protected: // Protected methods
-  /**
-  * Used to make use of the fixedGUIOption part.
-  */
-  virtual void childEvent (QChildEvent * e);
-  /**
-  * Reimplementation
-  */
-  virtual void resizeEvent(QResizeEvent* e);
-  /**
-  * Initializes the connectiosn to SIGNALS
-  */
-  void initConnections();
-  /**
-  * Initializes the view of the MDI area
-  */
-  void initView();
-		
-signals: // Signals
-  /**
-  * Emits a signal to set the acption of the toplevel widget.
-  */
-  void sigSetToplevelCaption(const QString&);
-  /**
-  * Is emitted when the last presenter was closed.
-  */
-  void sigLastPresenterClosed();
-  void createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& keyName);
-
-private:
-	MDIOption m_guiOption;
-	bool m_childEvent;
-  bool m_deleting;
-	QString m_appCaption;
-};
-#endif
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
deleted file mode 100644
index f921320..0000000
--- a/bibletime/frontend/coptionsdialog.cpp
+++ /dev/null
@@ -1,1001 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "coptionsdialog.h"
-#include "cprofile.h"
-
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "frontend/displaywindow/cbiblereadwindow.h"
-#include "frontend/displaywindow/ccommentaryreadwindow.h"
-#include "frontend/displaywindow/clexiconreadwindow.h"
-#include "frontend/displaywindow/cbookreadwindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-//QT includes
-#include <qhbox.h>
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qdict.h>
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qhbuttongroup.h>
-#include <qradiobutton.h>
-#include <qcolor.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qstringlist.h>
-#include <qinputdialog.h>
-#include <qdir.h>
-
-
-//KDE includes
-#include <kapp.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kkeydialog.h>
-#include <kiconloader.h>
-#include <ktabctl.h>
-#include <kapp.h>
-#include <klistbox.h>
-#include <kkeydialog.h>
-#include <kaction.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
-
-//Sword includes
-#include <localemgr.h>
-
-using std::string;
-using std::list;
-
-COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KAccel* accel )
-	: KDialogBase(IconList, i18n("Preferences"), Ok | Cancel | Apply, Ok, parent, name, true, true, QString::null, QString::null, QString::null) {
-
-	m_settings.keys.application.accel = accel;
-	setIconListAllVisible(true);
-
-	initStartup();		
-	initFonts();
-	initColors();	
-	initProfiles();
-	initSword();
-	initAccelerators();
-}
-
-/**  */
-void COptionsDialog::newDisplayWindowFontSelected(const QFont &newFont){
-  CBTConfig::FontSettingsPair oldSettings = m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ];
-	m_settings.fonts.fontMap.replace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) );		
-}
-
-/** Called when the combobox contents is changed */
-void COptionsDialog::newDisplayWindowFontAreaSelected(const QString& usage){
-  useOwnFontClicked( m_settings.fonts.fontMap[usage].first );
-  m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[usage].first );
-
-  m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[usage].second );
-}
-
-/** Called if the OK button was clicked */
-void COptionsDialog::slotOk(){
-	saveAccelerators();
-	saveColors();
-	saveFonts();
-	saveSword();
-	saveStartup();
-	saveProfiles();
-	
-	KDialogBase::slotOk();
-
-  emit signalSettingsChanged( );
-}
-
-/*called if the apply button was clicked*/
-void COptionsDialog::slotApply(){
-	saveAccelerators();
-	saveColors();
-	saveFonts();
-	saveSword();
-	saveStartup();
-	saveProfiles();
-	
-	KDialogBase::slotApply();
-
-  emit signalSettingsChanged( );
-}
-
-/** Adds a new view profile to the list. */
-void COptionsDialog::addNewProfile(){
-	bool ok = false;
-	QString name = QInputDialog::getText(i18n("Create new session"), i18n("Please enter a name for the new session."), QLineEdit::Normal, QString::null, &ok);
-	if (ok && !name.isEmpty()) {
-		m_settings.profiles.mgr.create(name);
-		m_settings.profiles.profiles->insertItem(name);				
-		if (m_settings.profiles.profiles->count() == 1)
-			m_settings.profiles.profiles->setEnabled(true);		
-	}
-}
-
-/** No descriptions */
-void COptionsDialog::deleteProfile(){
-	const QString profile = m_settings.profiles.profiles->currentText();
-	m_settings.profiles.mgr.remove(profile);
-	m_settings.profiles.profiles->removeItem( m_settings.profiles.profiles->currentItem() );
-}
-
-/** Renames the currently selected profile. */
-void COptionsDialog::renameProfile(){
-	bool ok = false;
-	const QString currentProfile = m_settings.profiles.profiles->currentText();	
-	CProfile* profile = m_settings.profiles.mgr.profile(currentProfile);
-	if (!profile)
-		return;
-	const QString newName = QInputDialog::getText(i18n("Rename session"), i18n("Please enter a new name for the session."), QLineEdit::Normal, profile->name(), &ok);
-	if (ok && !newName.isEmpty()) {
-		profile->setName(newName);
-		m_settings.profiles.profiles->changeItem(newName, m_settings.profiles.profiles->currentItem());
-	}	
-}
-
-/** Opens the page which contaisn the given part ID. */
-const bool COptionsDialog::showPart( COptionsDialog::Parts ID ){
-	bool ret = false;
-	switch (ID) {
-		case COptionsDialog::ViewProfiles:
-			if(showPage(pageIndex(
-					m_settings.profiles.profiles->parentWidget()) ))
-				ret = true;
-			break;
-		default:
-			break;
-	}
-	return ret;
-}
-
-/** Initializes the startup section of the OD. */
-void COptionsDialog::initStartup(){
-	QFrame* page = addPage(i18n("Startup"), QString::null, DesktopIcon(CResMgr::settings::startup::icon,32));
-	QVBoxLayout* layout = new QVBoxLayout(page,5);
-
-  {//daily tips
-		m_settings.startup.showTips = new QCheckBox(page);
-		m_settings.startup.showTips->setText(i18n("Show tip of the day"));
-		QToolTip::add(m_settings.startup.showTips, CResMgr::settings::startup::dailyTip::tooltip );	
-		QWhatsThis::add(m_settings.startup.showTips, CResMgr::settings::startup::dailyTip::whatsthis );
-		
-		m_settings.startup.showTips->setChecked( CBTConfig::get(CBTConfig::tips) );
-	}
-	layout->addWidget(m_settings.startup.showTips);
-	
-	{ //startup logo
-		m_settings.startup.showLogo = new QCheckBox(page);
-		m_settings.startup.showLogo->setText(i18n("Show startuplogo"));
-		QToolTip::add(m_settings.startup.showLogo, CResMgr::settings::startup::showLogo::tooltip);		
-    QWhatsThis::add(m_settings.startup.showLogo, CResMgr::settings::startup::showLogo::whatsthis);
-		
-		m_settings.startup.showLogo->setChecked(CBTConfig::get(CBTConfig::logo));			
-	}		
-	layout->addWidget(m_settings.startup.showLogo);
-
-  { //workspace
-		m_settings.startup.restoreWorkspace = new QCheckBox(page);
-		m_settings.startup.restoreWorkspace->setText(i18n("Restore windows from the last BibleTime session"));
-		QToolTip::add(m_settings.startup.restoreWorkspace, CResMgr::settings::startup::restoreWorkingArea::tooltip);		
-		QWhatsThis::add(m_settings.startup.restoreWorkspace, CResMgr::settings::startup::restoreWorkingArea::whatsthis);
-
-		m_settings.startup.restoreWorkspace->setChecked(CBTConfig::get(CBTConfig::restoreWorkspace));
-	}
-	layout->addWidget(m_settings.startup.restoreWorkspace);			
-	
-	layout->addStretch(4);
-}
-
-/** Init fonts section. */
-void COptionsDialog::initFonts(){
-	QFrame* page = addPage(i18n("Fonts"), QString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32));
-	QVBoxLayout* layout = new QVBoxLayout(page,5);
-
- 	layout->addWidget(
-    CToolClass::explanationLabel(
-      page,
-      i18n("Select custom fonts per-language"),
-      i18n("Here you find a list of all languages of the installed modules. \
-You can specify a custom font for each language that needs a special font \
-to be displayed correctly.")
-    )
-  );
-  layout->addSpacing(5);
-
-
-  //horizontal layout box to contain the chooser box and use own font checkbox
-  QHBoxLayout* hLayout = new QHBoxLayout();
-
- 	m_settings.fonts.usage = new QComboBox(page);
- 	QToolTip::add(m_settings.fonts.usage, CResMgr::settings::fonts::typeChooser::tooltip);
- 	QWhatsThis::add(m_settings.fonts.usage, CResMgr::settings::fonts::typeChooser::whatsthis);
-
-  hLayout->addWidget(m_settings.fonts.usage);
-
-  CLanguageMgr::LangMap langMap = languageMgr()->availableLanguages();
-  CLanguageMgr::LangMap::Iterator it;
-
-  for ( it = langMap.begin(); it != langMap.end(); ++it ) {
-    const QString name = it.data().translatedName().isEmpty() ? it.data().abbrev() : it.data().translatedName();
-    m_settings.fonts.fontMap.insert(name, CBTConfig::get(it.data()) );
-  }
-
-  for( QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) {
-		if ( m_settings.fonts.fontMap[it.key()].first ) { //show font icon
-	 		m_settings.fonts.usage->insertItem(SmallIcon("fonts"), it.key() );
-    }
-		else {	//don't show icon for font
-	 		m_settings.fonts.usage->insertItem(it.key());
-    }
-  }
-
-
-  m_settings.fonts.useOwnFontBox = new QCheckBox(i18n("Use custom font"), page, "font checkbox");
-  connect(m_settings.fonts.useOwnFontBox, SIGNAL(toggled(bool)), SLOT(useOwnFontClicked(bool)));
- 	hLayout->addWidget(m_settings.fonts.useOwnFontBox);
-
-
-  layout->addLayout(hLayout);
-//#warning TODO: remember the last selected font and jump there.
-
- 	m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, QStringList(), true, 5);
- 	m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
- 	layout->addWidget(m_settings.fonts.fontChooser);
-
-  connect(m_settings.fonts.fontChooser, SIGNAL(fontSelected(const QFont&)), SLOT(newDisplayWindowFontSelected(const QFont&)));
-  connect(m_settings.fonts.usage, SIGNAL(activated(const QString&)), SLOT(newDisplayWindowFontAreaSelected(const QString&)));
-
- 	m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second );
-  useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
-	m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
- 	m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->sizeHint());
-}
-
-/** Init color section. */
-void COptionsDialog::initColors(){
-	QFrame* page = addPage(i18n("Colors"), QString::null, DesktopIcon(CResMgr::settings::colors::icon,32));
-//	QVBoxLayout* layout = new QVBoxLayout(page);
-	QGridLayout* gridLayout = new QGridLayout(page,8,5,5,5);
-  gridLayout->setResizeMode(QLayout::Minimum);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(page,
-  		i18n("Choose colors"),
-  		i18n("Choose custom colors to alter the apperance of the display windows. \
-Some options like \"Words of Jesus\" only apply to texts which offer special features.")
-  	),
-  	0,0,0,-1
-  );
-
-	m_settings.colors.text = new KColorButton(CBTConfig::get(CBTConfig::textColor), page);
-  QToolTip::add(m_settings.colors.text, CResMgr::settings::colors::text::tooltip);
-  QWhatsThis::add(m_settings.colors.text, CResMgr::settings::colors::text::whatsthis);
-
-	QLabel* label = new QLabel(m_settings.colors.text, i18n("Text"), page);
-	gridLayout->addWidget(label,1,0);
-	gridLayout->addWidget(m_settings.colors.text,1,1);
-  QToolTip::add(label, CResMgr::settings::colors::text::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::text::whatsthis);
-
-
-	m_settings.colors.highlightedVerse = new KColorButton(CBTConfig::get(CBTConfig::highlightedVerseColor), page);
-  QToolTip::add(m_settings.colors.highlightedVerse, CResMgr::settings::colors::highlightedVerse::tooltip);
-  QWhatsThis::add(m_settings.colors.highlightedVerse, CResMgr::settings::colors::highlightedVerse::whatsthis);
-
-	label = new QLabel(m_settings.colors.highlightedVerse, i18n("Highlighted verse"), page);
-  QToolTip::add(label, CResMgr::settings::colors::highlightedVerse::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::highlightedVerse::whatsthis);
-
-  gridLayout->addWidget(label,1,3);
-	gridLayout->addWidget(m_settings.colors.highlightedVerse,1,4);
-
-
-	m_settings.colors.background = new KColorButton(CBTConfig::get(CBTConfig::backgroundColor), page);
-  QToolTip::add(m_settings.colors.background, CResMgr::settings::colors::background::tooltip);
-  QWhatsThis::add(m_settings.colors.background, CResMgr::settings::colors::background::whatsthis);
-
-  label = new QLabel(m_settings.colors.background, i18n("Background"), page);
-  QToolTip::add(label, CResMgr::settings::colors::background::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::background::whatsthis);
-
-  gridLayout->addWidget(label,2,0);
-	gridLayout->addWidget(m_settings.colors.background,2,1);
-
-
-  m_settings.colors.swordrefs = new KColorButton(CBTConfig::get(CBTConfig::swordRefColor), page);
-  QToolTip::add(m_settings.colors.swordrefs, CResMgr::settings::colors::links::tooltip);
-  QWhatsThis::add(m_settings.colors.swordrefs, CResMgr::settings::colors::links::whatsthis);
-
-	label = new QLabel(m_settings.colors.swordrefs,i18n("Hyperlinks"), page);
-  QToolTip::add(label, CResMgr::settings::colors::links::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::links::whatsthis);
-
-  gridLayout->addWidget(label,4,0);
-	gridLayout->addWidget(m_settings.colors.swordrefs,4,1);
-
-	m_settings.colors.footnotes = new KColorButton(CBTConfig::get(CBTConfig::footnotesColor), page);
-  QToolTip::add(m_settings.colors.footnotes, CResMgr::settings::colors::footnotes::tooltip);
-  QWhatsThis::add(m_settings.colors.footnotes, CResMgr::settings::colors::footnotes::whatsthis);
-
-  label = new QLabel(m_settings.colors.footnotes,i18n("Footnotes"), page);
-  QToolTip::add(label, CResMgr::settings::colors::footnotes::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::footnotes::whatsthis);
-
-	gridLayout->addWidget(label,6,0);
-	gridLayout->addWidget(m_settings.colors.footnotes,6,1);
-
-	m_settings.colors.jesuswords = new KColorButton(CBTConfig::get(CBTConfig::jesuswordsColor), page);
-  QToolTip::add(m_settings.colors.jesuswords, CResMgr::settings::colors::jesusWords::tooltip);
-  QWhatsThis::add(m_settings.colors.jesuswords, CResMgr::settings::colors::jesusWords::whatsthis);
-
-  label = new QLabel(m_settings.colors.jesuswords, i18n("Words of Jesus"), page);
-  QToolTip::add(label, CResMgr::settings::colors::jesusWords::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::jesusWords::whatsthis);
-
-	gridLayout->addWidget(label,6,3);
-	gridLayout->addWidget(m_settings.colors.jesuswords,6,4);
-
-
-	m_settings.colors.strongs = new KColorButton(CBTConfig::get(CBTConfig::strongsColor), page);
-  QToolTip::add(m_settings.colors.strongs, CResMgr::settings::colors::strongNumbers::tooltip);
-  QWhatsThis::add(m_settings.colors.strongs, CResMgr::settings::colors::strongNumbers::whatsthis);
-
-  label = new QLabel(m_settings.colors.strongs, i18n("Strong's numbers"), page);
-	QToolTip::add(label, CResMgr::settings::colors::strongNumbers::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::strongNumbers::whatsthis);
-
-  gridLayout->addWidget(label,7,0);
-	gridLayout->addWidget(m_settings.colors.strongs,7,1);
-
-
-	m_settings.colors.morph = new KColorButton(CBTConfig::get(CBTConfig::morphsColor), page);
-  QToolTip::add(m_settings.colors.morph, CResMgr::settings::colors::morphTags::tooltip);
-  QWhatsThis::add(m_settings.colors.morph, CResMgr::settings::colors::morphTags::whatsthis);
-
-	label = new QLabel(m_settings.colors.morph, i18n("Morphologic tags"), page);
-  QToolTip::add(label, CResMgr::settings::colors::morphTags::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::morphTags::whatsthis);
-
-  gridLayout->addWidget(label,7,3);
-	gridLayout->addWidget(m_settings.colors.morph,7,4);
-
-	gridLayout->setRowStretch(9, 5);
-	gridLayout->addColSpacing(3, 5);
-	gridLayout->addRowSpacing(3, 10);
-	gridLayout->addRowSpacing(5, 10);
-}
-
-/** Init profiles section. */
-void COptionsDialog::initProfiles(){
-	QFrame* page = addPage(i18n("Sessions"),QString::null, DesktopIcon(CResMgr::settings::profiles::icon,32));
-	QGridLayout* gridLayout = new QGridLayout(page, 3,3,5,5);
-
-	gridLayout->addMultiCellWidget(
-		CToolClass::explanationLabel(page,
-			i18n("Manage sessions"),
-			i18n("Sessions define the appereance of the work area, \
-for example which windows are open and which texts should displayed in these windows. \
-New sessions only work after you've saved something into them.")
-		),
-		0,0,0,-1
-	);
-
-	m_settings.profiles.profiles = new QListBox(page);
-	gridLayout->addMultiCellWidget(m_settings.profiles.profiles, 1,1,0,-1);
-	gridLayout->setRowStretch(1,10);
-
-	m_settings.profiles.createProfile = new QPushButton(i18n("Create new session"), page);
-	connect(m_settings.profiles.createProfile, SIGNAL(clicked()), SLOT(addNewProfile()));
-  gridLayout->addWidget(m_settings.profiles.createProfile,2,0);
-
-	m_settings.profiles.deleteProfile = new QPushButton(i18n("Delete selected session"), page);
-	connect(m_settings.profiles.deleteProfile, SIGNAL(clicked()), SLOT(deleteProfile()));
-  gridLayout->addWidget(m_settings.profiles.deleteProfile,2,1);
-
-	m_settings.profiles.renameProfile = new QPushButton(i18n("Rename selected session"), page);
-	connect(m_settings.profiles.renameProfile, SIGNAL(clicked()), SLOT(renameProfile()));
-  gridLayout->addWidget(m_settings.profiles.renameProfile,2,2);
-
-  //fill the profile list box
-	QPtrList<CProfile> profiles = m_settings.profiles.mgr.profiles();
-	if (CProfile* p = profiles.first()) { //better than count
-		for (; p; p = profiles.next()) {
-			m_settings.profiles.profiles->insertItem(p->name());
-		}
-	}
-	else {
-		m_settings.profiles.profiles->setEnabled(false);
-	}
-}
-
-/** Init accel key section. */
-void COptionsDialog::initAccelerators(){
-  QVBox* page = addVBoxPage(i18n("Accelerators"),QString::null, DesktopIcon(CResMgr::settings::keys::icon,32));
-
-  KTabCtl* tabCtl = new KTabCtl(page);
-
-// ----- new tab: All display windows ------ //
-  QFrame* currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-  tabCtl->addTab(currentTab, i18n("Application-wide"));
-
-	CBTConfig::setupAccel( CBTConfig::application, m_settings.keys.application.accel  );
-//	CSwordPresenter::insertKeyboardActions( m_settings.keys.application.accel );
-	m_settings.keys.application.accel->readSettings();
-
- 	m_settings.keys.application.keyChooser = new KKeyChooser( m_settings.keys.application.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.application.keyChooser, TT_OD_KEYS_CHOOSER);
-//	QWhatsThis::add(m_settings.keys.application.keyChooser, WT_OD_KEYS_CHOOSER);
-
-// ----- new tab: All display windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("All display windows"));
-
-	m_settings.keys.general.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::readWindow, m_settings.keys.general.accel  );
-	CReadWindow::insertKeyboardActions( m_settings.keys.general.accel );
-	m_settings.keys.general.accel->readSettings();
-
- 	m_settings.keys.general.keyChooser = new KKeyChooser( m_settings.keys.general.accel, currentTab );
-//	QToolTip::add(m_settings.keys.general.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_GENERAL);
-//	QWhatsThis::add(m_settings.keys.general.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_GENERAL);
-
-// ----- new tab: Bible windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Bible windows"));
-
-	m_settings.keys.bible.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::bibleWindow, m_settings.keys.bible.accel  );
-	CBibleReadWindow::insertKeyboardActions( m_settings.keys.bible.accel );
-	m_settings.keys.bible.accel->readSettings();
-
- 	m_settings.keys.bible.keyChooser = new KKeyChooser( m_settings.keys.bible.accel, currentTab/*, false*/ );
-//	QToolTip::add(m_settings.keys.bible.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_BIBLE);
-//	QWhatsThis::add(m_settings.keys.bible.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_BIBLE);
-
-// ----- new tab: Commentary windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Commentary windows"));
-
-	m_settings.keys.commentary.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::commentaryWindow, m_settings.keys.commentary.accel  );
-	CCommentaryReadWindow::insertKeyboardActions( m_settings.keys.commentary.accel );
-//	m_settings.keys.commentary.accel->setConfigGroup("Lexicon shortcuts");
-	m_settings.keys.commentary.accel->readSettings();
-
- 	m_settings.keys.commentary.keyChooser = new KKeyChooser( m_settings.keys.commentary.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.commentary.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_COMMENTARY);
-//	QWhatsThis::add(m_settings.keys.commentary.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_COMMENTARY);
-
-// ----- new tab: Lexicon windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Lexicon windows"));
-
-	m_settings.keys.lexicon.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::lexiconWindow, m_settings.keys.lexicon.accel  );
-	CLexiconReadWindow::insertKeyboardActions( m_settings.keys.lexicon.accel );
-//	m_settings.keys.lexicon.accel->setConfigGroup("Lexicon shortcuts");
-	m_settings.keys.lexicon.accel->readSettings();
-
- 	m_settings.keys.lexicon.keyChooser = new KKeyChooser( m_settings.keys.lexicon.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.lexicon.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-//	QWhatsThis::add(m_settings.keys.lexicon.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-
-
-// ----- new tab: Book windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Book windows"));
-
-	m_settings.keys.book.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::bookWindow, m_settings.keys.book.accel  );
-	CBookReadWindow::insertKeyboardActions( m_settings.keys.book.accel );
-//	m_settings.keys.book.accel->setConfigGroup("Book shortcuts");
-	m_settings.keys.book.accel->readSettings();
-
-	m_settings.keys.book.keyChooser = new KKeyChooser( m_settings.keys.book.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.book.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-//	QWhatsThis::add(m_settings.keys.book.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-}
-
-/** Init Sword section. */
-void COptionsDialog::initSword(){
-	QVBox* page = addVBoxPage(i18n("Sword"),QString::null, DesktopIcon(CResMgr::settings::sword::icon,32));
-  KTabCtl* tabCtl = new KTabCtl(page);
-  QFrame* currentTab = new QFrame(tabCtl);
-  tabCtl->addTab(currentTab, i18n("General"));
-
-  QGridLayout* gridLayout = new QGridLayout(currentTab,7,2,5,5);
-	gridLayout->setResizeMode(QLayout::Minimum);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Use key cache for lexicons"),
-			i18n("BibleTime can create a key cache for lexicons. \
-This increases the speed of opening large lexicon modules significantly. \
-Note: These files consume some disk space (usually not much), and reside in \
-$KDEHOME/share/apps/bibletime/cache.")),
-		0,0,0,-1
-  );
-
-	m_settings.swords.lexiconCache = new QCheckBox(currentTab);
-	m_settings.swords.lexiconCache->setText(i18n("Use key cache for lexicons"));
-	QToolTip::add(m_settings.swords.lexiconCache, CResMgr::settings::sword::general::cacheKeys::tooltip);
-	QWhatsThis::add(m_settings.swords.lexiconCache, CResMgr::settings::sword::general::cacheKeys::whatsthis);
-
-	m_settings.swords.lexiconCache->setChecked( CBTConfig::get(CBTConfig::lexiconCache) );
- 	gridLayout->addMultiCellWidget(m_settings.swords.lexiconCache,1,1,0,-1);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Scrolling behaviour"),
-			i18n("The down arrow moves to the <i>next</i> verse by default. Uncheck this box \
-if you want it to move to the <i>previous</i> verse.")),
-		2,2,0,-1
-  );
-
- 	m_settings.swords.useDownArrow = new QCheckBox(currentTab);
- 	m_settings.swords.useDownArrow->setText(i18n("Use down arrow to scroll to next verse"));
- 	m_settings.swords.useDownArrow->setChecked(CBTConfig::get(CBTConfig::scroll));
- 	QToolTip::add(m_settings.swords.useDownArrow, CResMgr::settings::sword::general::scrolling::tooltip);
- 	QWhatsThis::add(m_settings.swords.useDownArrow, CResMgr::settings::sword::general::scrolling::whatsthis);
- 	gridLayout->addMultiCellWidget(m_settings.swords.useDownArrow,3,3,0,-1);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Specify a language for biblical booknames"),
-			i18n("Sword has a number of locales available which can be used to internationalize the \
-booknames of the bible. You can specify which locale to use. If you want to \
-create a new locale, see http://www.crosswire.org/sword/develop for details.")),
-		4,4,0,-1
-  );
-
- 	m_settings.swords.localeCombo = new QComboBox(currentTab);
- 	QLabel* label = new QLabel(m_settings.swords.localeCombo, i18n("Language for biblical booknames"), currentTab);
- 	QToolTip::add(m_settings.swords.localeCombo, CResMgr::settings::sword::general::language::tooltip);
- 	QWhatsThis::add(m_settings.swords.localeCombo, CResMgr::settings::sword::general::language::whatsthis);
- 	gridLayout->addWidget(label, 5,0);
- 	gridLayout->addWidget(m_settings.swords.localeCombo, 5,1);
-
- 	gridLayout->setRowStretch(6,5); //eat up remaining space :)
-
- 	m_settings.swords.localeCombo->insertItem( i18n("English") );
- 	const list<sword::SWBuf> locales = sword::LocaleMgr::systemLocaleMgr.getAvailableLocales();
- 	for (list<sword::SWBuf>::const_iterator it = locales.begin(); it != locales.end(); it++) {
- 		m_settings.swords.localeCombo->insertItem( i18n(sword::LocaleMgr::systemLocaleMgr.getLocale((*it).c_str())->getDescription()) );
- 	}
-
- 	int current_item = -1;
- 	for(int test_item = 0; test_item < m_settings.swords.localeCombo->count(); test_item++) {
- 		sword::SWLocale* locale = sword::LocaleMgr::systemLocaleMgr.getLocale(CBTConfig::get(CBTConfig::language).local8Bit());
- 		if (locale && (m_settings.swords.localeCombo->text(test_item) == i18n(locale->getDescription())) )
- 			current_item = test_item;
- 	}
- 	if (current_item!=-1)
- 		m_settings.swords.localeCombo->setCurrentItem(current_item);
-
-
-// ---------- new tab: Default modules -------- //
-  currentTab = new QFrame(tabCtl);
-  tabCtl->addTab(currentTab, i18n("Default modules"));
-	gridLayout = new QGridLayout(currentTab,10,2, 5,5); //the last row is for stretching available space
-	gridLayout->setResizeMode(QLayout::Minimum);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Default modules"),
-			i18n("Default modules are used when no module is specified, \
-for example when a hyperlink into a Bible or Lexicon was clicked .")),
-  	0,0,0,-1 /*fill the horizontal space*/
-  );
-
- 	m_settings.swords.standardBible = new QComboBox(currentTab);
-  label = new QLabel(m_settings.swords.standardBible, i18n("Default Bible"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardBible, CResMgr::settings::sword::modules::bible::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardBible, CResMgr::settings::sword::modules::bible::whatsthis);
- 	gridLayout->addWidget(label,1,0);
- 	gridLayout->addWidget(m_settings.swords.standardBible,1,1);
-
- 	m_settings.swords.standardCommentary = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardCommentary, i18n("Default Commentary"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardCommentary, CResMgr::settings::sword::modules::commentary::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardCommentary, CResMgr::settings::sword::modules::commentary::whatsthis);
- 	gridLayout->addWidget(label,2,0);
- 	gridLayout->addWidget(m_settings.swords.standardCommentary,2,1);
-
-
- 	m_settings.swords.standardLexicon = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardLexicon, i18n("Default Lexicon"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardLexicon, CResMgr::settings::sword::modules::lexicon::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardLexicon, CResMgr::settings::sword::modules::lexicon::whatsthis);
- 	gridLayout->addWidget(label,3,0);
- 	gridLayout->addWidget(m_settings.swords.standardLexicon,3,1);
-
- 	m_settings.swords.standardDailyDevotional = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardDailyDevotional, i18n("Default Daily Devotional"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardDailyDevotional, CResMgr::settings::sword::modules::dailyDevotional::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardDailyDevotional, CResMgr::settings::sword::modules::dailyDevotional::whatsthis);
- 	gridLayout->addWidget(label,4,0);
- 	gridLayout->addWidget(m_settings.swords.standardDailyDevotional,4,1);
-
- 	m_settings.swords.standardHebrewStrong = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardHebrewStrong, i18n("Default Hebrew Strong's Lexicon"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardHebrewStrong, CResMgr::settings::sword::modules::hebrewStrongs::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardHebrewStrong, CResMgr::settings::sword::modules::hebrewStrongs::whatsthis);
- 	gridLayout->addWidget(label,5,0);
- 	gridLayout->addWidget(m_settings.swords.standardHebrewStrong,5,1);
-
- 	m_settings.swords.standardGreekStrong = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardGreekStrong, i18n("Default Greek Strong's Lexicon"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardGreekStrong, CResMgr::settings::sword::modules::greekStrongs::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardGreekStrong, CResMgr::settings::sword::modules::greekStrongs::whatsthis);
- 	gridLayout->addWidget(label,6,0);
- 	gridLayout->addWidget(m_settings.swords.standardGreekStrong,6,1);
-		
- 	m_settings.swords.standardHebrewMorph = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardHebrewMorph, i18n("Default Hebrew Morphological Lexicon"), currentTab);
- 	QToolTip::add(m_settings.swords.standardHebrewMorph, CResMgr::settings::sword::modules::hebrewMorph::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardHebrewMorph, CResMgr::settings::sword::modules::hebrewMorph::whatsthis);
- 	gridLayout->addWidget(label,7,0);
- 	gridLayout->addWidget(m_settings.swords.standardHebrewMorph,7,1);
-
- 	m_settings.swords.standardGreekMorph = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardGreekMorph, i18n("Default Greek Morphological Lexicon"), currentTab);
-  label->setAutoResize(true); 	 	
- 	QToolTip::add(m_settings.swords.standardGreekMorph, CResMgr::settings::sword::modules::greekMorph::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardGreekMorph, CResMgr::settings::sword::modules::greekMorph::whatsthis);
- 	gridLayout->addWidget(label,8,0);
- 	gridLayout->addWidget(m_settings.swords.standardGreekMorph,8,1);
-
- 	gridLayout->setRowStretch(9,5);							
-		
- 	//fill the comboboxes with the right modules
- 	ListCSwordModuleInfo& modules = backend()->moduleList();
-	QString modDescript;
-  for ( modules.first(); modules.current(); modules.next() ) {
-		modDescript = modules.current()->config(CSwordModuleInfo::Description);
- 		switch (modules.current()->type()) {
- 			case CSwordModuleInfo::Bible:
- 				m_settings.swords.standardBible->insertItem(modDescript);
- 				break;
- 			case CSwordModuleInfo::Commentary:
- 				m_settings.swords.standardCommentary->insertItem(modDescript);				
- 				break;
- 			case CSwordModuleInfo::Lexicon:
- 			{
-        bool inserted = false;
- 				if (modules.current()->has(CSwordModuleInfo::HebrewDef)) {
-					m_settings.swords.standardHebrewStrong->insertItem(modDescript);
-          inserted = true;          
- 				}
- 				if (modules.current()->has(CSwordModuleInfo::GreekDef)) {
-					m_settings.swords.standardGreekStrong->insertItem(modDescript);
-          inserted = true;
- 				}
- 				if (modules.current()->has(CSwordModuleInfo::HebrewParse)) {
-					m_settings.swords.standardHebrewMorph->insertItem(modDescript);				
-          inserted = true;
-        }
- 				if (modules.current()->has(CSwordModuleInfo::GreekParse)) {       
-					m_settings.swords.standardGreekMorph->insertItem(modDescript);
-          inserted = true;
- 				}
- 				if (modules.current()->category() == CSwordModuleInfo::DailyDevotional) {
-					m_settings.swords.standardDailyDevotional->insertItem(modDescript);
-          inserted = true;
- 				}
-				if (!inserted)//daily dvotionals, striong lexicons etc. are not very useful for word lookups
-          m_settings.swords.standardLexicon->insertItem(modDescript);
- 				break;
- 			} 				
- 			default://unknown type
- 				break;
- 		}
-  }
-
-//using two lists and one loop is better than six loops with almost the same code :)
- 	QPtrList<QComboBox> comboList;
- 	comboList.setAutoDelete(false);//don't delete the combos accidentally
- 	comboList.append(m_settings.swords.standardBible);
- 	comboList.append(m_settings.swords.standardCommentary);
- 	comboList.append(m_settings.swords.standardLexicon);
- 	comboList.append(m_settings.swords.standardDailyDevotional);  
- 	comboList.append(m_settings.swords.standardHebrewStrong);
- 	comboList.append(m_settings.swords.standardGreekStrong);
- 	comboList.append(m_settings.swords.standardHebrewMorph);
- 	comboList.append(m_settings.swords.standardGreekMorph);
-
- 	QStringList moduleList;
- 	moduleList
- 		<< CBTConfig::get(CBTConfig::standardBible)
-	 	<< CBTConfig::get(CBTConfig::standardCommentary)
-	 	<< CBTConfig::get(CBTConfig::standardLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardDailyDevotional)    
-	 	<< CBTConfig::get(CBTConfig::standardHebrewStrongsLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardGreekStrongsLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardHebrewMorphLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardGreekMorphLexicon);
-
- 	QString module = QString::null;
- 	int item = 0;
-	int count = 0; 	
- 	for (QComboBox* combo = comboList.first(); combo; combo = comboList.next() ) {		
-		module = moduleList[comboList.at()];
-		count = combo->count();
-	  combo->setMaximumWidth(300);
- 		for (item = 0; item < count; item++) {
-	 		if (combo->text(item) == module ) {
-	 		  combo->setCurrentItem(item);
-	 		  break;
-	 		}
-	 	}
-	}
-
-	
-
-// ---------- new tab: filters -------- //
-  currentTab = new QFrame(tabCtl);
-  tabCtl->addTab(currentTab, i18n("Filter settings"));
-  QVBoxLayout* layout = new QVBoxLayout(currentTab,5);
-
-  layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Filter settings"),
-		i18n("Filters control the appereance of the text in the display windows. \
-Here you can specify default settings for all filters. \
-You can change the filter settings in each display window, of course.")) );
-
-  layout->addSpacing(5);
-  		
- 	m_settings.swords.lineBreaks = new QCheckBox(currentTab);
- 	m_settings.swords.lineBreaks->setText(i18n("Insert line break after each verse"));
- 	m_settings.swords.lineBreaks->setChecked(CBTConfig::get(CBTConfig::lineBreaks));
-  QToolTip::add(m_settings.swords.lineBreaks, CResMgr::settings::sword::filters::lineBreaks::tooltip);
-  QWhatsThis::add(m_settings.swords.lineBreaks, CResMgr::settings::sword::filters::lineBreaks::whatsthis);  
- 	layout->addWidget(m_settings.swords.lineBreaks);
-
- 	m_settings.swords.verseNumbers = new QCheckBox(currentTab);
- 	m_settings.swords.verseNumbers->setText(i18n("Show verse numbers"));
- 	m_settings.swords.verseNumbers->setChecked(CBTConfig::get(CBTConfig::verseNumbers));		
-  QToolTip::add(m_settings.swords.verseNumbers, CResMgr::settings::sword::filters::verseNumbers::tooltip);
-  QWhatsThis::add(m_settings.swords.verseNumbers, CResMgr::settings::sword::filters::verseNumbers::whatsthis);
- 	layout->addWidget(m_settings.swords.verseNumbers);
-
- 	m_settings.swords.footnotes = new QCheckBox(currentTab);
- 	m_settings.swords.footnotes->setText(i18n("Show footnotes"));
- 	m_settings.swords.footnotes->setChecked(CBTConfig::get(CBTConfig::footnotes));		
-  QToolTip::add(m_settings.swords.footnotes, CResMgr::settings::sword::filters::footnotes::tooltip);
-  QWhatsThis::add(m_settings.swords.footnotes, CResMgr::settings::sword::filters::footnotes::whatsthis);
- 	layout->addWidget(m_settings.swords.footnotes);
-
- 	m_settings.swords.headings = new QCheckBox(currentTab);
- 	m_settings.swords.headings->setText(i18n("Show section headings"));
- 	m_settings.swords.headings->setChecked(CBTConfig::get(CBTConfig::headings));
-  QToolTip::add(m_settings.swords.headings, CResMgr::settings::sword::filters::headings::tooltip);
-  QWhatsThis::add(m_settings.swords.headings, CResMgr::settings::sword::filters::headings::whatsthis);
- 	layout->addWidget(m_settings.swords.headings);
-
- 	m_settings.swords.strongNumbers = new QCheckBox(currentTab);
- 	m_settings.swords.strongNumbers->setText(i18n("Show Strong's numbers"));
- 	m_settings.swords.strongNumbers->setChecked(CBTConfig::get(CBTConfig::strongNumbers));
-  QToolTip::add(m_settings.swords.strongNumbers, CResMgr::settings::sword::filters::strongsNumbers::tooltip);
-  QWhatsThis::add(m_settings.swords.strongNumbers, CResMgr::settings::sword::filters::strongsNumbers::whatsthis);  
- 	layout->addWidget(m_settings.swords.strongNumbers);
-
- 	m_settings.swords.scriptureReferences = new QCheckBox(currentTab);
- 	m_settings.swords.scriptureReferences->setText(i18n("Show scripture cross-references"));
- 	m_settings.swords.scriptureReferences->setChecked(CBTConfig::get(CBTConfig::hebrewCantillation));
-//Enable this in 1.4, because we're in message freeze for 1.3
-//  QToolTip::add(m_settings.swords.scriptureReferences, CResMgr::settings::sword::filters::crossReferences::tooltip);
-//  QWhatsThis::add(m_settings.swords.scriptureReferences, CResMgr::settings::sword::filters::crossReferences::whatsthis);
- 	layout->addWidget(m_settings.swords.scriptureReferences);
-
-  m_settings.swords.morphTags = new QCheckBox(currentTab);
- 	m_settings.swords.morphTags->setText(i18n("Show morphologic tags"));
- 	m_settings.swords.morphTags->setChecked(CBTConfig::get(CBTConfig::morphTags));
-  QToolTip::add(m_settings.swords.morphTags, CResMgr::settings::sword::filters::morphTags::tooltip);
-  QWhatsThis::add(m_settings.swords.morphTags, CResMgr::settings::sword::filters::morphTags::whatsthis);
- 	layout->addWidget(m_settings.swords.morphTags);
-
- 	m_settings.swords.lemmas = new QCheckBox(currentTab);
- 	m_settings.swords.lemmas->setText(i18n("Show lemmas"));
- 	m_settings.swords.lemmas->setChecked(CBTConfig::get(CBTConfig::lemmas));
-  QToolTip::add(m_settings.swords.lemmas, CResMgr::settings::sword::filters::lemmas::tooltip);
-  QWhatsThis::add(m_settings.swords.lemmas, CResMgr::settings::sword::filters::lemmas::whatsthis);
- 	layout->addWidget(m_settings.swords.lemmas);
-		
-  m_settings.swords.greekAccents = new QCheckBox(currentTab);
- 	m_settings.swords.greekAccents->setText(i18n("Show Greek accents"));
- 	m_settings.swords.greekAccents->setChecked(CBTConfig::get(CBTConfig::greekAccents));
-  QToolTip::add(m_settings.swords.greekAccents, CResMgr::settings::sword::filters::greekAccents::tooltip);
-  QWhatsThis::add(m_settings.swords.greekAccents, CResMgr::settings::sword::filters::greekAccents::whatsthis);
- 	layout->addWidget(m_settings.swords.greekAccents);
-
- 	m_settings.swords.hebrewPoints = new QCheckBox(currentTab);
- 	m_settings.swords.hebrewPoints->setText(i18n("Show Hebrew vowel points"));
- 	m_settings.swords.hebrewPoints->setChecked(CBTConfig::get(CBTConfig::hebrewPoints));
-  QToolTip::add(m_settings.swords.hebrewPoints, CResMgr::settings::sword::filters::hebrewVowelPoints::tooltip);
-  QWhatsThis::add(m_settings.swords.hebrewPoints, CResMgr::settings::sword::filters::hebrewVowelPoints::whatsthis);  
- 	layout->addWidget(m_settings.swords.hebrewPoints);
-
- 	m_settings.swords.hebrewCantillation = new QCheckBox(currentTab);
- 	m_settings.swords.hebrewCantillation->setText(i18n("Show Hebrew cantillation marks"));
- 	m_settings.swords.hebrewCantillation->setChecked(CBTConfig::get(CBTConfig::hebrewCantillation));		
-  QToolTip::add(m_settings.swords.hebrewCantillation, CResMgr::settings::sword::filters::hebrewCantillation::tooltip);
-  QWhatsThis::add(m_settings.swords.hebrewCantillation, CResMgr::settings::sword::filters::hebrewCantillation::whatsthis);
- 	layout->addWidget(m_settings.swords.hebrewCantillation);
-
- 	m_settings.swords.textualVariants = new QCheckBox(currentTab);
- 	m_settings.swords.textualVariants->setText(i18n("Use textual variants"));
- 	m_settings.swords.textualVariants->setChecked(CBTConfig::get(CBTConfig::textualVariants));		
-  QToolTip::add(m_settings.swords.textualVariants, CResMgr::settings::sword::filters::textualVariants::tooltip);
-  QWhatsThis::add(m_settings.swords.textualVariants, CResMgr::settings::sword::filters::textualVariants::whatsthis);
- 	layout->addWidget(m_settings.swords.textualVariants);
- 		
-	layout->addStretch(4);	
-}
-
-void COptionsDialog::saveAccelerators(){
-//#warning check
-// 	m_settings.keys.application.accel->writeSettings();
-// 	m_settings.keys.application.keyChooser->save();
- 	m_settings.keys.application.keyChooser->commitChanges();
-	m_settings.keys.application.accel->writeSettings(); 	
-
-// 	m_settings.keys.general.accel->writeSettings();
-//		
-// 	m_settings.keys.bible.accel->writeSettings();		
-// 	m_settings.keys.bible.keyChooser->save();
- 	m_settings.keys.bible.keyChooser->commitChanges();
-	m_settings.keys.bible.accel->writeSettings();
-
-//		
-// 	m_settings.keys.commentary.accel->writeSettings();
-// 	m_settings.keys.commentary.keyChooser->save();
- 	m_settings.keys.commentary.keyChooser->commitChanges();
-	m_settings.keys.commentary.accel->writeSettings(); 	
-
-		
-// 	m_settings.keys.lexicon.accel->writeSettings();
-// 	m_settings.keys.lexicon.keyChooser->save();
- 	m_settings.keys.lexicon.keyChooser->commitChanges();
-	m_settings.keys.lexicon.accel->writeSettings(); 	
-
-// 	m_settings.keys.book.accel->writeSettings(); 	 	
-// 	m_settings.keys.book.keyChooser->save();
- 	m_settings.keys.book.keyChooser->commitChanges();
-	m_settings.keys.book.accel->writeSettings();
-}
-
-/** No descriptions */
-void COptionsDialog::saveColors(){
- 	CBTConfig::set(CBTConfig::textColor, m_settings.colors.text->color().name());	
- 	CBTConfig::set(CBTConfig::backgroundColor, m_settings.colors.background->color().name());	
- 	CBTConfig::set(CBTConfig::highlightedVerseColor, m_settings.colors.highlightedVerse->color().name());		
- 	CBTConfig::set(CBTConfig::swordRefColor, m_settings.colors.swordrefs->color().name());		
- 	CBTConfig::set(CBTConfig::footnotesColor, m_settings.colors.footnotes->color().name());		
- 	CBTConfig::set(CBTConfig::strongsColor, m_settings.colors.strongs->color().name());		
- 	CBTConfig::set(CBTConfig::morphsColor, m_settings.colors.morph->color().name());		
- 	CBTConfig::set(CBTConfig::jesuswordsColor, m_settings.colors.jesuswords->color().name());		
-}
-
-/** No descriptions */
-void COptionsDialog::saveFonts(){
-	for(QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) {
-    CLanguageMgr::Language lang = languageMgr()->languageForTranslatedName(it.key());
-    if (!lang.isValid()) { //we probably use a language, for which we have only the abbrev
-      lang = CLanguageMgr::Language(it.key(), it.key(), it.key());
-    }
-    CBTConfig::set(lang, it.data());
- 	}
-}
-
-/** No descriptions */
-void COptionsDialog::saveProfiles(){
-}
-
-/** No descriptions */
-void COptionsDialog::saveStartup(){
-	CBTConfig::set( CBTConfig::logo, m_settings.startup.showLogo->isChecked() );	
- 	CBTConfig::set( CBTConfig::tips, m_settings.startup.showTips->isChecked() );				
- 	CBTConfig::set( CBTConfig::restoreWorkspace, m_settings.startup.restoreWorkspace->isChecked() );	
-}
-
-/** No descriptions */
-void COptionsDialog::saveSword(){
-  bool old_lexiconCache = CBTConfig::get(CBTConfig::lexiconCache);
-  bool new_lexiconCache = m_settings.swords.lexiconCache->isChecked();
-
-  CBTConfig::set( CBTConfig::lexiconCache, new_lexiconCache );
-
-  if (old_lexiconCache && !new_lexiconCache){  //delete cache files
-  	QString dirname = KGlobal::dirs()->saveLocation("data", "bibletime/cache/");
-  	QDir dir = QDir(dirname);
-   	QStringList files = QStringList( dir.entryList() );
-   	for (QStringList::Iterator it = files.begin(); it != files.end(); ++it)
-   		dir.remove((*it),false);
-  }
-
-  CBTConfig::set(CBTConfig::standardBible, m_settings.swords.standardBible->currentText());
-  CBTConfig::set(CBTConfig::standardCommentary, m_settings.swords.standardCommentary->currentText());
-  CBTConfig::set(CBTConfig::standardLexicon, m_settings.swords.standardLexicon->currentText());
-  CBTConfig::set(CBTConfig::standardDailyDevotional, m_settings.swords.standardDailyDevotional->currentText());
-  CBTConfig::set(CBTConfig::standardHebrewStrongsLexicon, m_settings.swords.standardHebrewStrong->currentText());
-  CBTConfig::set(CBTConfig::standardGreekStrongsLexicon, m_settings.swords.standardGreekStrong->currentText() );
-  CBTConfig::set(CBTConfig::standardHebrewMorphLexicon, m_settings.swords.standardHebrewMorph->currentText());
-  CBTConfig::set(CBTConfig::standardGreekMorphLexicon, m_settings.swords.standardGreekMorph->currentText() );
-
- 	const QString currentText = m_settings.swords.localeCombo->currentText();
- 	list <sword::SWBuf> locales = sword::LocaleMgr::systemLocaleMgr.getAvailableLocales();
- 	QString localeName = QString::null;
- 	for (list <sword::SWBuf>::iterator it = locales.begin(); it != locales.end(); it++) {
- 		if ( i18n(sword::LocaleMgr::systemLocaleMgr.getLocale((*it).c_str())->getDescription()) == currentText ) {
- 			localeName = (*it).c_str();	//we found the abbrevation for the current language
- 			break;
- 		}
- 	}
- 	if (!localeName.isEmpty()) {
- 		CBTConfig::set(CBTConfig::language, localeName);
-	}
- 	else {
- 		CBTConfig::set(CBTConfig::language, currentText);
-	}
-
- 	CBTConfig::set(CBTConfig::scroll, m_settings.swords.useDownArrow->isChecked());
- 	CBTConfig::set(CBTConfig::lineBreaks, m_settings.swords.lineBreaks->isChecked());
- 	CBTConfig::set(CBTConfig::verseNumbers, m_settings.swords.verseNumbers->isChecked());
- 	CBTConfig::set(CBTConfig::footnotes, m_settings.swords.footnotes->isChecked());
- 	CBTConfig::set(CBTConfig::strongNumbers, m_settings.swords.strongNumbers->isChecked());
- 	CBTConfig::set(CBTConfig::headings, m_settings.swords.headings->isChecked());
- 	CBTConfig::set(CBTConfig::scriptureReferences, m_settings.swords.scriptureReferences->isChecked());
- 	CBTConfig::set(CBTConfig::morphTags, m_settings.swords.morphTags->isChecked());
- 	CBTConfig::set(CBTConfig::lemmas, m_settings.swords.lemmas->isChecked());
- 	CBTConfig::set(CBTConfig::hebrewPoints, m_settings.swords.hebrewPoints->isChecked());
- 	CBTConfig::set(CBTConfig::hebrewCantillation, m_settings.swords.hebrewCantillation->isChecked());
- 	CBTConfig::set(CBTConfig::greekAccents, m_settings.swords.greekAccents->isChecked());
- 	CBTConfig::set(CBTConfig::textualVariants, m_settings.swords.textualVariants->isChecked());
-}
-
-/** This slot is called when the "Use own font for language" bo was clicked. */
-void COptionsDialog::useOwnFontClicked( bool isOn){
-  m_settings.fonts.fontChooser->setEnabled(isOn);
-  m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ].first = isOn;
-
-  if (isOn) { //show font icon
-    m_settings.fonts.usage->changeItem(SmallIcon("fonts"), m_settings.fonts.usage->currentText(), m_settings.fonts.usage->currentItem() );
-  }
-  else {    //don't show
-    m_settings.fonts.usage->changeItem(m_settings.fonts.usage->currentText(), m_settings.fonts.usage->currentItem() );
-  }
-}
diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h
deleted file mode 100644
index ca52da8..0000000
--- a/bibletime/frontend/coptionsdialog.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.h  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef COPTIONSDIALOG_H
-#define COPTIONSDIALOG_H
-
-#include "cprofilemgr.h"
-#include "cbtconfig.h"
-#include "util/cpointers.h"
-
-//QT includes
-#include <qwidget.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qcombobox.h>
-#include <qdict.h>
-#include <qmap.h>
-
-//KDE includes
-#include <kdialogbase.h>
-#include <kfontdialog.h>
-#include <kaccel.h>
-#include <kcolorbutton.h>
-#include <kapp.h>
-
-class QHBox;
-class QCheckBox;
-class QRadioButton;
-class KListBox;
-class KKeyChooser;
-class KTabCtl;
-
-/**
-	* The optionsdialog of BibleTime
-  * @author The BibleTime Team
-  */
-class COptionsDialog : public KDialogBase, public CPointers  {
-   Q_OBJECT
-
-public:
-	COptionsDialog(QWidget *parent=0, const char *name=0, KAccel* key_accel=0);
-
-  enum Parts {
-		Startup,
-		Font,		
-		Color,		
-		ViewProfiles,
-		Sword,
-		accelerators
-  };
-
-  /** Opens the page which contaisn the given part ID. */
-  const bool showPart( COptionsDialog::Parts ID );
-
-private:
-  struct settings {
-	 	struct StartupSettings {
-	 		QCheckBox* showTips;
-	 		QCheckBox* showLogo;
-	 		QCheckBox* restoreWorkspace;
-	 	} startup;
-		
-		struct SwordSettings {
-			QCheckBox* lexiconCache;
-			QComboBox* standardBible;
-			QComboBox* standardCommentary;
-			QComboBox* standardLexicon;
-			QComboBox* standardDailyDevotional;
-			QComboBox* standardHebrewStrong;
-			QComboBox* standardGreekStrong;
-			QComboBox* standardHebrewMorph;
-			QComboBox* standardGreekMorph;
-			QComboBox* localeCombo;
-			QCheckBox* useDownArrow;
-			QCheckBox* lineBreaks;
-			QCheckBox* verseNumbers;
-			QCheckBox* footnotes;
-  		QCheckBox* strongNumbers;
-  		QCheckBox* headings;
-  		QCheckBox* morphTags;
-			QCheckBox* lemmas;
-			QCheckBox* hebrewPoints;
-			QCheckBox* hebrewCantillation;
-			QCheckBox* greekAccents;
-			QCheckBox* textualVariants;
-      QCheckBox* scriptureReferences;
-		} swords; // not: sword -> namespace error
-		
-		struct KeySettings {
-			struct WindowType {
-				KKeyChooser* keyChooser;
-				KAccel* accel;
-			};
-			WindowType application;
-			WindowType general;
-			WindowType bible;
-			WindowType commentary;
-			WindowType lexicon;
-			WindowType book;
-		} keys;
-		
-		struct ColorSettings {
-			KColorButton* text;
-			KColorButton* background;
-//			KColorButton* background2;
-			KColorButton* highlightedVerse;
-			KColorButton* swordrefs;
-			KColorButton* footnotes;
-			KColorButton* strongs;
-			KColorButton* morph;
-			KColorButton* jesuswords;
-		} colors;
-		
-    struct FontSettings {		
-			KFontChooser* fontChooser;
-			QComboBox* usage;
-      QCheckBox* useOwnFontBox;
-      //the pair os to check whether the standard font (bool == false) or whether an own font should be used (true)
-      QMap<QString,CBTConfig::FontSettingsPair> fontMap;
-		} fonts;
-		
-		struct ProfileSettings {
-			QListBox* profiles;
-			QPushButton* createProfile;			
-			QPushButton* deleteProfile;
-			QPushButton* renameProfile;
-			CProfileMgr mgr;
-		} profiles;
-  } m_settings;
-
-protected slots: // Protected slots
-  /**
-  * Adds a new view profile to the list.
-  */
-  void addNewProfile();
-  /**
-  * Called when a new font in the fonts page was selected.
-  */
-  void newDisplayWindowFontSelected(const QFont &);
-  /**
-  * Called when the combobox contents is changed
-  */
-  void newDisplayWindowFontAreaSelected(const QString&);
-	/**
-	* Called if the OK button was clicked
-	*/
-  void slotOk();
-  /**
- 	* Called if the Apply button was clicked
- 	* commented out for the time being.  ck
- 	*/
-	void slotApply();
-  /**
-  * Renames the currently selected profile.
-  */
-  void renameProfile();
-  /**
-  * Delete the selected profile.
-  */
-  void deleteProfile();
-  /**
-  * This slot is called when the "Use own font for language" bo was clicked.
-  */
-  void useOwnFontClicked(bool);
-
-protected: // Protected methods
-  /**
-  * Init Sword section.
-  */
-  void initSword();
-  /**
-  * Init accel key section.
-  */
-  void initAccelerators();
-  /**
-  * Init fonts section.
-  */
-  void initFonts();
-  /**
-  * Init profiles section.
-  */
-  void initProfiles();
-  /**
-  * Init color section.
-  */
-  void initColors();
-  /**
-  * Initializes the startup section of the OD.
-  */
-  void initStartup();
-  void saveAccelerators();
-	void saveColors();
-	void saveFonts();
- 	void saveProfiles();
- 	void saveStartup();
- 	void saveSword();
-
-signals: // Signals
-  void signalSettingsChanged();
-};
-
-#endif
diff --git a/bibletime/frontend/cprofile.cpp b/bibletime/frontend/cprofile.cpp
deleted file mode 100644
index 54eb79c..0000000
--- a/bibletime/frontend/cprofile.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/***************************************************************************
-                          cprofile.cpp  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprofile.h"
-
-//Qt includes
-#include <qdom.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <kstandarddirs.h>
-#include <klocale.h>
-
-#define CURRENT_SYNTAX_VERSION 2
-
-CProfile::CProfile( const QString& file, const QString& name ):
-	m_name(name.isEmpty() ? i18n("unknown") : name),
-	m_filename(file),
-	m_fullscreen(false),
-	m_geometry(10,20,640,480)
-{
-	
-	m_profileWindows.setAutoDelete(true);
-	if (!m_filename.isEmpty() && name.isEmpty()) {
-		loadBasics();
-	}
-	else if (m_filename.isEmpty() && !name.isEmpty()) {
-		m_filename = name;
-		m_filename.replace(QRegExp("\\s=#."),"_");
-		KStandardDirs stdDirs;
-		m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml";
-		init(m_filename);
-	}
-	else {
-		qWarning("CProfile: empty file name!");
-  }
-}
-
-CProfile::~CProfile(){
-	m_profileWindows.clear(); 	//delete all CProfileWindows objects (autodelete is enabled)
-}
-
-/** Loads the profile from the file given in the constructor. */
-QPtrList<CProfileWindow> CProfile::load(){
-	QFile file(m_filename);	
-	if (!file.exists())
-		return QPtrList<CProfileWindow>();
-	
-	QDomDocument doc;	
-	if (file.open(IO_ReadOnly)) {		
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		doc.setContent(t.read());
-		file.close();	
-	}
-	
-  QDomElement document = doc.documentElement();
-  if( document.tagName() != "BibleTimeProfile" && document.tagName() != "BibleTime" ) { //BibleTime was used in syntax version 1.0
-		qWarning("CProfile::load: Missing BibleTime doc");
-		return m_profileWindows;
-	}
-	if (document.hasAttribute("name")) {
-		m_name = document.attribute("name");	
-	}
-
-	
-	//load settings of the main window
-	{
-		// see if there's a section with the name MAINWINDOW
-		QDomElement elem = document.firstChild().toElement();		
-		QDomElement mainWindow;
-		while (!elem.isNull()) {
-			if (elem.tagName() == "MAINWINDOW") {
-				mainWindow = elem;
-				break; //found the element
-			}
-			elem = elem.nextSibling().toElement();				
-		}		
-		if (!mainWindow.isNull()) { //was found
-			setFullscreen( (bool)mainWindow.attribute("fullscreen").toInt());
-			QDomElement object = mainWindow.namedItem("GEOMETRY").toElement();
-			QRect rect;
-      if(!object.isNull()) {
-				if (object.hasAttribute("x")) {
-					rect.setX(object.attribute("x").toInt());
-				}
-				if (object.hasAttribute("y")) {
-					rect.setY(object.attribute("y").toInt());
-				}
-				if (object.hasAttribute("width")) {
-					rect.setWidth(object.attribute("width").toInt());
-				}
-				if (object.hasAttribute("height")) {
-					rect.setHeight(object.attribute("height").toInt());
-				}
-			}
-			setGeometry(rect);			
-		}
-	}
-		
-	m_profileWindows.clear();
-	QDomElement elem = document.firstChild().toElement();
-	while (!elem.isNull()) {
-		CProfileWindow* p = 0;		
-		if (elem.tagName() == "BIBLE") {
-			p = new CProfileWindow(CSwordModuleInfo::Bible);
-		}
-		else if (elem.tagName() == "COMMENTARY") {
-			p = new CProfileWindow(CSwordModuleInfo::Commentary);
-		}
-		else if (elem.tagName() == "LEXICON") {
-			p = new CProfileWindow(CSwordModuleInfo::Lexicon);
-		}			
-		else if (elem.tagName() == "BOOK") {
-			p = new CProfileWindow(CSwordModuleInfo::GenericBook);
-		}			
-		
-		if (p) {
-			m_profileWindows.append(p);
-			
-			if (elem.hasAttribute("windowSettings")) {
-				p->setWindowSettings( elem.attribute("windowSettings").toInt() );
-			}
-			if (elem.hasAttribute("writeWindowType")) {
-				p->setWriteWindowType( elem.attribute("writeWindowType").toInt() );
-			}
-			if (elem.hasAttribute("hasFocus")) {
-				p->setFocus( static_cast<bool>(elem.attribute("hasFocus").toInt()) );
-			}
-			
-			QRect rect;
-						
-			QDomElement object = elem.namedItem("GEOMETRY").toElement();
-      if(!object.isNull()) {
-				if (object.hasAttribute("x")) {
-					rect.setX(object.attribute("x").toInt());
-				}
-				if (object.hasAttribute("y")) {
-					rect.setY(object.attribute("y").toInt());
-				}
-				if (object.hasAttribute("width")) {
-					rect.setWidth(object.attribute("width").toInt());
-				}
-				if (object.hasAttribute("height")) {
-					rect.setHeight(object.attribute("height").toInt());
-				}
-				if (object.hasAttribute("isMaximized")) {
-					p->setMaximized( static_cast<bool>(object.attribute("isMaximized").toInt()) );
-				}				
-			}
-			p->setGeometry(rect);
-			
-			object = elem.namedItem("MODULES").toElement();
-      if(!object.isNull()) {				
-				if (object.hasAttribute("list")) {
-					const QString sep = object.hasAttribute("separator") ? object.attribute("separator") : "|";
-					QStringList modules = QStringList::split(sep, object.attribute("list"));
-					p->setModules(modules);
-				}
-      }
-
-			object = elem.namedItem("KEY").toElement();
-      if(!object.isNull()) {
-      	if (object.hasAttribute("name"))
-					p->setKey(object.attribute("name"));
-      }				
-				
-			object = elem.namedItem("SCROLLBARS").toElement();
-      if(!object.isNull()) {
-      	int horizontal = 0, vertical = 0;
-      	if (object.hasAttribute("horizontal"))
-      		horizontal = object.attribute("horizontal").toInt();
-      	if (object.hasAttribute("vertical"))
-      		vertical = object.attribute("vertical").toInt();
-
-				p->setScrollbarPositions(horizontal, vertical);      	
-      }				
-		}				
-		elem = elem.nextSibling().toElement();	
-	}
-	return m_profileWindows;
-}
-
-/** Saves the profile to the file given in the constructor. */
-const bool CProfile::save(QPtrList<CProfileWindow> windows){
-	/** Save the settings using a XML file
-	*	Save the CProfileWindow objects using a XML file which name is in m_filename
-	*/
-	bool ret = false;
-  QDomDocument doc("DOC");
-  doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-  QDomElement content = doc.createElement("BibleTimeProfile");
-  content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-  content.setAttribute("name", m_name);
-  doc.appendChild(content);
-
-  //save mainwindow settings
-	{
-	 	QDomElement mainWindow = doc.createElement("MAINWINDOW");
-  	mainWindow.setAttribute("fullscreen", fullscreen());
-  	
-  	QDomElement geometry = doc.createElement("GEOMETRY");
-  	mainWindow.appendChild(geometry);
-  	const QRect r = this->geometry();
-  	geometry.setAttribute("x",r.x());
-  	geometry.setAttribute("y",r.y());		
-  	geometry.setAttribute("width",r.width());		
-  	geometry.setAttribute("height",r.height());		
-
-		content.appendChild(mainWindow);
-	}
-
-	for (CProfileWindow* p = windows.first(); p; p = windows.next()) {
-		QDomElement window;
-		switch (p->type()) {
-			case CSwordModuleInfo::Bible:
-				window = doc.createElement("BIBLE");	
-				break;
-			case CSwordModuleInfo::Commentary:
-				window = doc.createElement("COMMENTARY");	
-				break;
-			case CSwordModuleInfo::Lexicon:
-				window = doc.createElement("LEXICON");	
-				break;
-			case CSwordModuleInfo::GenericBook:
-				window = doc.createElement("BOOK");	
-				break;
-			default:
-				break;
-		}
-		if (window.isNull())
-			break;
-		window.setAttribute("windowSettings", p->windowSettings());
-		window.setAttribute("writeWindowType", p->writeWindowType());    
-		window.setAttribute("hasFocus", p->hasFocus());
-		
-		//save geomtery
-		const QRect r = p->geometry();
-		QDomElement geometry = doc.createElement("GEOMETRY");
-		geometry.setAttribute("x",r.x());
-		geometry.setAttribute("y",r.y());		
-		geometry.setAttribute("width",r.width());		
-		geometry.setAttribute("height",r.height());		
-		geometry.setAttribute("isMaximized",static_cast<int>(p->maximized()));
-		window.appendChild( geometry );
-
-		QDomElement modules = doc.createElement("MODULES");
-		modules.setAttribute("separator", "|");
-		modules.setAttribute("list", p->modules().join("|"));
-		window.appendChild( modules );		
-
-		QDomElement key = doc.createElement("KEY");
-		key.setAttribute("name", p->key());
-		window.appendChild( key );		
-
-		QDomElement scrollbars = doc.createElement("SCROLLBARS");
-		scrollbars.setAttribute("horizontal", p->scrollbarPositions().horizontal);
-		scrollbars.setAttribute("vertical", p->scrollbarPositions().vertical);		
-		window.appendChild( scrollbars );		
-						
-		content.appendChild( window );
-	}		
-	
-	QFile file(m_filename);
-	if ( file.open(IO_WriteOnly) ) {
-		ret = true;
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		t << doc.toString();
-		file.close();
-	}
-	else
-		ret = false;
-
-	return ret;
-}
-
-/** Saves the profile to the file given in the constructor. */
-const bool CProfile::save(){
-	return save(m_profileWindows);
-}
-
-/** Returns the filename used for this profile. */
-const QString& CProfile::filename(){
-	return m_filename;
-}
-
-/** Returns the name of this profile. */
-const QString& CProfile::name(){
-	return m_name;
-}
-
-/** Initializes the XML for the first time (use to create a new profile) */
-void CProfile::init(const QString file){
-	const QString oldFile = m_filename;
-	m_filename = file;
-	save(QPtrList<CProfileWindow>());
-	m_filename = oldFile;
-}
-
-/** Changes the name of this profile. */
-void CProfile::setName( const QString& newName ){
-	m_name = newName;
-	saveBasics(); //save chanegd name
-}
-
-/** Loads the basic settings requires for proper operation. */
-void CProfile::loadBasics(){
-	QFile file(m_filename);	
-	if (!file.exists())
-		return;
-
-	QDomDocument doc;	
-	if (file.open(IO_ReadOnly)) {
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		doc.setContent(t.read());
-		file.close();			
-	}
-  QDomElement document = doc.documentElement();
-	if (document.hasAttribute("name"))
-		m_name = document.attribute("name");
-}
-
-void CProfile::saveBasics(){
-	QFile file(m_filename);	
-	if (!file.exists())
-		return;
-
-	QDomDocument doc;	
-	if (file.open(IO_ReadOnly)) {
-		QTextStream t(&file);
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		doc.setContent(t.read());
-		file.close();	
-	}
-	
-  QDomElement document = doc.documentElement();
-	document.setAttribute("name", m_name);	
-	
-	if (file.open(IO_WriteOnly)) {	
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		t << doc.toString();	
-		file.close();	
-	}
-}
-
-/** Returns true if the main window was in fullscreen mode as the profile was saved. */
-const bool CProfile::fullscreen() const {
-	return m_fullscreen;
-}
-
-/** Set the parameter to true if the main window coveres the full screen size. */
-void CProfile::setFullscreen( const bool fullscreen ){
-	m_fullscreen = fullscreen;
-}
-
-/** Returns the geometry of the main window */
-const QRect CProfile::geometry(){
-	return m_geometry;
-}
-
-/** Stes the geoemtry of the main window */
-void CProfile::setGeometry( const QRect rect ){
-	m_geometry = rect;
-}
diff --git a/bibletime/frontend/cprofile.h b/bibletime/frontend/cprofile.h
deleted file mode 100644
index e322401..0000000
--- a/bibletime/frontend/cprofile.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************
-                          cprofile.h  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPROFILE_H
-#define CPROFILE_H
-
-#include "cprofilewindow.h"
-
-//Qt includes
-#include <qptrlist.h>
-
-/**	Manages one profile file. Provides functions to save and restore settings of the available display windows.
-  *	@author The BibleTime team
-  */
-class CProfile {
-public: 
-	CProfile(const QString& fileName, const QString& name = QString::null);
-	~CProfile();
-
-  /**
-  * Saves the profile to the file given in the constructor.
-  * @param windows The list of windows available in the profile.
-  */
-  const bool save( QPtrList<CProfileWindow> windows );
-  /**
-  * Saves the profile to the file given in the constructor.
-  */
-  const bool save();
-  /**
-  * Loads the profile from the file given in the constructor.
-  * @return The list of profiled window which exist in the profile.
-  */
- 	QPtrList<CProfileWindow> load();
-  /**
-  * Returns the name of this profile.
-  */
-  const QString& name();
-  /**
-  * Returns the filename used for this profile.
-  */
-  const QString& filename();
-  /**
-  * Initializes the XML for the first time (use to create a new profile)
-  */
-  void init(const QString);
-  /**
-  * Chnages the name of this profile.
-  */
-  void setName( const QString& );
-  /**
-  * Set the parameter to true if the main window coveres the full screen size.
-  */
-  void setFullscreen( const bool fullscreen );
-  /**
-  * Returns true if the main window was in fullscreen mode as the profile was saved.
-  */
-  const bool fullscreen() const;
-  /**
-  * Sets the geoemtry of the main window
-  */
-  void setGeometry( const QRect rect );
-  /**
-  * Returns the geometry of the main window
-  */
-  const QRect geometry();
-		
-private:
-  /**
-  * Loads the basic settings requires for proper operation.
-  */
-  void loadBasics();
-  void saveBasics();
-	
-	QPtrList<CProfileWindow> m_profileWindows;
-	QString m_name;
-	QString m_filename;
-	bool m_fullscreen;
-	QRect m_geometry;
-};
-
-#endif
diff --git a/bibletime/frontend/cprofilemgr.cpp b/bibletime/frontend/cprofilemgr.cpp
deleted file mode 100644
index 542f20c..0000000
--- a/bibletime/frontend/cprofilemgr.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************
-                          cprofilemgr.cpp  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprofilemgr.h"
-
-//Qt includes
-#include <qdir.h>
-#include <qfile.h>
-#include <qptrlist.h>
-
-//KDE includes
-#include <kstandarddirs.h>
-
-CProfileMgr::CProfileMgr() : m_startupProfile(0) {
-	m_profiles.setAutoDelete(true);
-	
-	KStandardDirs stdDirs;
-	m_profilePath = stdDirs.saveLocation("data", "bibletime/sessions/");	
-	
-	QDir d( m_profilePath );
-	QStringList files = d.entryList("*.xml");
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		if ((*it) != "_startup_.xml")
-			m_profiles.append(new CProfile(m_profilePath + *it));
-		else
-			m_startupProfile = new CProfile(m_profilePath + *it);
-	}
-}
-
-CProfileMgr::~CProfileMgr(){
-	m_profiles.clear();//autoDelete is enabled, so all profiles are deleted
-}
-
-/** Returns a list of available profiles. */
-const QPtrList<CProfile>& CProfileMgr::profiles(){	
-	return m_profiles;
-}
-
-/** Creates a new profile with the name "name" (first parameter).  @return The profile object */
-CProfile* CProfileMgr::create( const QString name ){
-	CProfile* p = new CProfile(QString::null, name);
-	m_profiles.append(p);
-	
-	return p;	
-}
-
-/** Removes the profile from the list and from the directory containg the profile files. */
-const bool CProfileMgr::remove( CProfile* p ){
-	bool ret = false;
-	QFile f( p->filename() );
-	if (f.exists())
-		f.remove();		
-	if(m_profiles.remove(p)); //auto delete is enabled
-		ret = true;
-	return ret;
-}
-
-const bool CProfileMgr::remove( const QString& profile) {
-	bool ret = false;
-	for (CProfile* p = m_profiles.first(); p; p = m_profiles.next()) {
-		if (p->name() == profile) {
-			remove(p);
-			ret =  true;
-		}
-	}
-	return ret;
-}
-
-/** Returns the profile with the desired name. If there's no such profile 0 is returned. */
-CProfile* CProfileMgr::profile(const QString& name) {
-	for (m_profiles.first(); m_profiles.current(); m_profiles.next()) {
-		if (m_profiles.current()->name() == name) {
-			return m_profiles.current();	
-		}
-	}
-	return 0;
-}
-
-/** Returns the startup profile if it exists, otherwise return 0. */
-CProfile* CProfileMgr::startupProfile(){
-	if (!m_startupProfile)
-		m_startupProfile = new CProfile(QString::null, "_startup_");
-	return m_startupProfile;	
-}
-
-/** Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile. */
-void CProfileMgr::refresh(){
-	m_profiles.clear(); //delete all profiles
-	QDir d( m_profilePath );
-	QStringList files = d.entryList("*.xml");
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		CProfile p(m_profilePath + *it);
-		if (p.name() == "_startup_") { //new startup profile
-			if  (!m_startupProfile) //don't put this in the if clause above,it doesn't work!
-				m_startupProfile = new CProfile(m_profilePath + *it);
-		}
-		else if (!profile(p.name())) { //don't have it already
-			m_profiles.append(new CProfile(m_profilePath + *it));
-		}
-	}
-}
diff --git a/bibletime/frontend/cprofilemgr.h b/bibletime/frontend/cprofilemgr.h
deleted file mode 100644
index d26e6d2..0000000
--- a/bibletime/frontend/cprofilemgr.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
-                          cprofilemgr.h  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPROFILEMGR_H
-#define CPROFILEMGR_H
-
-#include "cprofile.h"
-
-//Qt includes
-#include <qstring.h>
-
-/** The manager for profiles.
-	* Provides functions to create, delete, save and load profiles.
-  * @author The BibleTime team
-  */
-
-class CProfileMgr {
-public: 
-	CProfileMgr();
-	~CProfileMgr();	
-
-  /** Creates a new profile with the name "name" (first parameter).
-	* @return The profile object
-	*/
-  CProfile* create( const QString name );
-  /**
-  * @return a list of available profiles
-  */
-  const QPtrList<CProfile>& profiles();
-  /**
-  * Removes the profile from the list and from the directory containg the profile files.
-  */
-  const bool remove( CProfile* p );
-  /**
-  * Removes the profile from the list and from the directory containg the profile files.
-  */
-  const bool remove( const QString& );
-  /**
-  * Returns the profile with the desired name. If there's no such profile 0 is returned.
-  */
-  CProfile* profile(const QString&);
-  /**
-  * Returns the startup profile if it exists, otherwise return 0.
-  */
-  CProfile* startupProfile();
-  /**
-  * Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile.
-  */
-  void refresh();
-
-protected:	
-	QPtrList<CProfile> m_profiles;	
-	QString m_profilePath;
-	CProfile* m_startupProfile;
-};
-
-#endif
diff --git a/bibletime/frontend/cprofilewindow.cpp b/bibletime/frontend/cprofilewindow.cpp
deleted file mode 100644
index 63201b8..0000000
--- a/bibletime/frontend/cprofilewindow.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/***************************************************************************
-                          cprofilewindow.cpp  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprofilewindow.h"
-
-CProfileWindow::CProfileWindow(CSwordModuleInfo::ModuleType type)
-	: m_type(type),
-    m_windowGeometry(),
-    m_moduleList(),
-    m_key(QString::null),
-	  m_maximized(false),
-	  m_hasFocus(false),
-    m_windowSettings(0),
-    m_writeWindowType(0)
-{
-  m_scrollbarPos.horizontal = 0;
-  m_scrollbarPos.vertical = 0;
-}
-
-CProfileWindow::~CProfileWindow(){
-
-}
-
-/** Returns the size of the window including the x,y coordinates. */
-const QRect& CProfileWindow::geometry() const {
-	return m_windowGeometry;
-}
-
-/** Sets the size of the window. */
-void CProfileWindow::setGeometry( const QRect& rect ){
-	m_windowGeometry = rect;
-}
-
-/** Returns the type of the managed window (bible window, commentary window or lexicon window). */
-const CSwordModuleInfo::ModuleType CProfileWindow::type() const {
-	if (m_type != CSwordModuleInfo::Unknown)
-		return m_type;
-  return CSwordModuleInfo::Unknown;
-}
-
-/** Sets the modules. */
-void CProfileWindow::setModules( const QStringList& modules ){
-	m_moduleList = modules; //copy module pointers into our own list
-}
-
-/** Returns a list of module names which are chosen in the managed window profile. */
-const QStringList& CProfileWindow::modules() const {
-	return m_moduleList;
-}
-
-/** Returns the current key set in the modules. */
-const QString& CProfileWindow::key() const {
-	return m_key;
-}
-
-/** Set the key used in the modules. */
-void CProfileWindow::setKey( const QString& key ){
-	m_key = key;
-}
-
-/** Sets the current position of the scrollbars. */
-void CProfileWindow::setScrollbarPositions(const int& horizontal, const int& vertical) {
-//	m_scrollbarPos = {x,y};
-	m_scrollbarPos.horizontal = horizontal;
-	m_scrollbarPos.vertical = vertical;
-}
-
-/** Returns tghe position of the scrollbars */
-const CProfileWindow::ScrollbarPos& CProfileWindow::scrollbarPositions() const {
-	return m_scrollbarPos;
-}
-
-/** Sets the type of the used modules. */
-void CProfileWindow::setType(const CSwordModuleInfo::ModuleType& type){
-	m_type = type;
-}
-
-/** Returns true if the window is maximized. */
-const bool& CProfileWindow::maximized() const {
-	return m_maximized;
-}
-
-/** Sets the windows maximized state to true or false. */
-void CProfileWindow::setMaximized( const bool& maximized ){
-	m_maximized = maximized;
-}
-
-/** Returns true if the window is maximized. */
-const bool& CProfileWindow::hasFocus() const {
-	return m_hasFocus;
-}
-
-/** Sets the windows maximized state to true or false. */
-void CProfileWindow::setFocus( const bool& hasFocus ){
-	m_hasFocus = hasFocus;
-}
-
-/** Returns an integer with the window specific settings */
-const int& CProfileWindow::windowSettings() const {
-	return m_windowSettings;
-}
-
-/** Sets the window specific settings. */
-void CProfileWindow::setWindowSettings( const int& settings ){
-	m_windowSettings = settings;
-}
-
-/** Tells this profile window to represent a write window. */
-void CProfileWindow::setWriteWindowType( const int& writeWindowType ){
-  m_writeWindowType = writeWindowType;
-}
-
-/** Returns whether this profile window represents a write window. */
-const int& CProfileWindow::writeWindowType() const {
-  return m_writeWindowType;
-}
diff --git a/bibletime/frontend/cprofilewindow.h b/bibletime/frontend/cprofilewindow.h
deleted file mode 100644
index 10286b8..0000000
--- a/bibletime/frontend/cprofilewindow.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
-                          cprofilewindow.h  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPROFILEWINDOW_H
-#define CPROFILEWINDOW_H
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qrect.h>
-#include <qstringlist.h>
-#include <qptrlist.h>
-
-/** Contains the settings for one window saved in the profile.
-  * @author The BibleTime team
-  */
-class CProfileWindow {
-public:
-  struct ScrollbarPos {
-		int horizontal; 	//the position of the horizontal scrollbar
-		int vertical;	//the position of the vertical scrollbar
-  };
-
-	CProfileWindow(CSwordModuleInfo::ModuleType type = CSwordModuleInfo::Unknown);
-	~CProfileWindow();
-  /**
-  * Sets the modules.
-  */
-  void setModules( const QStringList& modules );
-  /**
-  * Returns the type of the managed window (bible window, commentary window or lexicon window).
-  */
-  const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Sets the type of the used modules.
-  */
-  void setType(const CSwordModuleInfo::ModuleType& type);
-  /**
-  * Sets the size of the window.
-  */
-  void setGeometry( const QRect& s );
-  /**
-  * Returns the size of the window including the x,y coordinates.
-  */
-  const QRect& geometry() const;
-  /**
-  * Returns a list of module names which are chosen in the managed window profile.
-  */
-  const QStringList& modules() const;
-  /**
-  * Set the key used in the modules.
-  */
-  void setKey( const QString& );
-  /**
-  * Returns the current key set in the modules.
-  */
-  const QString& key() const;
-  /**
-  * Sets the current position of the scrollbars.
-  */
-  void setScrollbarPositions(const int& x, const int& y);
-  /**
-  * Sets the windows maximized state to true or false.
-  */
-  void setMaximized( const bool& maximized );
-  /**
-  * Sets the windows hasFocus state to true or false.
-  */
-  void setFocus( const bool& hasFocus );
-  /**
-  * Sets the window specific settings.
-  */
-  void setWindowSettings( const int& settings );
-  /**
-  * Returns an integer with the window specific settings
-  */
-  const int& windowSettings() const;
-  /**
-  * Returns true if the window is maximized.
-  */
-  const bool& maximized() const;
-  /**
-  * Returns true if the window has the focus in the MDI area.
-  */
-  const bool& hasFocus() const;
-  /**
-  * Returns tghe position of the scrollbars
-  */
-  const CProfileWindow::ScrollbarPos& scrollbarPositions() const;
-  /**
-  * Returns whether this profile window represents a write window.
-  */
-  const int& writeWindowType() const;
-  /**
-  * Tells this profile window to represent a write window.
-  */
-  void setWriteWindowType( const int& writeWindowType );
-
-private:
-	CSwordModuleInfo::ModuleType m_type;
-	QRect m_windowGeometry;
-	QStringList m_moduleList;
-	QString m_key;
-	ScrollbarPos m_scrollbarPos;
-	bool m_maximized;
-	bool m_hasFocus;
-	int m_windowSettings;
-  int m_writeWindowType;
-};
-
-#endif
-
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
deleted file mode 100644
index a76a108..0000000
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ /dev/null
@@ -1,1402 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cswordsetupdialog.h"
-
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-#include "util/scoped_resource.h"
-
-
-#include <iostream>
-//#include <stdlib.h>
-
-//QT includes
-#include <qdir.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qwidgetstack.h>
-#include <qfileinfo.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qdict.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kdirselectdialog.h>
-#include <keditlistbox.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kprogress.h>
-#include <kurl.h>
-
-//Sword includes
-#include <installmgr.h>
-#include <swmodule.h>
-#include <swversion.h>
-
-
-using std::cout;
-using std::cerr;
-using std::endl;
-
-using namespace sword;
-
-CInstallSourcesMgrDialog::InstallSourceItem::InstallSourceItem( KListView* parent ) :
-	KListViewItem(parent, QString::null)
-{
-
-}
-
-CInstallSourcesMgrDialog::InstallSourceItem::InstallSourceItem( KListView* parent, sword::InstallSource is ) : KListViewItem(parent, QString::null)
-{
-	setCaption( QString::fromLatin1(is.caption.c_str()) );
-	m_url.setHost( QString::fromLatin1(is.source.c_str()) );
-	m_url.setPath( QString::fromLatin1(is.directory.c_str()) );
-	setEnabled(true);
-
-	updateItem();
-}
-
-const QUrl& CInstallSourcesMgrDialog::InstallSourceItem::url() const {
-	return m_url;
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setURL(const QUrl& url) {
-	m_url = url;
-	updateItem();
-}
-
-const QString& CInstallSourcesMgrDialog::InstallSourceItem::caption() const {
-	return m_caption;
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setCaption( const QString& caption ) {
-	if (caption.isEmpty())
-		return;
-
-	m_caption = caption;
-	updateItem();
-}
-
-const QString CInstallSourcesMgrDialog::InstallSourceItem::server() const {
-	return m_url.host();
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setServer( const QString& server ) {
-	if (server.isEmpty())
-		return;
-
-	m_url.setHost(server);
-	updateItem();
-}
-
-const QString CInstallSourcesMgrDialog::InstallSourceItem::path() const {
-	return m_url.path();
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setPath( const QString& path ) {
-	if (path.isEmpty())
-		return;
-
-	m_url.setPath(path);
-	updateItem();
-}
-
-/*const bool CInstallSourcesMgrDialog::InstallSourceItem::isEnabled() const {
-	return isOn();
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setEnabled( const bool enabled ) {
-	setOn(enabled);
-	updateItem();
-}*/
-
-void CInstallSourcesMgrDialog::InstallSourceItem::updateItem() {
-	setText(0, m_caption);
-//	setText(1, m_url.host() + m_url.path());
-}
-
-sword::InstallSource CInstallSourcesMgrDialog::InstallSourceItem::swordInstallSource() {
-	sword::InstallSource src("FTP");
-	src.caption = m_caption.latin1();
-	src.source = m_url.host().latin1();
-	src.directory = m_url.path().latin1();
-
-	return src;
-}
-
-CInstallSourcesMgrDialog::CInstallSourcesMgrDialog(QWidget *parent, const char *name )
-	: KDialogBase(IconList, i18n("Manage installation sources"), Ok, Ok, parent, name, true, true, QString::null, QString::null, QString::null) {
-
-	initLocalSourcesPage();
-	initRemoteSourcesPage();
-}
-
-void CInstallSourcesMgrDialog::slotOk() {
-	//save local sources
-	BTInstallMgr::Tool::RemoteConfig::resetLocalSources(); //we want to overwrite old sources, not add to them
-	QListViewItemIterator it(m_localSourcesList);
-	while (it.current()) {
-		sword::InstallSource is = sword::InstallSource("DIR");
-		is.caption = it.current()->text(0).latin1();
-		is.source = "local"; //just some placeholder to make InstallSrc's parsing happy
-		is.directory = it.current()->text(0).latin1();
-		BTInstallMgr::Tool::RemoteConfig::addSource( &is );
-
-		++it; //next local source item
-	}
-
-
-	//save remote sources
-	BTInstallMgr::Tool::RemoteConfig::resetRemoteSources(); //we wan't to overwrite old sources, not add to them
-	it = QListViewItemIterator(m_remoteSourcesList);
-	while (it.current()) {
-		InstallSourceItem* item = dynamic_cast<InstallSourceItem*>(it.current());
-		if (!item)
-			continue;
-
-		sword::InstallSource is = item->swordInstallSource();
-		BTInstallMgr::Tool::RemoteConfig::addSource( &is );
-		++it; //next checked item
-	}
-
-	KDialogBase::slotOk();
-}
-
-void CInstallSourcesMgrDialog::initLocalSourcesPage() {
-	m_localSourcesPage = addPage(i18n("Local sources"), QString::null, DesktopIcon("folder",32));
- 	m_localSourcesPage->setMinimumSize(500,400);
-
-	QGridLayout* grid = new QGridLayout(m_localSourcesPage, 4,3, 5,5);
-
-	QLabel* mainLabel = CToolClass::explanationLabel(m_localSourcesPage,
-		i18n("Manage local sources"),
-		i18n("Here you can setup the local sources for module installation, e.g. the path to your CD-Rom to install from a Sword CD.<br>On many Linux distributions the path to your cdrom is either <i>/media/cdrom</i> or <i>/cdrom</i> Please make sure you mounted the CD-Rom before you use BibleTime to install from CD-Rom.")
-  );
-	grid->addMultiCellWidget(mainLabel, 0, 0, 0, 2);
-
-	m_localSourcesList = new KListView( m_localSourcesPage );
-	m_localSourcesList->addColumn(i18n("Local sources"));
-	m_localSourcesList->setFullWidth(true);
-
-	QPushButton* addButton = new QPushButton(i18n("Add new directory"), m_localSourcesPage);
-	connect(addButton, SIGNAL(clicked()), SLOT(slot_localAddSource()));
-
-	QPushButton* removeButton = new QPushButton(i18n("Remove directory"), m_localSourcesPage);
-	connect(removeButton, SIGNAL(clicked()), SLOT(slot_localRemoveSource()));
-
-	grid->addMultiCellWidget( m_localSourcesList, 1,3, 0,1 );
-	grid->setColStretch(0, 5);
-	grid->setColStretch(1, 5);
-
-	grid->setRowStretch(0, 0);
-	grid->setRowStretch(3, 5);
-
-	grid->addWidget( addButton, 1,2 );
-	grid->addWidget( removeButton, 2,2 );
-	grid->setColStretch(2, 0);
-
-
-	//noe insert existing local source items, if there are no sources setup with default source
-	BTInstallMgr mgr;
-	QStringList sources = BTInstallMgr::Tool::RemoteConfig::sourceList( &mgr );
-	for (QStringList::iterator it = sources.begin(); it != sources.end(); ++it) {
-		sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, (*it).latin1());
-		if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource( &is )) { //only use local sources as items
-			continue;
-		}
-
-		/*QListViewItem* i = */new KListViewItem( m_localSourcesList, *it );
-		//i->setText(0, *it);
-	}
-
-	if (m_localSourcesList->childCount() == 0) {
-//		InstallSourceItem* i = new InstallSourceItem(m_remoteSourcesList);
-//		i->setCaption("Crosswire");
-//		i->setURL(QUrl("ftp://ftp.crosswire.org/pub/sword/raw/"));
-	}
-
-}
-
-void CInstallSourcesMgrDialog::slot_localAddSource() {
-	//Add a new dir to the list.
-  KURL url = KDirSelectDialog::selectDirectory(QString::null, true);
-  if (url.isValid()) {
-		new KListViewItem(m_localSourcesList, url.path());
-  }
-}
-
-void CInstallSourcesMgrDialog::slot_localRemoveSource() {
-	if (m_localSourcesList->currentItem()) {
-		delete m_localSourcesList->currentItem();
-	}
-}
-
-void CInstallSourcesMgrDialog::initRemoteSourcesPage() {
-	m_remoteSourcesPage = addPage(i18n("Remote sources"), QString::null, DesktopIcon("network",32));
- 	m_remoteSourcesPage->setMinimumSize(500,400);
-
-	QGridLayout* grid = new QGridLayout(m_remoteSourcesPage, 5,5, 5,5);
-
-	QLabel* mainLabel = CToolClass::explanationLabel(m_remoteSourcesPage,
-		i18n("Manage remote sources"),
-		i18n("Setup remote sources like FTP servers which can be used to download Sword modules on your computer.")
-  );
-	grid->addMultiCellWidget(mainLabel, 0, 0, 0, 4);
-
-	m_remoteSourcesList = new KListView( m_remoteSourcesPage );
-	m_remoteSourcesList->setAllColumnsShowFocus(true);
-	m_remoteSourcesList->addColumn(i18n("Name"));
-//  m_remoteSourcesList->addColumn("URL");
-	m_remoteSourcesList->setFullWidth(true);
-	connect(m_remoteSourcesList, SIGNAL(selectionChanged()),
-		SLOT(slot_remoteSourceSelectionChanged()));
-
- 	QPushButton* addButton = new QPushButton(i18n("New"), m_remoteSourcesPage);
-	addButton->setIconSet(DesktopIcon("filenew", 16));
-	connect(addButton, SIGNAL(clicked()), SLOT(slot_remoteAddSource()));
-
-	QPushButton* removeButton = new QPushButton(i18n("Remove"), m_remoteSourcesPage);
-	removeButton->setIconSet(DesktopIcon("edittrash", 16));
-	connect(removeButton, SIGNAL(clicked()), SLOT(slot_remoteRemoveSource()));
-
-	grid->addMultiCellWidget( m_remoteSourcesList, 1,3, 0,2 );
-	grid->setRowStretch(0, 0);
-	grid->setRowStretch(1, 5);
-	grid->addWidget( addButton, 4,0 );
-	grid->addWidget( removeButton, 4,1 );
-
-	grid->setColStretch(0, 0);
-	grid->setColStretch(1, 0);
-	grid->setColStretch(2, 0);
-	grid->setColStretch(3, 5);
-
-	//contains the remote sources edit controls, we need boxes for the caption, the server, the dir on the server
-	QGroupBox* box = new QGroupBox(m_remoteSourcesPage);
-	box->setTitle(i18n("Edit remote source"));
-	grid->addMultiCellWidget( box, 1,4, 3,4 );
-
-	QGridLayout* boxGrid = new QGridLayout(box, 4, 3, box->insideMargin() + box->insideSpacing(), 5);
-	boxGrid->setColStretch(1, 5);
-
-	boxGrid->addWidget(new QLabel(i18n("Name:"), box), 0,0);
-
-	m_remoteCaptionEdit = new QLineEdit(box);
-	connect(m_remoteCaptionEdit, SIGNAL(textChanged(const QString&)),
-		SLOT(slot_remoteCaptionChanged(const QString&)));
-	boxGrid->addWidget(m_remoteCaptionEdit, 0,1);
-
-
-	m_remoteServerEdit = new QLineEdit(box);;
-	connect(m_remoteServerEdit, SIGNAL(textChanged(const QString&)),
-		SLOT(slot_remoteServerChanged(const QString&)));
-	boxGrid->addWidget(new QLabel(i18n("Server:"), box), 1,0);
-	boxGrid->addWidget(m_remoteServerEdit, 1,1);
-
-	m_remotePathEdit = new QLineEdit(box);;
-	connect(m_remotePathEdit, SIGNAL(textChanged(const QString&)),
-		SLOT(slot_remotePathChanged(const QString&)));
-	boxGrid->addWidget(new QLabel(i18n("Path on server:"), box), 2,0);
-	boxGrid->addWidget(m_remotePathEdit, 2,1);
-
-
-	//now setup some reasonable default server entries
-
-	//noe insert existing remote source items, if there are no sources setup with default source
-	BTInstallMgr mgr;
-	QStringList sources = BTInstallMgr::Tool::RemoteConfig::sourceList( &mgr );
-	for (QStringList::iterator it = sources.begin(); it != sources.end(); ++it) {
-		sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, (*it).latin1());
-		if (!BTInstallMgr::Tool::RemoteConfig::isRemoteSource( &is )) { //only use remote sources as items
-			continue;
-		}
-
-		(void)new InstallSourceItem( m_remoteSourcesList, is );
-	}
-
-	if (m_remoteSourcesList->childCount() == 0) { //setup with the default if no items were present
-		InstallSourceItem* i = new InstallSourceItem(m_remoteSourcesList);
-		i->setCaption("Crosswire");
-		i->setURL(QUrl("ftp://ftp.crosswire.org/pub/sword/raw"));
-	}
-
-	//now select the first item in the list
-	m_remoteSourcesList->setSelected(m_remoteSourcesList->firstChild(), true);
-	m_remoteSourcesList->setCurrentItem( m_remoteSourcesList->firstChild() );
-	slot_remoteSourceSelectionChanged();
-	m_remoteCaptionEdit->setFocus();
-}
-
-void CInstallSourcesMgrDialog::slot_remoteAddSource() {
-	CInstallSourcesMgrDialog::InstallSourceItem* i = new CInstallSourcesMgrDialog::InstallSourceItem(m_remoteSourcesList);
-
-	m_remoteSourcesList->setCurrentItem( i );
-	m_remoteCaptionEdit->setText(i18n("New remote source"));
-	m_remoteServerEdit->setText("ftp.domain.org");
-	m_remotePathEdit->setText("/pub/sword/raw");
-	m_remoteCaptionEdit->setFocus();
-}
-
-void CInstallSourcesMgrDialog::slot_remoteChangeSource() {
-}
-
-void CInstallSourcesMgrDialog::slot_remoteRemoveSource() {
-	delete m_remoteSourcesList->currentItem();
-}
-
-void CInstallSourcesMgrDialog::slot_remoteSourceSelectionChanged() {
-	//Apply settings of new source to the edit widgets
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	m_remoteCaptionEdit->setText( i->caption() );
-	m_remoteServerEdit->setText( i->server() );
-	m_remotePathEdit->setText( i->path() );
-}
-
-void CInstallSourcesMgrDialog::slot_remoteCaptionChanged( const QString& t) {
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	i->setCaption(t);
-}
-
-void CInstallSourcesMgrDialog::slot_remoteServerChanged( const QString& t ) {
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	i->setServer(t);
-}
-
-void CInstallSourcesMgrDialog::slot_remotePathChanged( const QString& t) {
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	i->setPath(t);
-}
-
-/*******************************/
-/* 									New class												*/
-/******************************/
-
-
-CSwordSetupDialog::CSwordSetupDialog(QWidget *parent, const char *name )
-	: KDialogBase(IconList, i18n("Sword configuration"), Ok, Ok, parent, name, true, true, QString::null, QString::null, QString::null),
-		m_removeModuleListView(0),
-		m_installModuleListPage(0),
-		m_installModuleListView(0),
-		m_progressDialog(0),
-  	m_refreshedRemoteSources(false)
-{
-	setIconListAllVisible(true);
-
-  initSwordConfig();
-	initInstall();
-	initRemove();
-}
-
-
-void CSwordSetupDialog::initSwordConfig(){
-	QFrame* page = m_swordConfigPage = addPage(i18n("Sword Path"), QString::null, DesktopIcon("bt_swordconfig",32));
- 	page->setMinimumSize(500,400);
-
-	QGridLayout* layout = new QGridLayout(page, 6, 4);
-	layout->setMargin(5);
-
-	layout->setSpacing(10);
-	layout->setColStretch(0,1);
-	layout->setRowStretch(5,1);
-
-	QLabel* mainLabel = CToolClass::explanationLabel(page,
-		i18n("Configure Sword"),
-		i18n("The underlying Sword software uses an own configuration file. This page let you set up this file.")
-  );
-	layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
-
-
-  QString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename();
-	QLabel* confPathLabel = new QLabel(i18n("Your Sword configuration file is <b>%1</b>").arg(swordConfPath), page);
-	layout->addMultiCellWidget(confPathLabel, 1,1,0,3);
-
-  m_swordPathListBox = new KListView(page);
-  m_swordPathListBox->setFullWidth(true);
-  m_swordPathListBox->addColumn(i18n("Path to Sword modules"));
-  connect(m_swordPathListBox, SIGNAL(selectionChanged()), this, SLOT(slot_swordPathSelected()));
-  layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1);
-
-  m_swordEditPathButton = new QPushButton(i18n("Edit Entry"), page);
-  m_swordEditPathButton->setIconSet(DesktopIcon("edit", 16));
-  connect(m_swordEditPathButton, SIGNAL(clicked()), this, SLOT(slot_swordEditClicked()));
-  layout->addWidget(m_swordEditPathButton, 2, 3);
-
-  m_swordAddPathButton = new QPushButton(i18n("Add Entry"), page);
-  m_swordAddPathButton->setIconSet(DesktopIcon("edit_add", 16));
-  connect(m_swordAddPathButton, SIGNAL(clicked()), this, SLOT(slot_swordAddClicked()));
-  layout->addWidget(m_swordAddPathButton, 3,3);
-
-  m_swordRemovePathButton = new QPushButton(i18n("Remove Entry"), page);
-  m_swordRemovePathButton->setIconSet(DesktopIcon("editdelete", 16));
-  connect(m_swordRemovePathButton, SIGNAL(clicked()), this, SLOT(slot_swordRemoveClicked()));
-  layout->addWidget(m_swordRemovePathButton, 4,3);
-
-  setupSwordPathListBox();
-}
-
-void CSwordSetupDialog::initInstall(){
-	m_installPage = addPage(i18n("Install/Update Modules"), QString::null, DesktopIcon("bt_bible",32));
-
-	QVBoxLayout* vboxlayout = new QVBoxLayout(m_installPage);
-	QHBoxLayout* hboxlayout = new QHBoxLayout();
-  hboxlayout->setAutoAdd( true );
-
-  vboxlayout->addLayout(hboxlayout);
-
-	m_installWidgetStack = new QWidgetStack(m_installPage);
-  hboxlayout->addWidget(m_installWidgetStack);
-
-	m_installSourcePage = new QWidget(0);
-  m_installWidgetStack->addWidget(m_installSourcePage);
-
-	m_installSourcePage->setMinimumSize(500,400);
-
-	QGridLayout* layout = new QGridLayout(m_installSourcePage, 7, 2);
-	layout->setMargin(5);
-	layout->setSpacing(10);
-	layout->setRowStretch(6,5);
-
-	QLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage,
-		i18n("Install/update modules - Step 1"),
-		i18n("Please choose a source and a destination. After that step click on the connect button.<br/><b>WARNING: If you live in a persecuted country and do not wish to risk detection you should NOT use the module remote installation feature!</b>")
-  );
-	layout->addMultiCellWidget(installLabel, 0,0,0,1);
-
-	QLabel* sourceHeadingLabel = new QLabel(QString::fromLatin1("<b>%1</b>").arg(i18n("Select source location")), m_installSourcePage);
-	layout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1);
-
-	m_sourceCombo = new QComboBox(m_installSourcePage);
-	layout->addWidget(m_sourceCombo, 2, 0);
-
-	QPushButton* maintainSourcesButton = new QPushButton(i18n("Maintain sources"), m_installSourcePage);
-	maintainSourcesButton->setIconSet(DesktopIcon("edit", 16));
-	connect(maintainSourcesButton, SIGNAL(clicked()), SLOT(slot_installManageSources()));
-	layout->addWidget(maintainSourcesButton, 2, 1, Qt::AlignLeft);
-
-	m_sourceLabel = new QLabel(m_installSourcePage);
-	layout->addMultiCellWidget(m_sourceLabel, 3,3,0,1);
-
-	QLabel* targetHeadingLabel = new QLabel(QString::fromLatin1("<b>%1</b>").arg(i18n("Select target location")), m_installSourcePage);
-	layout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1);
-
-	m_targetCombo = new QComboBox(m_installSourcePage);
-	layout->addWidget(m_targetCombo, 5, 0);
-
-	m_targetLabel = new QLabel(m_installSourcePage);
-	layout->addMultiCellWidget(m_targetLabel, 6,6,0,1,Qt::AlignTop);
-
-//part beloew main layout with the back/next buttons
-	QHBoxLayout* myHBox = new QHBoxLayout();
-  vboxlayout->addLayout(myHBox);
-
-  m_installBackButton = new QPushButton(i18n("Back"), m_installPage);
-	m_installBackButton->setIconSet(DesktopIcon("back",16));
-	myHBox->addWidget(m_installBackButton);
-
-	myHBox->addSpacing(10);
-	myHBox->addStretch(5);
-
-  m_installContinueButton = new QPushButton(i18n("Connect to source"), m_installPage);
-	m_installContinueButton->setIconSet(DesktopIcon("forward",16));
-  connect(m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource()));
-	myHBox->addWidget(m_installContinueButton);
-
-  m_installBackButton->setEnabled(false);
-
-	connect(m_sourceCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_sourceSelected( const QString&) ));
-	connect(m_targetCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_targetSelected( const QString&) ));
-	populateInstallCombos();
-
-  slot_sourceSelected( m_sourceCombo->currentText() );
-}
-
-void CSwordSetupDialog::initRemove(){
-	QFrame* page = m_removePage = addPage(i18n("Remove Modules"), QString::null, DesktopIcon("edittrash",32));
-
-	page->setMinimumSize(500,400);
-
-	QGridLayout* layout = new QGridLayout(page, 4, 4);
-	layout->setMargin(5);
-
-	layout->setSpacing(10);
-	layout->setColStretch(1,1);
-	layout->setRowStretch(2,1);
-
-	QLabel* mainLabel= CToolClass::explanationLabel(page,
-		i18n("Remove installed module(s)"),
-		i18n("This dialog lets you remove installed Sword modules from your system. Choose the modules and then click on the remove button.")
-  );
-	layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
-
-	QLabel* headingLabel = new QLabel(QString::fromLatin1("<b>%1</b>").arg(i18n("Select modules to be uninstalled")), page);
-	layout->addMultiCellWidget(headingLabel, 1, 1, 0, 3);
-
-	m_populateListNotification = new QLabel("", page);
-	layout->addWidget(m_populateListNotification, 3, 2, Qt::AlignCenter);
-
-	m_removeModuleListView = new KListView(page, "remove modules view");
-	layout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3);
-	m_removeModuleListView->addColumn(i18n("Name"));
-  m_removeModuleListView->addColumn(i18n("Location"));
- 	m_removeModuleListView->setAllColumnsShowFocus(true);
- 	m_removeModuleListView->setFullWidth(true);
-	m_removeModuleListView->setRootIsDecorated(true);
-	connect(m_removeModuleListView, SIGNAL(pressed(QListViewItem*)),
-		SLOT(slot_removeModuleItemExecuted(QListViewItem*)));
-	connect(m_removeModuleListView, SIGNAL(spacePressed(QListViewItem*)),
-		SLOT(slot_removeModuleItemExecuted(QListViewItem*)));
-
-  m_removeRemoveButton = new QPushButton(i18n("Remove selected module(s)"), page);
-	m_removeRemoveButton->setIconSet( DesktopIcon("edittrash", 16) );
-	layout->addWidget(m_removeRemoveButton, 3, 3, Qt::AlignRight);
-
-	connect(m_removeRemoveButton, SIGNAL(clicked()),
-		this, SLOT(slot_doRemoveModules()));
-
-	populateRemoveModuleListView();
-}
-
-/** Called if the OK button was clicked */
-void CSwordSetupDialog::slotOk(){
-  //save the Sword path configuration here
-  if (m_swordPathListBox->childCount()) {
-    QStringList targets;
-
-    QListViewItemIterator it( m_swordPathListBox );
-    while ( it.current() ) {
-      QListViewItem *item = it.current();
-      if (!item->text(0).isEmpty()) {
-        targets << item->text(0);
-      }
-      ++it;
-    }
-
-    BTInstallMgr::Tool::LocalConfig::setTargetList(targets); //creates new Sword config
-  }
-
-  KDialogBase::slotOk();
-  emit signalSwordSetupChanged( );
-}
-
-/*called if the apply button was clicked*/
-void CSwordSetupDialog::slotApply(){
-	KDialogBase::slotApply();
-  emit signalSwordSetupChanged();
-}
-
-/** Opens the page which contaisn the given part ID. */
-const bool CSwordSetupDialog::showPart( CSwordSetupDialog::Parts ID, const bool /*exclusive*/ ) {
-//  if (exlusive) {
-//    m_swordConfigPage->setEnabled(false);
-//    m_installPage->setEnabled(false)
-//    m_removePage->setEnabled(false)
-//  }
-
-  bool ret = false;
-	switch (ID) {
-		case CSwordSetupDialog::Sword:
-      showPage( pageIndex(m_swordConfigPage) );
-			break;
-		case CSwordSetupDialog::Install:
-      showPage( pageIndex(m_installPage) );
-			break;
-		case CSwordSetupDialog::Remove:
-      showPage( pageIndex(m_removePage) );
-			break;
-		default:
-			break;
-	}
-  return ret;
-}
-
-/** No descriptions */
-void CSwordSetupDialog::populateInstallCombos(){
-	m_sourceCombo->clear();
-
-	BTInstallMgr::Tool::RemoteConfig::initConfig();
-
-  QStringList list;
-	{
-		BTInstallMgr mgr;
-		list = BTInstallMgr::Tool::RemoteConfig::sourceList(&mgr);
-	}
-	if (!list.count()) { //add Crosswire entry
-		InstallSource is("FTP");   //default return value
-		is.caption = "Crosswire";
-		is.source = "ftp.crosswire.org";
-		is.directory = "/pub/sword/raw";
-		BTInstallMgr::Tool::RemoteConfig::addSource(&is);
-
-		BTInstallMgr mgr; //make sure we're uptodate
-		list = BTInstallMgr::Tool::RemoteConfig::sourceList(&mgr);
-
-		Q_ASSERT( list.count() > 0 );
-	}
-
-  BTInstallMgr mgr;
-  for (QStringList::iterator it = list.begin(); it != list.end(); ++it) {
-		sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, *it);
-		if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { //remote source?
-    	m_sourceCombo->insertItem( i18n("[Remote]") + " " + *it );
-		}
-		else {
-			QFileInfo fi(*it);
-			if (fi.isDir() && fi.isReadable()) {
-				m_sourceCombo->insertItem( i18n("[Local]") + " " + *it );
-			}
-		}
-  }
-
-	//Fill in the targets in the targets combobox
-  //list = (m_targetCombo->count()) ? m_swordPathListBox : BTInstallMgr::Tool::LocalConfig::targetList();
-	if (m_targetCombo->count()) { //we already read in the list once, we have to use the Sword paths list items now because this list is newer
-		list.clear();
-		QListViewItemIterator it2( m_swordPathListBox );
-		while (it2.current()) {
-			list << it2.current()->text(0);
-
-			++it2;
-		}
-	}
-	else {
-		list = BTInstallMgr::Tool::LocalConfig::targetList();
-	}
-
-	m_targetCombo->clear();
-  for (QStringList::iterator it = list.begin(); it != list.end(); ++it) {
-		QFileInfo fi(*it);
-		if (fi.isDir() && fi.isWritable()) {
-			m_targetCombo->insertItem( *it );
-		}
-  }
-
-//init widget states
-m_targetCombo->setEnabled( (m_targetCombo->count() > 0) );
-m_installContinueButton->setEnabled(
-	(m_sourceCombo->count() > 0) && (m_targetCombo->count() > 0)
-);
-
-	slot_sourceSelected( m_sourceCombo->currentText() );
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_sourceSelected(const QString &sourceName){
-	//remove status parta
-	QString source = sourceName;
-	//we have to be a bit compilcated here because Qt 3.0.5 doesn't have the QString::replace(QString s) function
-
-	//source = source.remove( i18n("[Local]") + " " );
-	QString rep = i18n("[Local]") + " ";
-	int i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-	//source = source.remove( i18n("[Remote]") + " " );
-	rep = i18n("[Remote]") + " ";
-	i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-
-  BTInstallMgr mgr;
-	// qWarning("%s schosen", source.latin1());
-
-  QString url;
-  sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, source) ;
-
-  if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
-    url = QString::fromLatin1("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str());
-  }
-  else {
-    url = QString::fromLatin1("%1").arg(is.directory.c_str());
-  }
-  m_sourceLabel->setText( url );
-
-  m_refreshedRemoteSources = false;
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_targetSelected(const QString &targetName){
-	m_targetLabel->setText( m_targetMap[targetName] );
-  target = m_targetMap[targetName];
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_doRemoveModules(){
-	QStringList moduleList;
-
-	QListViewItemIterator list_it( m_removeModuleListView );
-	while ( list_it.current() ) {
-		QCheckListItem* i = dynamic_cast<QCheckListItem*>( list_it.current() );
-		if (i && i->isOn()) {
-			moduleList << list_it.current()->text(0);
-		}
-
-		++list_it;
-	}
-
-	const QString message = i18n("You selected the following modules: %1.\n\n"
-		"Do you really want to remove them from your system?").arg(moduleList.join(", "));
-
-	if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)){  //Yes was pressed.
-    sword::InstallMgr installMgr;
-		QDict<sword::SWMgr> mgrDict; //maps config paths to SWMgr objects
-
-  	for ( QStringList::Iterator it = moduleList.begin(); it != moduleList.end(); ++it ) {
-      if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { //module found?
-        QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/";
-        QString dataPath = m->config(CSwordModuleInfo::DataPath);
-
-        if (dataPath.left(2) == "./") {
-          dataPath = dataPath.mid(2);
-        }
-
-				if (prefixPath.contains(dataPath)) { //remove module part to get the prefix path
-          prefixPath = prefixPath.remove( prefixPath.find(dataPath), dataPath.length() );
-        }
-        else { //fall back to default Sword config path
-          prefixPath = QString::fromLatin1(backend()->prefixPath);
-        }
-
-				sword::SWMgr* mgr = mgrDict[ prefixPath ];
-				if (!mgr) { //create new mgr if it's not yet available
-					mgrDict.insert(prefixPath, new sword::SWMgr(prefixPath.local8Bit()));
-					mgr = mgrDict[ prefixPath ];
-				}
-
-        installMgr.removeModule(mgr, m->name().latin1());
-      }
-    }
-
-		CPointers::backend()->reloadModules();
-    populateRemoveModuleListView(); //rebuild the tree
-    populateInstallModuleListView( currentInstallSource() ); //rebuild the tree
-
-		//delete all mgrs
-		mgrDict.setAutoDelete(true);
-		mgrDict.clear();
-  }
-}
-
-void CSwordSetupDialog::slot_removeModuleItemExecuted(QListViewItem* item) {
-	// This function enabled the Install modules button if modules are chosen
-	// If an item was clicked to be not chosen look if there are other selected items
-	// If the item was clicked to be chosen enable the button without looking at the other items
-
-	QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>(item);
-	if (item && !checkItem) //no valid item for us
-		return;
-
-	if (checkItem && checkItem->isOn()) {
-		m_removeRemoveButton->setEnabled(true);
-	}
-	else {
-		QListViewItemIterator it( m_removeModuleListView );
-		QCheckListItem* ci = 0;
-		while (it.current()) {
-			ci = dynamic_cast<QCheckListItem*>(it.current());
-			if (ci && ci->isOn()) {
-				break;
-			}
-			it++;
-		}
-		if ( ci && ci->isOn() ) { //a module is checked in the list
-			m_removeRemoveButton->setEnabled(true);
-    }
-		else {
-			m_removeRemoveButton->setEnabled(false);
-		}
-	}
-}
-
-/** No descriptions */
-void CSwordSetupDialog::populateRemoveModuleListView(){
-	m_removeRemoveButton->setEnabled(false);
-
-	CSwordBackend myBackend;
-	KApplication::kApplication()->processEvents();
-	myBackend.initModules();
-
-	m_removeModuleListView->clear();
-
-	QListViewItem* categoryBible = new QListViewItem(m_removeModuleListView, i18n("Bibles"));
-	QListViewItem* categoryCommentary = new QListViewItem(m_removeModuleListView, i18n("Commentaries"));
-	QListViewItem* categoryLexicon = new QListViewItem(m_removeModuleListView, i18n("Lexicons"));
-	QListViewItem* categoryBook = new QListViewItem(m_removeModuleListView, i18n("Books"));
-	QListViewItem* categoryDevotionals = new QListViewItem(m_removeModuleListView, i18n("Daily Devotionals"));
-	QListViewItem* categoryGlossaries = new QListViewItem(m_removeModuleListView, i18n("Glossaries"));
-
-  categoryBible->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryCommentary->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryLexicon->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryBook->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryDevotionals->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryGlossaries->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-
-  categoryBible->setOpen(true);
-  categoryCommentary->setOpen(true);
-  categoryLexicon->setOpen(true);
-  categoryBook->setOpen(true);
-  categoryDevotionals->setOpen(true);
-  categoryGlossaries->setOpen(true);
-
-	QPtrList<CSwordModuleInfo> list = myBackend.moduleList();
-	int modcount = list.count();
-	int mod = 0;
-	QListViewItem* newItem = 0;
-	QListViewItem* parent = 0;
-	sword::SWConfig moduleConfig("");
-
-	for ( list.first(), mod = 1; list.current(); list.next(), mod++ ){
-		if (mod % 20){
-			m_populateListNotification->setText(i18n("Scanning your modules: %1%").arg((mod*100)/modcount));
-			//KApplication::kApplication()->processEvents();
-			m_removeModuleListView->triggerUpdate();
-		}
-
-		switch (list.current()->type()) {
-			case CSwordModuleInfo::Bible:
-        parent = categoryBible;
-				break;
-			case CSwordModuleInfo::Commentary:
-        parent = categoryCommentary;
-				break;
-			case CSwordModuleInfo::Lexicon:
-        parent = categoryLexicon;
-				break;
-			case CSwordModuleInfo::GenericBook:
-        parent = categoryBook;
-				break;
-      default:
-        parent = 0; //shouldn't happen;
-        break;
-		}
-
-		//handling for special module types
-		if ((parent == categoryLexicon) && (list.current()->category() == CSwordModuleInfo::Glossary)) {
-			parent = categoryGlossaries;
-		}
-		if ((parent == categoryLexicon) && (list.current()->category() == CSwordModuleInfo::DailyDevotional)) {
-			parent = categoryDevotionals;
-		}
-
-		//now we know the category, find the right language group in that category
-		CLanguageMgr::Language lang = list.current()->language();
-		QString langName = lang.translatedName();
-		if (!lang.isValid()) {
-			langName = QString::fromLatin1(list.current()->module()->Lang());
-		}
-
-		QListViewItem * langFolder = parent->firstChild();
-    while( langFolder ) { //try to find language folder if it exsists
-			if (langFolder->text(0) == langName) { //found right folder
-				break;
-			}
-			langFolder = langFolder->nextSibling();
-		}
-
-		if (!langFolder) { //not yet there
-			langFolder = new QListViewItem(parent, langName);
-			langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-			langFolder->setOpen(true);
-		}
-
-		newItem = new QCheckListItem(langFolder, list.current()->name(), QCheckListItem::CheckBox);
-    newItem->setPixmap(0, CToolClass::getIconForModule(list.current()));
-		newItem->setText(1,list.current()->config(CSwordModuleInfo::AbsoluteDataPath));
-  }
-
-	m_populateListNotification->setText("");
-
-  //clean up groups
-  if (!categoryBible->childCount())
-    delete categoryBible;
-  if (!categoryCommentary->childCount())
-    delete categoryCommentary;
-  if (!categoryBook->childCount())
-    delete categoryBook;
-  if (!categoryLexicon->childCount())
-    delete categoryLexicon;
-  if (!categoryDevotionals->childCount())
-    delete categoryDevotionals;
-  if (!categoryGlossaries->childCount())
-    delete categoryGlossaries;
-}
-
-/** No descriptions */
-void CSwordSetupDialog::populateInstallModuleListView( const QString& sourceName ){
-  KApplication::kApplication()->processEvents();
-	if (!m_installModuleListView) { // it may be an update after removing modules, so the widgets we need do not have to exist
-		return;
-	}
-	
-	m_installModuleListView->clear();
-
-	QListViewItem* categoryBible = new QListViewItem(m_installModuleListView, i18n("Bibles"));
-	QListViewItem* categoryCommentary = new QListViewItem(m_installModuleListView, i18n("Commentaries"));
-	QListViewItem* categoryLexicon = new QListViewItem(m_installModuleListView, i18n("Lexicons"));
-	QListViewItem* categoryBook = new QListViewItem(m_installModuleListView, i18n("Books"));
-	QListViewItem* categoryDevotionals = new QListViewItem(m_installModuleListView, i18n("Daily Devotionals"));
-	QListViewItem* categoryGlossaries = new QListViewItem(m_installModuleListView, i18n("Glossaries"));
-
-  categoryBible->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryCommentary->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryLexicon->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryBook->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryDevotionals->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryGlossaries->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-  categoryBible->setOpen(true);
-  categoryCommentary->setOpen(true);
-  categoryLexicon->setOpen(true);
-  categoryBook->setOpen(true);
-  categoryDevotionals->setOpen(true);
-  categoryGlossaries->setOpen(true);
-
-  BTInstallMgr iMgr;
-//	qWarning("trying to find source %s!", sourceName.latin1());
-	sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, sourceName);
-//	qWarning("found source %s with dir %s!", is.caption.c_str(), is.directory.c_str());
-
-  if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
-    if (!m_refreshedRemoteSources) {
-      iMgr.refreshRemoteSource( &is );
-		}
-    m_refreshedRemoteSources = true;
-  }
-
-  //kind of a hack to provide a pointer to mgr next line
-  util::scoped_ptr<CSwordBackend> backend( BTInstallMgr::Tool::backend(&is) );
-  if (!backend)
-    return;
-
-  QListViewItem* parent = 0;
-  ListCSwordModuleInfo mods = backend->moduleList();
-  for (CSwordModuleInfo* newModule = mods.first(); newModule; newModule = mods.next()) {
-    bool isUpdate = false;
-    CSwordModuleInfo* const installedModule = CPointers::backend()->findModuleByName(newModule->name());
-    if (installedModule) { //module already installed?
-      //check whether it's an uodated module or just the same
-      const SWVersion installedVersion( installedModule->config(CSwordModuleInfo::ModuleVersion).latin1() );
-      const SWVersion newVersion( newModule->config(CSwordModuleInfo::ModuleVersion).latin1() );
-      isUpdate = (newVersion > installedVersion);
-
-			if (!isUpdate)
-        continue;
-    }
-
-    if (newModule->isLocked() || newModule->isEncrypted()) { //encrypted modules have no data files on the server
-      continue;
-		}
-
-    switch (newModule->type()) {
-      case CSwordModuleInfo::Bible:
-        parent = categoryBible;
-        break;
-      case CSwordModuleInfo::Commentary:
-        parent = categoryCommentary;
-        break;
-      case CSwordModuleInfo::Lexicon:
-        parent = categoryLexicon;
-        break;
-      case CSwordModuleInfo::GenericBook:
-        parent = categoryBook;
-        break;
-      default:
-        parent = 0;
-        break;
-    }
-
-		//handling for special module types
-		if ((parent == categoryLexicon) && (newModule->category() == CSwordModuleInfo::Glossary)) {
-			parent = categoryGlossaries;
-		}
-		if ((parent == categoryLexicon) && (newModule->category() == CSwordModuleInfo::DailyDevotional)) {
-			parent = categoryDevotionals;
-		}
-
-		//now we know the category, find the right language group in that category
-		CLanguageMgr::Language lang = newModule->language();
-		QString langName = lang.translatedName();
-		if (!lang.isValid())
-			langName = QString::fromLatin1(newModule->module()->Lang());
-
-		QListViewItem * langFolder = parent->firstChild();
-    while( langFolder ) { //try to find language folder if it exsists
-			if (langFolder->text(0) == langName) //found right folder
-				break;
-			langFolder = langFolder->nextSibling();
-		}
-
-		if (!langFolder) { //not yet there
-			langFolder = new QListViewItem(parent, langName);
-			langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-			langFolder->setOpen(true);
-		}
-
-		QListViewItem* newItem = 0;
-    if (langFolder) {
-    	newItem = new QCheckListItem(langFolder, newModule->name(), QCheckListItem::CheckBox);
-    }
-    else { //shouldn't happen
-    	newItem = new QCheckListItem(m_installModuleListView, newModule->name(), QCheckListItem::CheckBox);
-    }
-
-    newItem->setPixmap(0, CToolClass::getIconForModule(newModule));
-    newItem->setText(1, installedModule ? installedModule->config(CSwordModuleInfo::ModuleVersion) : "");
-    newItem->setText(2, newModule->config(CSwordModuleInfo::ModuleVersion));
-    newItem->setText(3, isUpdate ? i18n("Updated") : i18n("New"));
-  }
-
-  //clean up groups
-  if (!categoryBible->childCount())
-    delete categoryBible;
-  if (!categoryCommentary->childCount())
-    delete categoryCommentary;
-  if (!categoryBook->childCount())
-    delete categoryBook;
-  if (!categoryLexicon->childCount())
-    delete categoryLexicon;
-  if (!categoryDevotionals->childCount())
-    delete categoryDevotionals;
-  if (!categoryGlossaries->childCount())
-    delete categoryGlossaries;
-}
-
-/** Connects to the chosen source. */
-void CSwordSetupDialog::slot_connectToSource(){
-//	qWarning("connectToSource - creating new widgets");
-	if (!m_installModuleListPage) { //the widgets are not yet created
-		m_installModuleListPage = new QWidget(0);
-
-		QGridLayout* layout = new QGridLayout(m_installModuleListPage, 7, 2);
-		layout->setMargin(5);
-		layout->setSpacing(10);
-
-		QLabel* installLabel = CToolClass::explanationLabel(m_installModuleListPage,
-			i18n("Install/update modules - Step 2"),
-			i18n("Please choose the modules which should be installed / updated and click the install button.")
-		);
-		layout->addMultiCellWidget(installLabel, 0,0,0,1);
-		layout->setRowStretch(0,0);
-
-		m_installWidgetStack->addWidget(m_installModuleListPage);
-		m_installModuleListPage->setMinimumSize(500,400);
-
-		//insert a list box which contains all available remote modules
-		m_installModuleListView = new KListView(m_installModuleListPage, "install modules view");
-		layout->addMultiCellWidget( m_installModuleListView, 1,6,0,1);
-		layout->setColStretch(0,5);
-		layout->setRowStretch(1,5);
-
-		m_installModuleListView->addColumn(i18n("Name"));
-		m_installModuleListView->addColumn(i18n("Installed version"));
-		m_installModuleListView->addColumn(i18n("Remote version"));
-		m_installModuleListView->addColumn(i18n("Status"));
-		m_installModuleListView->setAllColumnsShowFocus(true);
-		m_installModuleListView->setFullWidth(true);
-		m_installModuleListView->setRootIsDecorated(true);
-		connect(m_installModuleListView, SIGNAL(pressed(QListViewItem*)),
-			SLOT(slot_installModuleItemExecuted(QListViewItem*)));
-		connect(m_installModuleListView, SIGNAL(spacePressed(QListViewItem*)),
-			SLOT(slot_installModuleItemExecuted(QListViewItem*)));
-	}
-
-	//code valid for already existing and newly created widgets
-  m_installContinueButton->setEnabled(false);
-  disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource()));
-  connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules()));
-
-  populateInstallModuleListView( currentInstallSource() );
-  m_installContinueButton->setText(i18n("Install modules"));
-  m_installContinueButton->setEnabled(false);
-
-  m_installWidgetStack->raiseWidget(m_installModuleListPage);
-
-  connect( m_installBackButton, SIGNAL(clicked()), this, SLOT(slot_showInstallSourcePage()));
-  m_installBackButton->setEnabled(true);
-}
-
-/** Connects to the chosen source. */
-void CSwordSetupDialog::slot_installManageSources() {
-	CInstallSourcesMgrDialog* dlg = new CInstallSourcesMgrDialog(this);
-	dlg->exec();
-
-	populateInstallCombos(); //make sure the items are updated
-}
-
-void CSwordSetupDialog::slot_installModuleItemExecuted(QListViewItem* item) {
-	// This function enabled the Install modules button if modules are chosen
-	// If an item was clicked to be not chosen look if there are other selected items
-	// If the item was clicked to be chosen enable the button without looking at the other items
-
-	QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>(item);
-	if (item && !checkItem) //no valid item for us
-		return;
-
-	if (checkItem && checkItem->isOn()) {
-		m_installContinueButton->setEnabled(true);
-	}
-	else {
-		QListViewItemIterator it( m_installModuleListView );
-		QCheckListItem* ci = 0;
-		while (it.current()) {
-			ci = dynamic_cast<QCheckListItem*>(it.current());
-			if (ci && ci->isOn()) {
-				break;
-			}
-			it++;
-		}
-		if ( ci && ci->isOn() ) { //a module is checked in the list
-			m_installContinueButton->setEnabled(true);
-    }
-		else {
-			m_installContinueButton->setEnabled(false);
-		}
-	}
-}
-
-/** Installs chosen modules */
-void CSwordSetupDialog::slot_installModules(){
-	m_installContinueButton->setEnabled(false);
-	m_installBackButton->setEnabled(false);
-
-	//first get all chosen modules
-	QStringList moduleList;
-
-	QListViewItemIterator list_it( m_installModuleListView );
-	while ( list_it.current() ) {
-		QCheckListItem* i = dynamic_cast<QCheckListItem*>( list_it.current() );
-		if (i && i->isOn()) {
-			moduleList << list_it.current()->text(0);
-		}
-		++list_it;
-	}
-
-	const QString& message = i18n("You selected the following modules: %1.\n\nDo you really want to install them on your system?").arg(moduleList.join(", "));
-
-	if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)){  //Yes was pressed.
-    BTInstallMgr iMgr;
-		m_currentInstallMgr = &iMgr;
-    sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource());
-
-//		qWarning("installung from %s/%s", is.source.c_str(), is.directory.c_str());
-    QString target = m_targetCombo->currentText();
-
-		//make sure target/mods.d and target/modules exist
-    QDir dir(target.latin1());
-    if (!dir.exists()) {
-      dir.mkdir(target, true);
-    }
-    if (!dir.exists("modules")) {
-      dir.mkdir("modules");
-    }
-    if (!dir.exists("mods.d")) {
-      dir.mkdir("mods.d");
-    }
-
-    sword::SWMgr lMgr( target.latin1() );
-
-    //module are removed in this section of code
-		m_installedModuleCount = 0;
-    m_progressDialog = new KProgressDialog(0,0,i18n("Module installation ..."), QString::null, true);
-    m_progressDialog->progressBar()->setTotalSteps(100 * moduleList.count());
-		connect(m_progressDialog, SIGNAL(cancelClicked()), SLOT(slot_installProgressCancelClicked()));
-
-    connect(&iMgr, SIGNAL(completed(const int, const int)), SLOT(installCompleted(const int, const int)));
-
-		for ( QStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) {
-
-			m_installingModule = *it;
-
-      //check whether it's an update. If yes, remove exuisting module first
-      if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { //module found?
-        QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/";
-        QString dataPath = m->config(CSwordModuleInfo::DataPath);
-        if (dataPath.left(2) == "./") {
-          dataPath = dataPath.mid(2);
-        }
-
-        if (prefixPath.contains(dataPath)) {
-					prefixPath.remove( prefixPath.find(dataPath), dataPath.length() );	//compilcated to work with Qt 3.0
-          //prefixPath = prefixPath.replace(dataPath, ""); //old code working with Qt 3.2
-        }
-        else {
-          prefixPath = QString::fromLatin1(backend()->prefixPath);
-        }
-        sword::SWMgr mgr(prefixPath.latin1());
-        iMgr.removeModule(&mgr, m->name().latin1());
-      }
-
-      if (!m_progressDialog->wasCancelled() && BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
-        iMgr.installModule(&lMgr, 0, (*it).latin1(), &is);
-      }
-      else if (!m_progressDialog->wasCancelled()) { //local source
-        iMgr.installModule(&lMgr, is.directory.c_str(), (*it).latin1());
-      }
-    }
-		delete m_progressDialog;
-		m_progressDialog = 0;
-
-    //reload our backend because modules may have changed
-    backend()->reloadModules();
-    populateInstallModuleListView( currentInstallSource() ); //rebuild the tree
-    populateRemoveModuleListView();
-  }
-
-	m_currentInstallMgr = 0;
-	m_installBackButton->setEnabled(true);
-	slot_installModuleItemExecuted(0);
-}
-
-/** No descriptions */
-void CSwordSetupDialog::installCompleted( const int total, const int /* file */){
-	if (m_progressDialog) {
-    m_progressDialog->progressBar()->setProgress(total+100*m_installedModuleCount);
-    m_progressDialog->setLabel( i18n("[%1]: %2% complete").arg(m_installingModule).arg(total) );
-  }
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_showInstallSourcePage(){
-  connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource()));
-  disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules()));
-  m_installBackButton->setEnabled(false);
-
-	m_installContinueButton->setText(i18n("Connect to source"));
-  m_installContinueButton->setEnabled(true);
-
-  m_installWidgetStack->raiseWidget(m_installSourcePage);
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordEditClicked(){
-  if (QListViewItem* i = m_swordPathListBox->currentItem()) {
-    KURL url = KDirSelectDialog::selectDirectory(i->text(0), true);
-		if (url.isValid()) {
-			const QFileInfo fi( url.path() );
-			if (fi.exists() && fi.isWritable()) {
-				i->setText(0, url.path());
-				populateInstallCombos(); //update target list bof on install page
-			}
-			else {
-				const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, so modules can not be installed here using BibleTime. Do you want to use this directory instead of the previous value?"));
-				if (result == KMessageBox::Yes) {
-					i->setText(0, url.path());
-					populateInstallCombos(); //update target list bof on install page
-				}
-			}
-		}
-  }
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordAddClicked(){
-  KURL url = KDirSelectDialog::selectDirectory(QString::null, true);
-  if (url.isValid()) {
-		const QFileInfo fi( url.path() );
-		if (fi.exists() && fi.isWritable()) {
-	    (void)new KListViewItem(m_swordPathListBox, url.path());
-			populateInstallCombos(); //update target list bof on install page
-		}
-		else {
-			const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, so modules can not be installed here using BibleTime. Do you want to add it to the list of module directories?"));
-			if (result == KMessageBox::Yes) {
-		    (void)new KListViewItem(m_swordPathListBox, url.path());
-				populateInstallCombos(); //update target list bof on install page
-			}
-		}
-  }
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordRemoveClicked(){
-  if (QListViewItem* i = m_swordPathListBox->currentItem()) {
-    delete i;
-		populateInstallCombos(); //update target list bof on install page
-  }
-}
-
-/** Setup the path list box */
-void CSwordSetupDialog::setupSwordPathListBox(){
-  QStringList targets = BTInstallMgr::Tool::LocalConfig::targetList();
-  m_swordPathListBox->clear();
-
-  for (QStringList::iterator it = targets.begin(); it != targets.end(); ++it)  {
-    if ((*it).isEmpty()) {
-      continue;
-		}
-    new KListViewItem(m_swordPathListBox, *it);
-  }
-  m_swordPathListBox->setCurrentItem( m_swordPathListBox->firstChild() );
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordPathSelected(){
-  m_swordEditPathButton->setEnabled( m_swordPathListBox->currentItem() );
-}
-
-/*!
-    \fn CSwordSetupDialog::remoteCurrentInstallSource()
- */
-const QString CSwordSetupDialog::currentInstallSource() {
-	QString source = m_sourceCombo->currentText();
-	//source = source.remove( i18n("[Local]") + " " );
-	QString rep = i18n("[Local]") + " ";
-	int i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-	//source = source.remove( i18n("[Remote]") + " " );
-	rep = i18n("[Remote]") + " ";
-	i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-	return source;
-}
-
-void CSwordSetupDialog::slot_installProgressCancelClicked() {
-	//the cancel button of the progress dialog was clicked.
-	//m_progressDialog->wasCancelled()
-
-	//cancel possible active module installation
-	if (m_currentInstallMgr) {
-		m_currentInstallMgr->terminate = true;
-	}
-}
diff --git a/bibletime/frontend/cswordsetupdialog.h b/bibletime/frontend/cswordsetupdialog.h
deleted file mode 100644
index 2fe58f0..0000000
--- a/bibletime/frontend/cswordsetupdialog.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.h  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDSETUPDIALOG_H
-#define CSWORDSETUPDIALOG_H
-
-#include "cbtconfig.h"
-#include "util/cpointers.h"
-#include "btinstallmgr.h"
-
-//QT includes
-#include <qstring.h>
-#include <qmap.h>
-#include <qlistview.h>
-#include <qurl.h>
-
-//KDE includes
-#include <kdialogbase.h>
-#include <klistview.h>
-
-
-//Sword includes
-class QWidget;
-class QLabel;
-class QComboBox;
-class QWidgetStack;
-class QButton;
-class QPushButton;
-class QLineEdit;
-
-class KProgressDialog;
-// class KListView;
-
-class CInstallSourcesMgrDialog : public KDialogBase, public CPointers  {
-   Q_OBJECT
-
-public:
-	CInstallSourcesMgrDialog(QWidget *parent=0, const char *name=0);
-
-protected:
-
-	class InstallSourceItem : public KListViewItem {
-	public:
-		InstallSourceItem( KListView* parent );
-		InstallSourceItem( KListView* parent, sword::InstallSource );
-
-		const QUrl& url() const;
-		void setURL(const QUrl& url);
-
-		void setServer(const QString& server);
-		const QString server() const;
-
-		void setPath(const QString& server);
-		const QString path() const;
-
-		const QString& caption() const;
-		void setCaption( const QString& caption );
-
-//		const bool isEnabled() const;
-//		void setEnabled( const bool enabled );
-
-		sword::InstallSource swordInstallSource();
-
-	private:
-		void updateItem();
-
-		QUrl m_url;
-		QString m_caption;
-	};
-
-	void initRemoteSourcesPage();
-	void initLocalSourcesPage();
-	void updateRemoteURLLabel();
-
-protected slots:
-	void slot_localAddSource();
-	void slot_localRemoveSource();
-
-	void slot_remoteAddSource();
-	void slot_remoteChangeSource();
-	void slot_remoteRemoveSource();
-	void slot_remoteSourceSelectionChanged();
-	void slot_remoteCaptionChanged(const QString&);
-	void slot_remoteServerChanged(const QString&);
-	void slot_remotePathChanged(const QString&);
-
-	void slotOk();
-
-private:
-	QFrame* m_localSourcesPage;
-	KListView* m_localSourcesList;
-
-	QFrame* m_remoteSourcesPage;
-	KListView* m_remoteSourcesList;
-	QLineEdit* m_remoteCaptionEdit;
-	QLineEdit* m_remoteServerEdit;
-	QLineEdit* m_remotePathEdit;
-	QLabel* m_remoteURLLabel;
-};
-
-
-/**
-	* The Sword configuration dialog of BibleTime
-  * @author The BibleTime Team
-  */
-class CSwordSetupDialog : public KDialogBase, public CPointers  {
-   Q_OBJECT
-
-public:
-	CSwordSetupDialog(QWidget *parent=0, const char *name=0);
-
-  enum Parts {
-		Sword,
-		Install,
-		Remove
-  };
-
-  /** Opens the page which contaisn the given part ID. */
-  const bool showPart( CSwordSetupDialog::Parts ID, const bool exclusive = false );
-
-private:
-  void initSwordConfig();
-  void initInstall();
-	void initRemove();
-
-  /** Setup the path list box */
-	void setupSwordPathListBox();
-
-	void populateInstallCombos();
-
-	const QString currentInstallSource();
-
-  QFrame* m_swordConfigPage;
-  KListView* m_swordPathListBox;
-  QPushButton* m_swordEditPathButton;
-  QPushButton* m_swordAddPathButton;
-  QPushButton* m_swordRemovePathButton;
-  QStringList m_swordPathList;
-
-  QFrame* m_removePage;
-
-  QFrame* m_installPage;
-	QWidgetStack* m_installWidgetStack;
-
-	QString source;
-  QString target;
-
-	QLabel* m_sourceLabel;
-	QLabel* m_targetLabel;
-	QComboBox* m_sourceCombo;
-	QComboBox* m_targetCombo;
-
-	QMap<QString, QString> m_targetMap;
-
-	KListView* m_removeModuleListView;
-	QLabel* m_populateListNotification;
-	QPushButton* m_removeRemoveButton;
-
-  void populateRemoveModuleListView();
-  void populateInstallModuleListView(const QString& sourceName);
-
-//install module stuff
-  QPushButton* m_installBackButton;
-  QPushButton* m_installContinueButton;
-
-  QWidget* m_installModuleListPage;
-  QWidget* m_installSourcePage;
-
- 	KListView* m_installModuleListView;
-  KProgressDialog* m_progressDialog;
-  QString m_installingModule;
-  bool m_refreshedRemoteSources;
-	unsigned int m_installedModuleCount;
-
-	BTInstallMgr* m_currentInstallMgr; //pointer to the current installmgr object so we can access it in the cancel install slot
-
-private slots:
-  void slot_sourceSelected(const QString &sourceName);
-  void slot_targetSelected(const QString &targetName);
-
-	void slot_doRemoveModules();
-	void slot_removeModuleItemExecuted(QListViewItem*);
-
-	void slotOk();
-	void slotApply();
-  void slot_connectToSource();
-
-	void slot_installManageSources();
-  void slot_installModules();
-	void slot_installModuleItemExecuted(QListViewItem*);
-	void slot_installProgressCancelClicked();
-  void slot_showInstallSourcePage();
-
-  void installCompleted( const int, const int );
-  void slot_swordRemoveClicked();
-  void slot_swordAddClicked();
-  void slot_swordEditClicked();
-  void slot_swordPathSelected();
-
-signals: // Signals
-  void signalSwordSetupChanged();
-};
-
-#endif //CSWORDSETUPDIALOG_H
diff --git a/bibletime/frontend/ctooltip.cpp b/bibletime/frontend/ctooltip.cpp
deleted file mode 100644
index a147dac..0000000
--- a/bibletime/frontend/ctooltip.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/***************************************************************************
-                          ctooltip.cpp  -  description
-                             -------------------
-    begin                : Don Mai 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ctooltip.h"
-
-//Qt includes
-#include <qobject.h>
-#include <qobjectlist.h>
-#include <qtooltip.h>
-#include <qlayout.h>
-#include <qcursor.h>
-#include <qbitmap.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <dom/html_element.h>
-
-static QRect screenSize; // = QRect();
-
-CToolTip::CToolTip(QWidget *parent, const char *name ) : QFrame( 0, name, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ),
-  m_filter(false), m_parentWidget( parent ) {
-
-  connect(m_parentWidget, SIGNAL(destroyed()), SLOT(destroyObject()));
-
-  QHBoxLayout* layout = new QHBoxLayout(this,0,0);
-  layout->setResizeMode(QLayout::FreeResize);
-
-  hide();  
-  m_display = new KHTMLPart(this);
-  m_display->view()->setMarginWidth(4);
-  m_display->view()->setMarginHeight(4);
-  layout->addWidget(m_display->view());
-
-  //set the size for the tooltip now only one time, and not everytime in tip()
-  screenSize = KApplication::desktop()->geometry();
-  setMaximumHeight( int(screenSize.height()*0.6) );
-  setFixedWidth( int(screenSize.width()*0.25) );  
-  m_display->view()->setHScrollBarMode(QScrollView::AlwaysOff); //never show a horizontal bar, only the vertcal one
-
-  setPalette( QToolTip::palette() );
-  setMargin( 1 );
-  setFrameStyle( QFrame::Plain | QFrame::Box );
-  m_parentWidget->installEventFilter(this);
-  setFilter(false);
-}
-
-/** This function shows a tip with the given text. The tip disappears if the mouse moves out of the rectangle rect. */
-void CToolTip::tip( const QPoint& p, const QRect& rect, const QString& text ){
-  //m_tipRect must have global coordinates!
-  QPoint globalPos = parentWidget()->mapToGlobal(rect.topLeft());
-  m_tipRect = QRect(globalPos.x(), globalPos.y(), rect.width(), rect.height());
-
-  m_display->begin();
-  m_display->write(text);
-  m_display->end();
-
-
-  //original code
-//  show();
-//  m_display->view()->layout(); //refresh painted text etc.
-//  resize(m_display->view()->sizeHint());
-
-  // the maximum size was set in our constructor, so we won't grow too large
-  // resize((int)((float)screenSize.width()*0.6), 0);
-//  resize(int(double(screenSize.width())*0.50),1);
-
-  show();
-  m_display->view()->layout();
-    
-  // resize to the size hint,
-  // we can't grow too large because maximumSize was set in the constructor
-  resize( sizeHint().width(),  m_display->view()->height()+4 );
-    
-  // if the scrollbar is not visible position the tooltip
-  // that the tip will be hidden as soon as the mouse will be moved
-  // if the bar s visible position the tip under the mouse so moving the bar is still possible
-  const QPoint mp = (m_display->view()->verticalScrollBar()->isVisible()) ? QPoint(p.x()-10, p.y()-10) : QPoint(p.x()+10, p.y()+10);
-  QPoint pos = parentWidget()->mapToGlobal( mp );
-  QRect widgetRect = QRect(pos.x(), pos.y(), width(), height());
-  if (!KApplication::desktop()->geometry().contains(widgetRect, true)) {
-    //the tooltip would be outside of the screen, move inside the screen now
-    QRect intersect = KApplication::desktop()->geometry().intersect(widgetRect);
-    widgetRect.moveBy(-(widgetRect.width()-intersect.width()),-(widgetRect.height()-intersect.height()));
-    pos = widgetRect.topLeft();
-  }
-  move(pos);
-
-  m_display->view()->setContentsPos(0,0); //show from the bgeinning, reset any scrollbar position
-}
-
-/** Reimplementation. */
-void CToolTip::timerEvent( QTimerEvent*  ) {
-  killTimers();
-  if ( !isVisible() ) {
-    maybeTip( parentWidget()->mapFromGlobal(QCursor::pos()) );
-  }
-  else {
-    hide();
-  }
-}
-
-/** Reimplementation. */
-bool CToolTip::eventFilter( QObject *o, QEvent *e ){
-  if (o == parentWidget()) {
-    if (e->type() == QEvent::Show) {
-      setFilter(true);
-      return false;
-    }
-  }
-
-  QMouseEvent* me = dynamic_cast<QMouseEvent*>(e);  
-  switch ( e->type() ) {
-    case QEvent::MouseButtonPress: {
-      //we have not yet shown the tip, but while the timer is running for this a drag was started
-      if (me && !isVisible() && ((me->state() != NoButton) || (me->stateAfter() != Qt::NoButton))) {
-        killTimers();
-        hide();
-        break;
-      }
-
-      if ( !m_display->view()->verticalScrollBar()->isVisible()
-		||  (m_display->view()->verticalScrollBar()->isVisible() && !widgetContainsPoint(m_display->view()->verticalScrollBar(),
-            me->globalPos() )
-      ))
-    {
-        killTimers();
-        hide();
-        break;
-      }
-      break;
-    }
-      
-    case QEvent::MouseButtonRelease: {
-      //allow clicking on the scrollbar for reading the text
-      if (      m_display->view()->verticalScrollBar()->isVisible()
-          && (m_display->view()->verticalScrollBar()->draggingSlider() || widgetContainsPoint(m_display->view()->verticalScrollBar(), me->globalPos()))
-      ) {
-        break;
-      }
-      else {
-        hide();
-        break;
-      }
-      break;
-    }
-    
-    case QEvent::KeyPress: //fall through
-    case QEvent::KeyRelease: //fall though
-    case QEvent::FocusIn: //fall though
-    case QEvent::FocusOut:
-      killTimers();
-      hide();
-      break;
-
-    case QEvent::MouseMove:
-    {
-      const bool validMousePos = //true when the mouse is at a valid position, false if not. In this case hide the tooltip.
-				 widgetContainsPoint(this, me->globalPos())
-              || m_tipRect.contains( me->globalPos() )
-              || m_display->view()->verticalScrollBar()->draggingSlider(); //if the user's scrolling and moved the mouse out of the area
-
-      if (isVisible() && !validMousePos) { //mouse moved outside the visible tooltip area!
-        hide();
-        break;
-      }
-      if (isVisible() && validMousePos) { //moving withing the tooltip area or dragging the scroll bar
-        break;
-      }
-
-      if (me) {
-        if (!m_display->view()->verticalScrollBar()->draggingSlider() && //user doesn't scoll at the moment
-            ((me->state() != Qt::NoButton) || (me->stateAfter() != Qt::NoButton))) //probaby dragging at the moment - show no tip
-        {   
-          killTimers();
-          hide();
-          break;
-        }
-
-        if (QWidget* w = KApplication::widgetAt( me->globalPos(), true )) { //check whether parentWidget is visible on top
-          while ( w && (w != parentWidget()) ) {
-            if (w->isPopup()) {
-				break;
-			}
-			
-            w = w->parentWidget();
-          }
-
-          const bool validPopup = KApplication::activePopupWidget() ? (KApplication::activePopupWidget() == parentWidget()) : true;
-          if (w && (w == parentWidget()) && validPopup) { //inside the parent widget and not a popup which appears outside of parentwidget
-		  	// if we processed the event of one of parentWidget()'s childs
-		   // but we have to make sure the toplevel widget isn't a child popup of the parent widget which hides the parent
-		   // In this case the tooltip would be wrong
-		   
-            startTimer(1500);
-          }
-          else {
-            killTimers();
-            break;
-          };
-        }
-      }
-      break;
-    }
-    default:
-      break;
-  }
-  return false;
-}
-
-/** Sets the tooltip on or off. */
-void CToolTip::setFilter( const bool enable ){
-  if ( enable == m_filter ) return;  //nothing changed
-
-  if ( enable ) {
-     KApplication::kApplication()->installEventFilter( this );
-     KApplication::setGlobalMouseTracking( true );
-  }
-  else {
-     KApplication::setGlobalMouseTracking( false );
-     KApplication::kApplication()->removeEventFilter( this );
-  }
-  m_filter = enable;
-}
-
-/** A helper function which returns true if the given widget contains the global pos p. */
-const bool CToolTip::widgetContainsPoint( QWidget* const w, const QPoint& p ){
-  const QPoint origin = w->mapToGlobal(QPoint(0,0));
-  if (p.x() >= origin.x() && p.x() <= w->mapToGlobal(QPoint(w->width(),w->height())).x() ) { //X is valid
-    if (p.y() >= origin.y() && p.y() <= w->mapToGlobal(QPoint(w->width(),w->height())).y() ) { //Y is valid
-      return true;
-    }
-  }
-  return false;
-}
-
-/** No descriptions */
-void CToolTip::destroyObject(){
-  setFilter(false);
-  deleteLater();
-}
diff --git a/bibletime/frontend/ctooltip.h b/bibletime/frontend/ctooltip.h
deleted file mode 100644
index 84ca3ca..0000000
--- a/bibletime/frontend/ctooltip.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
-                          ctooltip.h  -  description
-                             -------------------
-    begin                : Don Mai 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CTOOLTIP_H
-#define CTOOLTIP_H
-
-#include <qwidget.h>
-#include <qframe.h>
-
-//KDE includes
-#include <khtml_part.h>
-#include <khtmlview.h>
-
-/** Our own ToolTip widget which uses KHTMLView to display the tooltip.
-	* Portions the code were inspired by Konqueror's tooltip code
-	* @author The BibleTime team
-  	*/
-class CToolTip : public QFrame  {
-   Q_OBJECT
-public: 
-	CToolTip(QWidget *parent=0, const char *name=0);
-//	virtual ~CToolTip();
-  /**
-  * Returns the widget this tooltip applies to. This tooltip widget is destroyed when he parent is deleted.
-  */
-  QWidget* const parentWidget() const;
-
-protected: // Protected methods
-  /**
-  * This function shows a tip with the given text.
-  * The tooltip will open at the position p on the screen. When the mouse moves out of
-  * the rectangle rect the tooltip will disappear.
-  * The point p must be in the rectangle rect, otherwise the behaviour of CToolTip will be incorrect!
-  */
-  void tip( const QPoint& p, const QRect& rect, const QString& text );
-  /**
-  * This function is called when a tooltip may be displayed at position p.
-  * Reimplement this function to manage the appearance of tooltips.
-  */
-  virtual void maybeTip( const QPoint& p ) = 0;
-
-private:
-  /**
-  * Reimplementation.
-  */
-  virtual void timerEvent( QTimerEvent* e );
-  /**
-  * Sets the tooltip on or off.
-  */
-  void setFilter( const bool enable );
-  /**
-  * Reimplementation.
-  */
-  virtual bool eventFilter( QObject *, QEvent *e );
-  /**
-  * A helper function which returns true if the given widget contains the global pos p.
-  */
-  const bool widgetContainsPoint( QWidget* const w, const QPoint& p );
-
-  bool m_filter;
-  QWidget* m_parentWidget;
-  KHTMLPart* m_display;
-  QRect m_tipRect;
-
-private slots: // Private slots
-  void destroyObject();
-};
-
-/** Returns the widget this tooltip applies to. This tooltip widget is destroyed when he parent is deleted. */
-inline QWidget* const CToolTip::parentWidget() const{
-  return m_parentWidget;
-}
-
-#endif
diff --git a/bibletime/frontend/ctooltipmanager.cpp b/bibletime/frontend/ctooltipmanager.cpp
deleted file mode 100644
index 94605aa..0000000
--- a/bibletime/frontend/ctooltipmanager.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/***************************************************************************
-                          ctooltipmanager.cpp  -  description
-                             -------------------
-    begin                : Sam Mai 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ctooltipmanager.h"
-#include "frontend/cbtconfig.h"
-
-#include "backend/creferencemanager.h"
-#include "backend/cswordkey.h"
-#include "backend/centrydisplay.h"
-
-#include "util/scoped_resource.h"
-
-//KDE includes
-#include <klocale.h>
-
-CTooltipManager::CTooltipManager(){
-}
-
-CTooltipManager::~CTooltipManager(){
-}
-
-/** Returns the tooltip text for the given hyperlink. */
-const QString CTooltipManager::textForHyperlink( const QString& link ){
-  QString moduleName;
-  QString keyName;
-	CReferenceManager::Type type;
-
- 	CReferenceManager::decodeHyperlink(link, moduleName, keyName, type);
-  if (moduleName.isEmpty()) {
-    moduleName = CReferenceManager::preferredModule( type );
-  }
-
-//  qWarning("link was %s, key is %s", link.latin1(), keyName.latin1());
-  if (moduleName.isEmpty()) {
-    QString typeName = QString::null;
-    switch (type) {
-      case CReferenceManager::Bible:
-        typeName = i18n("Bible");
-        break;
-      case CReferenceManager::Commentary:
-        typeName = i18n("Commentary");
-        break;
-      case CReferenceManager::Lexicon:
-        typeName = i18n("Lexicon");
-        break;
-      case CReferenceManager::GenericBook:
-        typeName = i18n("Book");
-        break;
-  		case CReferenceManager::MorphHebrew:
-        typeName = i18n("Hebrew morphological lexicon");
-        break;
-  		case CReferenceManager::MorphGreek:
-        typeName = i18n("Greek morphological lexicon");
-        break;
-  		case CReferenceManager::StrongsHebrew:
-        typeName = i18n("Hebrew Strong's lexicon");
-        break;
-  		case CReferenceManager::StrongsGreek:
-        typeName = i18n("Greek Strong's lexicon");
-        break;
-  		default:
-        break;
-    }
-
-  	return QString::fromLatin1("<font color=\"red\"><center><b>%1</b></center></font><hr/>%2</font>")
-      .arg(i18n("Configuration problem!"))
-      .arg(i18n("Please make sure the default module for the type <font color=\"blue\"><i>%1</i></font> is properly configured in the options dialog.")
-          .arg(typeName)
-      );
-  };
-
-  if (CSwordModuleInfo* m = backend()->findModuleByName(moduleName)) { //found a default module for the type
-    return QString::fromLatin1("<head><style type=\"text/css\">%1</style></head><b>%1</b><hr/>%2")
-      .arg(tooltipCSS(m))
-      .arg(headingText(m, keyName))
-      .arg(moduleText(moduleName, keyName)
-    );
-  }
-  else {
-    return QString::fromLatin1("<font color=\"red\"><center><b>%1</b></center>%2</font><hr/>")
-            .arg(i18n("Configuration problem!"))
-            .arg(i18n("The module <FONT COLOR=\"blue\"><I>%1</I></FONT> was not found on your system. Install the module to make this tooltip work.")
-              .arg(moduleName)
-           );
-  }
-}
-
-/** Returns the tooltip text for the given hyperlink. */
-const QString CTooltipManager::textForReference( const QString& moduleName, const QString& keyName, const QString& description){
-	CSwordModuleInfo* const module = backend()->findModuleByName(moduleName);
-  return QString::fromLatin1("<head><style type=\"text/css\">%1</style></head><b>%1 %2</b>%3<hr/>%4")
-    .arg(tooltipCSS(module))
-  	.arg(i18n("Bookmark to"))
-  	.arg(headingText(module, keyName))
-   	.arg(!description.isEmpty() ? QString::fromLatin1("<br/><font color=\"#800000\">(%1)</font><br/>").arg(description.stripWhiteSpace()) : QString::null )
-    .arg(moduleText(moduleName, keyName));
-}
-
-
-/** Returns the text for the given moduleName and key name. */
-const QString CTooltipManager::moduleText( const QString& moduleName, const QString& keyName){
-  QString text = QString::null;
-  if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-  	util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-  	key->key( keyName );
-
-    backend()->setFilterOptions( CBTConfig::getFilterOptionDefaults() );
-   	text = key->renderedText();
-
-		if (module->type() == CSwordModuleInfo::Bible || module->type() == CSwordModuleInfo::Commentary) {
-      text = QString::null;
-      sword::ListKey verses = sword::VerseKey().ParseVerseList((const char*)keyName.local8Bit(), "Genesis 1:1", true);
-			
-    	for (int i = 0; i < verses.Count(); ++i) {
-    		sword::VerseKey* element = dynamic_cast<sword::VerseKey*>(verses.GetElement(i));
-    		if (element && element->isBoundSet()) {
-     			sword::VerseKey lowerBound = element->LowerBound();
-          lowerBound.Headings(false);
-
-					sword::VerseKey upperBound = element->UpperBound();
-          upperBound.Headings(false);
-        	
-         	while (lowerBound < upperBound) {
-      			key->key( (const char*)lowerBound );
-		    		text += QString::fromLatin1("<b>%1:%2</b> %3<br/>")
-              .arg(lowerBound.Chapter())
-              .arg(lowerBound.Verse())
-              .arg(key->renderedText());
-						lowerBound++;
-          }
-          if (lowerBound == upperBound) {
-      			key->key( (const char*)lowerBound );
-		    		text += QString::fromLatin1("<b>%1:%2</b> %3<br/>")
-              .arg(lowerBound.Chapter())
-              .arg(lowerBound.Verse())
-              .arg(key->renderedText());
-          }
-				}
-    		else {
-	  			key->key( (const char*)(*verses.GetElement(i))  );
-					text += key->renderedText();
-        }
-    	}
-		}
-
-
-    const QFont font = CBTConfig::get(module->language()).second;
-    text = QString::fromLatin1("<div %1 style=\"font-family:%2; font-size:%3pt;\">")
-            .arg((module->textDirection() == CSwordModuleInfo::RightToLeft) ? "dir=\"rtl\"" : 0)
-            .arg(font.family())
-            .arg(font.pointSize())
-         + text + QString::fromLatin1("</div>");
-	}
- 	return text;
-}
-
-/** Returns the text for the tooltip beginning. */
-const QString CTooltipManager::headingText( CSwordModuleInfo* module, const QString& keyName ){
-  if (!module) {
-    return i18n("Module not set!");
-  }
-
-  const QString defaultEnding = QString::fromLatin1("  (<small>%1 \"%2\"</small>)").arg(i18n("Module")).arg(module->name());
-
-  if ((module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary)) {
-    sword::ListKey keys = sword::VerseKey().ParseVerseList((const char*)keyName.local8Bit(), sword::VerseKey("Genesis 1:1"), true);
-
-    if (keys.Count() >= 1)
-      return QString::fromLocal8Bit(keys.GetElement(0)->getRangeText()) + defaultEnding;
-    else
-      return defaultEnding;
-  }
-  else { //non-versekeys are not localized  
-    util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-
-    key->key( keyName );
-    return key->key() + defaultEnding;
-  };
-  return QString::null;
-}
-
-/** Returns the CSS data used for the tooltips. */
-const QString CTooltipManager::tooltipCSS(CSwordModuleInfo* module){
-  CEntryDisplay* const display = module ? module->getDisplay() : 0;
-  if (!display)
-    return QString::null;
-
-  QString css = QString::null;
-  for (int i = CEntryDisplay::MinType; i <= CEntryDisplay::MaxType; ++i) {
-    CEntryDisplay::StyleType type = static_cast<CEntryDisplay::StyleType>(i);
-    if (type != CEntryDisplay::Body && type != CEntryDisplay::Background) {
-      css += display->cssString( type );
-    }
-  }
-  return css;
-}
diff --git a/bibletime/frontend/ctooltipmanager.h b/bibletime/frontend/ctooltipmanager.h
deleted file mode 100644
index a1b34b2..0000000
--- a/bibletime/frontend/ctooltipmanager.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
-                          ctooltipmanager.h  -  description
-                             -------------------
-    begin                : Sam Mai 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CTOOLTIPMANAGER_H
-#define CTOOLTIPMANAGER_H
-
-//BibleTime includes
-#include "backend/cswordmoduleinfo.h"
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-
-/** Manages the tooltip texts for hyperlinks ad refereences.
-  * @author The BibleTime team
-  */
-class CTooltipManager : public CPointers {
-public: 
-  /**
-  * Returns the tooltip text for the given hyperlink.
-  */
-  static const QString textForHyperlink( const QString& link );
-	static const QString textForReference( const QString& moduleName, const QString& keyName, const QString& description);
-
-protected: // Protected methods
-  /**
-  * Returns the text for the tooltip beginning.
-  */
-  static const QString headingText(CSwordModuleInfo* const module, const QString& keyName);
-  /**
-  * Returns the text for the given moduleName and key name.
-  */
-  static const QString moduleText( const QString& moduleName, const QString& keyName);
-  /**
-  * Returns the CSS data used for the tooltips. The difference to the display CSS data is
-  * that the backgroundcolors etc. are not used.
-  */
-  static const QString tooltipCSS(CSwordModuleInfo* module);
-
-private:
-	CTooltipManager();
-	~CTooltipManager();
-};
-
-#endif
diff --git a/bibletime/frontend/display/Makefile.am b/bibletime/frontend/display/Makefile.am
deleted file mode 100644
index 7a79921..0000000
--- a/bibletime/frontend/display/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES = $(all_includes)
-
-libdisplay_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplay.a
-
-libdisplay_a_SOURCES = \
-cdisplay.cpp \
-creaddisplay.cpp \
-chtmlreaddisplay.cpp \
-cwritedisplay.cpp \
-cplainwritedisplay.cpp \
-chtmlwritedisplay.cpp
-
-all_headers = \
-cdisplay.h \
-creaddisplay.h \
-chtmlreaddisplay.h \
-cwritedisplay.h \
-cplainwritedisplay.h \
-chtmlwritedisplay.h
-
-EXTRA_DIST = $(libdisplay_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/display/Makefile.in b/bibletime/frontend/display/Makefile.in
deleted file mode 100644
index 5e06d71..0000000
--- a/bibletime/frontend/display/Makefile.in
+++ /dev/null
@@ -1,729 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libdisplay_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplay.a
-
-libdisplay_a_SOURCES = \
-cdisplay.cpp \
-creaddisplay.cpp \
-chtmlreaddisplay.cpp \
-cwritedisplay.cpp \
-cplainwritedisplay.cpp \
-chtmlwritedisplay.cpp
-
-
-all_headers = \
-cdisplay.h \
-creaddisplay.h \
-chtmlreaddisplay.h \
-cwritedisplay.h \
-cplainwritedisplay.h \
-chtmlwritedisplay.h
-
-
-EXTRA_DIST = $(libdisplay_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/display
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libdisplay_a_AR = $(AR) cru
-libdisplay_a_LIBADD =
-am_libdisplay_a_OBJECTS = cdisplay.$(OBJEXT) creaddisplay.$(OBJEXT) \
-	chtmlreaddisplay.$(OBJEXT) cwritedisplay.$(OBJEXT) \
-	cplainwritedisplay.$(OBJEXT) chtmlwritedisplay.$(OBJEXT)
-#>- libdisplay_a_OBJECTS = $(am_libdisplay_a_OBJECTS)
-#>+ 7
-libdisplay_a_final_OBJECTS = libdisplay_a.all_cpp.o 
-libdisplay_a_nofinal_OBJECTS = cdisplay.$(OBJEXT) creaddisplay.$(OBJEXT) \
-	chtmlreaddisplay.$(OBJEXT) cwritedisplay.$(OBJEXT) \
-	cplainwritedisplay.$(OBJEXT) chtmlwritedisplay.$(OBJEXT)\
-chtmlreaddisplay.moc.o chtmlwritedisplay.moc.o cdisplay.moc.o 
-@KDE_USE_FINAL_FALSE@libdisplay_a_OBJECTS = $(libdisplay_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libdisplay_a_OBJECTS = $(libdisplay_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cdisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/chtmlreaddisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/chtmlwritedisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cplainwritedisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/creaddisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cwritedisplay.Po
-#>+ 12
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/chtmlreaddisplay.moc.P $(DEPDIR)/chtmlwritedisplay.moc.P $(DEPDIR)/cdisplay.moc.P  $(DEPDIR)/libdisplay_a.all_cpp.P ./$(DEPDIR)/cdisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlreaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/creaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritedisplay.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/chtmlreaddisplay.moc.P $(DEPDIR)/chtmlwritedisplay.moc.P $(DEPDIR)/cdisplay.moc.P ./$(DEPDIR)/cdisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlreaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/creaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritedisplay.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libdisplay_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libdisplay_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/display/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/display/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/display/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libdisplay.a: $(libdisplay_a_OBJECTS) $(libdisplay_a_DEPENDENCIES) 
-	-rm -f libdisplay.a
-	$(libdisplay_a_AR) libdisplay.a $(libdisplay_a_OBJECTS) $(libdisplay_a_LIBADD)
-	$(RANLIB) libdisplay.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlreaddisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlwritedisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cplainwritedisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creaddisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwritedisplay.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-chtmlreaddisplay.moc.cpp: $(srcdir)/chtmlreaddisplay.h
-	$(MOC) $(srcdir)/chtmlreaddisplay.h -o chtmlreaddisplay.moc.cpp
-
-#>+ 2
-mocs: chtmlreaddisplay.moc.cpp
-
-#>+ 3
-chtmlwritedisplay.moc.cpp: $(srcdir)/chtmlwritedisplay.h
-	$(MOC) $(srcdir)/chtmlwritedisplay.h -o chtmlwritedisplay.moc.cpp
-
-#>+ 2
-mocs: chtmlwritedisplay.moc.cpp
-
-#>+ 3
-cdisplay.moc.cpp: $(srcdir)/cdisplay.h
-	$(MOC) $(srcdir)/cdisplay.h -o cdisplay.moc.cpp
-
-#>+ 2
-mocs: cdisplay.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  chtmlreaddisplay.moc.cpp chtmlwritedisplay.moc.cpp cdisplay.moc.cpp
-
-#>+ 2
-KDE_DIST=cplainwritedisplay.h cwritedisplay.h cdisplay.h chtmlwritedisplay.h chtmlreaddisplay.h creaddisplay.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/display/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/display/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libdisplay_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cdisplay.cpp $(srcdir)/creaddisplay.cpp $(srcdir)/chtmlreaddisplay.cpp $(srcdir)/cwritedisplay.cpp $(srcdir)/cplainwritedisplay.cpp $(srcdir)/chtmlwritedisplay.cpp chtmlreaddisplay.moc.cpp cdisplay.moc.cpp chtmlwritedisplay.moc.cpp 
-	@echo 'creating libdisplay_a.all_cpp.cpp ...'; \
-	rm -f libdisplay_a.all_cpp.files libdisplay_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libdisplay_a.all_cpp.final; \
-	for file in cdisplay.cpp creaddisplay.cpp chtmlreaddisplay.cpp cwritedisplay.cpp cplainwritedisplay.cpp chtmlwritedisplay.cpp chtmlreaddisplay.moc.cpp cdisplay.moc.cpp chtmlwritedisplay.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libdisplay_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdisplay_a.all_cpp.final; \
-	done; \
-	cat libdisplay_a.all_cpp.final libdisplay_a.all_cpp.files > libdisplay_a.all_cpp.cpp; \
-	rm -f libdisplay_a.all_cpp.final libdisplay_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libdisplay_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp
deleted file mode 100644
index 5fe8f4e..0000000
--- a/bibletime/frontend/display/cdisplay.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/***************************************************************************
-                          cdisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cdisplay.h"
-#include "chtmlreaddisplay.h"
-#include "cplainwritedisplay.h"
-#include "chtmlwritedisplay.h"
-
-#include "backend/creferencemanager.h"
-
-#include "util/ctoolclass.h"
-
-
-//Qt includes
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-
-
-CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {
-}
-
-void CDisplayConnections::selectAll() {
-	m_display->selectAll();
-}
-
-void CDisplayConnections::saveAsHTML() {
-	m_display->save(CDisplay::HTMLText, CDisplay::Document);
-}
-
-void CDisplayConnections::saveAsPlain() {
-	m_display->save(CDisplay::PlainText, CDisplay::Document);
-}
-
-/** Emits the signal. */
-void CDisplayConnections::emitReferenceClicked( const QString& module, const QString& key){
-	emit referenceClicked( module, key );
-}
-
-/** Emits the signal. */
-void CDisplayConnections::emitReferenceDropped( const QString& key){
- 	emit referenceDropped(key);
-}
-
-/** Emits the signal. */
-void CDisplayConnections::emitTextChanged(){
- 	emit textChanged();
-}
-
-/** No descriptions */
-void CDisplayConnections::copyAll(){
-	m_display->copy(CDisplay::PlainText, CDisplay::Document);
-}
-
-/** No descriptions */
-void CDisplayConnections::copySelection(){
-	m_display->copy(CDisplay::PlainText, CDisplay::SelectedText);
-}
-
-void CDisplayConnections::printAll() {
-	m_display->print(CDisplay::Document);
-}
-
-void CDisplayConnections::printAnchorWithText() {
-	m_display->print(CDisplay::AnchorWithText);
-}
-
-void CDisplayConnections::copyAnchorOnly(){
-	m_display->copy(CDisplay::PlainText, CDisplay::AnchorOnly);
-}
-
-void CDisplayConnections::copyAnchorTextOnly(){
-	m_display->copy(CDisplay::PlainText, CDisplay::AnchorTextOnly);
-}
-
-void CDisplayConnections::copyAnchorWithText(){
-	m_display->copy(CDisplay::PlainText, CDisplay::AnchorWithText);
-}
-
-void CDisplayConnections::saveAnchorWithText(){
-	m_display->save(CDisplay::PlainText, CDisplay::AnchorWithText);
-}
-
-void CDisplayConnections::clear(){
-  m_display->setText(QString::null);
-}
-
-/*----------------------*/
-
-CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, QWidget* parent ) {
-  return new CHTMLReadDisplay(readWindow, parent);
-}
-
-CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, QWidget* parent ) {
-//  qWarning("CDisplay::createWriteInstance");
-  if (type == PlainTextDisplay) {
-    return new CPlainWriteDisplay(writeWindow, parent);
-  }
-  else {
-    return new CHTMLWriteDisplay(writeWindow, parent);
-  };
-}
-
-
-CDisplay::CDisplay(CDisplayWindow* parent) :
-  m_parentWindow(parent),
-  m_connections( new CDisplayConnections( this ) ),
-  m_popup(0)
-{
-}
-
-CDisplay::~CDisplay(){
-  delete m_connections;
-}
-
-const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part  ) {
-  const QString content = text(format, part);
-
-  QClipboard* cb = KApplication::clipboard();
-  cb->setText(content);
-  return true;
-}
-
-const bool CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part ) {
-//  qWarning("CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part  )");
-  const QString content = text(format, part);
-  QString filter = QString::null;
-
-  switch (format) {
-    case HTMLText:
-      filter = QString::fromLatin1("*.html *.htm | ") + i18n("HTML files") + QString::fromLatin1("\n *.* | All files (*.*)");
-      break;
-    case PlainText:
-      filter = QString::fromLatin1("*.txt | ") + i18n("Text files") + QString::fromLatin1("\n *.* | All files (*.*)");
-      break;
-  };
-
-  const QString filename = KFileDialog::getSaveFileName(QString::null, filter, 0, i18n("Save document ..."));
-  if (!filename.isEmpty()) {
-    CToolClass::savePlainFile(filename, content);
-  }
-  return true;
-}
-
-/** Emits the signal which used when a reference was clicked. */
-void CDisplay::emitReferenceClicked( const QString& reference ){
-  QString module;
-  QString key;
-  CReferenceManager::Type type;
-  /*const bool ok = */ CReferenceManager::decodeHyperlink(reference, module, key, type);
-  if (module.isEmpty()) {
-    module = CReferenceManager::preferredModule( type );
-  }
-  m_connections->emitReferenceClicked(module, key);
-}
-
-/** Used when a reference was dropped onto the widget. */
-void CDisplay::emitReferenceDropped( const QString& reference ){
-  QString module;
-  QString key;
-  CReferenceManager::Type type;
-  /*const bool ok = */ CReferenceManager::decodeHyperlink(reference, module, key, type);
-//  if (module.isEmpty()) {
-//    module = CReferenceManager::preferredModule( type );
-//  }
-
-  m_connections->emitReferenceDropped(key);
-}
-
-/** Returns the connections obect used for signas and slots. */
-CDisplayConnections* const CDisplay::connectionsProxy() const{
-	return m_connections;
-}
-
-CDisplayWindow* const CDisplay::parentWindow() const {
- 	return m_parentWindow;
-}
-
-/** Installs the popup which should be opened when the right mouse button was pressed. */
-void CDisplay::installPopup( QPopupMenu* popup ){
-  m_popup = popup;
-}
-
-/** Returns the popup menu which was set by installPopupMenu() */
-QPopupMenu* const CDisplay::installedPopup(){
-  Q_ASSERT(m_popup);
-	return m_popup;
-}
diff --git a/bibletime/frontend/display/cdisplay.h b/bibletime/frontend/display/cdisplay.h
deleted file mode 100644
index 4394ea6..0000000
--- a/bibletime/frontend/display/cdisplay.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/***************************************************************************
-                          cdisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CDISPLAY_H
-#define CDISPLAY_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qobject.h>
-#include <qstring.h>
-
-
-class CDisplayConnections;
-class CReadWindow;
-class CWriteWindow;
-
-class CDisplayWindow;
-class CReadDisplay;
-class CWriteDisplay;
-
-
-class QPopupMenu;
-
-/** The base class for all display widgets.
-  * @author The BibleTime team
-  */
-class CDisplay : public CPointers {
-public:
-  enum WriteDisplayType {
-    HTMLDisplay = 0,
-    PlainTextDisplay
-  };
-
-	static CReadDisplay* createReadInstance(CReadWindow* readWindow, QWidget* parent = 0);
-	static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, QWidget* parent = 0 );
-
-  enum TextType {
-    HTMLText, /* Used for HTML markup */
-    PlainText /* Plain text without links etc. */
-  };
-  enum TextPart {
-    Document, /* All text */
-    SelectedText, /* Only the selected text */
-    AnchorOnly,
-    AnchorTextOnly,
-    AnchorWithText
-  };
-
-  /**
-  * Copies the given text with the specified format into the applications clipboard.
-  */
-  virtual const bool copy( const CDisplay::TextType format, const CDisplay::TextPart part );
-  /**
-  * Saves the given text with the specified format into the applications clipboard.
-  */
-  virtual const bool save( const CDisplay::TextType format, const CDisplay::TextPart part );
-
-  //the pure virtual methods of this base class
-
-  /** Returns the text in the given format.
-  *
-  */
-  virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ) = 0;
-  /**
-  * Sets the new text for this display widget.
-  */
-  virtual void setText( const QString& newText ) = 0;
-  /**
-  * Returns true if the display widget has a selection. Otherwise false.
-  */
-  virtual const bool hasSelection() = 0;
-  /**
-  * Returns the view of this display widget.
-  */
-  virtual QWidget* view() = 0;
-  /**
-	*	 Selects the document text.
-	*/
-  virtual void selectAll() = 0;
-  /**
-  * Returns the connections obect used for signas and slots.
-  */
-  virtual CDisplayConnections* const connectionsProxy() const;
-  /**
-  * Returns the parent window used for this display widget.
-  */
-  CDisplayWindow* const parentWindow() const;
-  virtual void print( const CDisplay::TextPart ) = 0;
-  /**
-  * Installs the popup which should be opened when the right mouse button was pressed.
-  */
-  void installPopup( QPopupMenu* popup );
-  /**
-  * Returns the popup menu which was set by installPopupMenu()
-  */
-  QPopupMenu* const installedPopup();
-
-protected:
-  /**
-  * Used when a reference was dropped onto the widget.
-  */
-  void emitReferenceDropped( const QString& reference );
-  /**
-  * Emits the signal which used when a reference was clicked.
-  */
-  void emitReferenceClicked( const QString& reference );
-
-protected:
-	CDisplay(CDisplayWindow* parent);
-	virtual ~CDisplay();
-
-private:
- 	CDisplayWindow* m_parentWindow;
-	CDisplayConnections* m_connections;
-  QPopupMenu* m_popup;  
-};
-
-class CDisplayConnections : public QObject {
-	Q_OBJECT
-public:	
-	CDisplayConnections( CDisplay* parent );
-
-public slots:
-  virtual void selectAll();
-	void emitReferenceClicked( const QString& module, const QString& key);
-	void emitReferenceDropped( const QString& key );
-	void emitTextChanged();
-
-  //stuff which works in every CDisplay
-  void saveAsPlain();
-  void saveAsHTML();
-  void saveAnchorWithText();
-
-  void printAll();
-  void printAnchorWithText();
-
-  void copySelection();
-  void copyAll();
-  void copyAnchorWithText();
-  void copyAnchorTextOnly();
-  void copyAnchorOnly();
-
-  void clear();
-
-signals:
-  void referenceClicked(const QString& module, const QString& key);
-  void referenceDropped(const QString& key);
-  void textChanged();
-
-private:
-  CDisplay* m_display;
-
-	struct {
-		QString module;
-		QString key;
-	} m_referenceClickedCache;
-};
-
-#endif
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
deleted file mode 100644
index 7241f3a..0000000
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/***************************************************************************
-                          chtmlreaddisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "chtmlreaddisplay.h"
-
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-#include "backend/creferencemanager.h"
-#include "backend/cswordkey.h"
-
-#include "util/ctoolclass.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/ctooltipmanager.h"
-#include "frontend/cdragdropmgr.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qcursor.h>
-#include <qscrollview.h>
-#include <qwidget.h>
-#include <qdragobject.h>
-#include <qpopupmenu.h>
-#include <qlayout.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <khtmlview.h>
-#include <kglobalsettings.h>
-#include <khtml_events.h>
-
-#include <dom/dom2_range.h>
-#include <dom/html_element.h>
-#include <dom/dom2_traversal.h>
-
-CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, QWidget* parentWidget) : KHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), readWindow ? readWindow : parentWidget), CReadDisplay(readWindow) {
-  setDNDEnabled(false);
-  m_view->setDragAutoScroll(false);
-}
-
-CHTMLReadDisplay::~CHTMLReadDisplay(){
-}
-
-const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDisplay::TextPart part) {
-  switch (part) {
-    case Document: {
-      if (format == HTMLText)
-        return document().toHTML();
-      else {
-        return htmlDocument().body().innerText().string().latin1();
-      }
-		}
-
-    case SelectedText: {
-			if (!hasSelection())
-   			return QString::null;
-
-      if (!hasSelection()) {
-      	return QString::null;
-      }
-      else if (format == HTMLText) {
-        DOM::Range range = selection();
-        return range.toHTML().string();
-      }
-      else { //plain text requested
-        return selectedText();
-      }
-		}
-
-  	case AnchorOnly: {
-			QString moduleName;
-   		QString keyName;
-     	CReferenceManager::Type type;
-      CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
-      
-     	return keyName;
-    }
-
-		case AnchorTextOnly: {
-			QString moduleName;
-   		QString keyName;
-     	CReferenceManager::Type type;
-      CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
-
-      if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-				util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-    		key->key( keyName );
-
-      	return key->strippedText();
-   		}
-     	return QString::null;
-    }
-
-    case AnchorWithText: {
-			QString moduleName;
-   		QString keyName;
-     	CReferenceManager::Type type;
-      CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
-
-      if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-				util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-    		key->key( keyName );
-
-      	return QString::fromLatin1("%1\n(%2, %3)")
-          .arg(key->strippedText())
-          .arg(key->key())
-          .arg(key->module()->name());
-   		}
-     	return QString::null;
-    }
-    default:
-      return QString::null;
-  }
-}
-
-void CHTMLReadDisplay::setText( const QString& newText ) {
-  begin();
-  write(newText);
-  end();
-}
-
-/** No descriptions */
-const bool CHTMLReadDisplay::hasSelection(){
-  return KHTMLPart::hasSelection();
-}
-
-
-/** Reimplementation. */
-QScrollView* CHTMLReadDisplay::view(){
-  return KHTMLPart::view();
-}
-
-void CHTMLReadDisplay::selectAll() {
-  KHTMLPart::selectAll();
-}
-
-/** No descriptions */
-void CHTMLReadDisplay::moveToAnchor( const QString& anchor ){
-	gotoAnchor(anchor);
-}
-
-void CHTMLReadDisplay::urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args){
-  KHTMLPart::urlSelected(url, button, state, _target, args);
-  m_urlWorkaroundData.doWorkaround = false;
-
-  if (!url.isEmpty() && CReferenceManager::isHyperlink(url)) {
-    QString module;
-    QString key;
-    CReferenceManager::Type type;
-    CReferenceManager::decodeHyperlink(url, module, key, type);
-    if (module.isEmpty()) {
-      module = CReferenceManager::preferredModule( type );
-		}
-
-    // we have to use this workaround, otherwise the widget would scroll because it was interrupted
-    // between mouseClick and mouseRelease (I guess)
-    m_urlWorkaroundData.doWorkaround = true;
-    m_urlWorkaroundData.url = url;
-    m_urlWorkaroundData.state =  state;
-		m_urlWorkaroundData.button = button;
-		m_urlWorkaroundData.target = _target;
-		m_urlWorkaroundData.args = args;
-		m_urlWorkaroundData.module = module;
-		m_urlWorkaroundData.key = key;
-  }
-  else if (!url.isEmpty() && url.left(1) == "#") { //anchor
-    moveToAnchor(url.mid(1));
-  }
-}
-
-/** Reimplementation. */
-void CHTMLReadDisplay::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ){
-  KHTMLPart::khtmlMouseReleaseEvent(event);
-
-  m_dndData.mousePressed = false;
-  m_dndData.isDragging = false;
-  m_dndData.node = DOM::Node();
-  m_dndData.anchor = DOM::DOMString();
-
-  if (m_urlWorkaroundData.doWorkaround) {
-    m_urlWorkaroundData.doWorkaround = false;
-    connectionsProxy()->emitReferenceClicked(m_urlWorkaroundData.module, m_urlWorkaroundData.key);
-  }
-}
-
-void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ){
-  m_dndData.node = DOM::Node();
-  m_dndData.anchor = DOM::DOMString();
-  m_dndData.mousePressed = false;
-  m_dndData.isDragging = false;
-
-  if (event->qmouseEvent()->button() == Qt::RightButton) {
-    setActiveAnchor( event->url().string() );
-  }
-  else if (event->qmouseEvent()->button() == Qt::LeftButton) {
-    m_dndData.node = event->innerNode();
-    m_dndData.anchor = event->url();
-    m_dndData.mousePressed = true;
-    m_dndData.isDragging = false;
-    m_dndData.startPos = QPoint(event->x(), event->y());
-    m_dndData.selection = selectedText();
-
-    if (!m_dndData.node.isNull()) { //we drag a valid link
-      m_dndData.dragType = DNDData::Link;
-    }
-  }
-
-  KHTMLPart::khtmlMousePressEvent(event);
-}
-
-/** Reimplementation for our drag&drop system. */
-void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ){
-  if( !(e->qmouseEvent()->state() & LeftButton)) { //left mouse button not pressed
-    KHTMLPart::khtmlMouseMoveEvent(e);
-    return;
-  }
-
-  const int delay = KGlobalSettings::dndEventDelay();
-  QPoint newPos = QPoint(e->x(), e->y());
-
-  if ( (newPos.x() > m_dndData.startPos.x()+delay || newPos.x() < (m_dndData.startPos.x()-delay) ||
-       newPos.y() > m_dndData.startPos.y()+delay || newPos.y() < (m_dndData.startPos.y()-delay)) &&
-       !m_dndData.isDragging && m_dndData.mousePressed  )
-  {
-    QDragObject* d = 0;
-    if (!m_dndData.anchor.isEmpty() && m_dndData.dragType == DNDData::Link && !m_dndData.node.isNull() ) {
-    // create a new bookmark drag!
-      QString module = QString::null;
-    	QString key = QString::null;
-    	CReferenceManager::Type type;
-    	if ( !CReferenceManager::decodeHyperlink(m_dndData.anchor.string(), module, key, type) )
-    		return;
-      
-      CDragDropMgr::ItemList dndItems;
-      dndItems.append( CDragDropMgr::Item(module, key, QString::null) ); //no description!
-      d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport());
-    }
-    else if (m_dndData.dragType == DNDData::Text && !m_dndData.selection.isEmpty()) {    // create a new plain text drag!
-      CDragDropMgr::ItemList dndItems;
-      dndItems.append( CDragDropMgr::Item(m_dndData.selection) ); //no description!
-      d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport());
-    }
-
-    if (d) {
-      m_dndData.isDragging = true;
-      m_dndData.mousePressed = false;
-
-      //first make a virtual mouse click to end the selection, it it's in progress
-      QMouseEvent e(QEvent::MouseButtonRelease, QPoint(0,0), Qt::LeftButton, Qt::LeftButton);
-      KApplication::sendEvent(view()->viewport(), &e);
-      d->drag();
-    }
-  }
-
-  KHTMLPart::khtmlMouseMoveEvent(e);
-}
-/* -------------------------- */
-CHTMLReadDisplayView::ToolTip::ToolTip(CHTMLReadDisplayView* view) : CToolTip(view), m_view( view ) {
-};
-
-/** Decides whether a tooltip should be shown. */
-void CHTMLReadDisplayView::ToolTip::maybeTip( const QPoint& /*p*/ ){
-//  qWarning("CHTMLReadDisplayView::ToolTip::maybeTip( const QPoint& p )");
-  DOM::Node node = m_view->part()->nodeUnderMouse();
-  if (node.isNull())
-  	return;
-
-  DOM::Node linkNode = node;
-  do {
-    if (!linkNode.isNull() && linkNode.nodeName().string().upper() == "A" ) { //found right node
-      if (linkNode.hasAttributes()) {
-        QString link = QString::null;
-        DOM::NamedNodeMap attributes = linkNode.attributes();
-        for (unsigned int i = 0; i < attributes.length(); i++) {
-          if (attributes.item(i).nodeName().string().upper() == "HREF") {
-            link = attributes.item(i).nodeValue().string();
-            break;
-          }
-        }
-
-        const QString tooltipText = CTooltipManager::textForHyperlink( link );
-        if (!tooltipText.isEmpty()) {
-          QRect rect = linkNode.getRect();
-          rect.setX( m_view->mapFromGlobal(QCursor::pos()).x() );
-          rect.setY( m_view->mapFromGlobal(QCursor::pos()).y() );
-	        tip( m_view->mapFromGlobal(QCursor::pos()), rect, tooltipText );
-        }
-        break;
-      }
-    }
-  } while ( !(linkNode = linkNode.parentNode()).isNull() );
-}
-
-// ---------------------
-
-CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, QWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) {
-  viewport()->setAcceptDrops(true);
-  setMarginWidth(4);
-  setMarginHeight(4);
-};
-
-
-/** Opens the popupmenu at the given position. */
-void CHTMLReadDisplayView::popupMenu( const QString& url, const QPoint& pos){
- 	if (!url.isEmpty()) {
-//    qWarning(url.latin1());
-  	m_display->setActiveAnchor(url);
-	}
- 	if (QPopupMenu* popup = m_display->installedPopup()) {
-	 	popup->exec(pos);
-  }
-}
-
-/** Reimplementation from QScrollView. Sets the right slots */
-void CHTMLReadDisplayView::polish(){
-  KHTMLView::polish();
-  connect( part(), SIGNAL(popupMenu(const QString&, const QPoint&)),
-    this, SLOT(popupMenu(const QString&, const QPoint&)));
-
-  (void)new ToolTip(this);
-}
-
-/** Reimplementatiob from QScrollView. */
-void CHTMLReadDisplayView::contentsDropEvent( QDropEvent* e ){
-  if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) {
-    CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e);
-    CDragDropMgr::Item item = dndItems.first();  
-    e->acceptAction();
-    m_display->connectionsProxy()->emitReferenceDropped(item.bookmarkKey());
-    return;
-  };
-
-  //don't accept the action!
-  e->acceptAction(false);
-  e->ignore();
-}
-
-/** Reimplementation from QScrollView. */
-void CHTMLReadDisplayView::contentsDragEnterEvent( QDragEnterEvent* e ){
-  if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) {
-    e->acceptAction();
-    return;
-  }
-  e->acceptAction(false);
-  e->ignore();
-}
-
diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h
deleted file mode 100644
index 2159e2c..0000000
--- a/bibletime/frontend/display/chtmlreaddisplay.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/***************************************************************************
-                          chtmlreaddisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CHTMLREADDISPLAY_H
-#define CHTMLREADDISPLAY_H
-
-//BibleTime includes
-#include "creaddisplay.h"
-#include "frontend/ctooltip.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qwidget.h>
-
-//KDE includes
-#include <khtml_part.h>
-#include <khtmlview.h>
-#include <kparts/browserextension.h>
-
-class CHTMLReadDisplayView;
-
-/** The implementation for the HTML read display.
-  * @author The BibleTime team
-  */
-class CHTMLReadDisplay : public KHTMLPart, public CReadDisplay {
-  Q_OBJECT
-public:
-  //reimplemented functions from CDisplay
-  /**
-  * Returns the right text part in the specified format.
-  */
-  virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document );
-  /**
-  * Sets the new text for this display widget.
-  */
-  virtual void setText( const QString& newText );
-  virtual const bool hasSelection();
-  /**
-  * Reimplementation.
-  */
-  virtual QScrollView* view();
-  virtual void selectAll();
-  virtual void moveToAnchor( const QString& anchor );
-
-protected:
-	friend class CDisplay;
- 	CHTMLReadDisplay( CReadWindow* readWindow, QWidget* parent = 0 );
-	virtual ~CHTMLReadDisplay();
-
-	virtual void urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args);
-  /**
-  * Reimplementation.
-  */
-  virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event );
-	virtual void khtmlMousePressEvent( khtml::MousePressEvent* event );
-	virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent* e );
-
- 	struct DNDData {
-  	bool mousePressed;
-   	bool isDragging;
-    DOM::Node node;
-    DOM::DOMString anchor;
-    QString selection;
-    QPoint startPos;
-    enum DragType {
-			Link,
-      Text
-    } dragType;
- 	} m_dndData;
-
-private:
-	CHTMLReadDisplayView* m_view;	
- 	struct URLWorkaroundData {
-    bool doWorkaround;
-    QString url;
-    int button;
-    int state;
-    QString target;
-    KParts::URLArgs args;
-
-    QString module;
-    QString key;
- 	} m_urlWorkaroundData;
-};
-
-class CHTMLReadDisplayView : public KHTMLView, public CPointers {
-  Q_OBJECT
-protected: // Protected methods
-	friend class CHTMLReadDisplay;
-
-  class ToolTip : public CToolTip {
-  public:
-    ToolTip(CHTMLReadDisplayView* parent);
-  protected: // Protected methods
-    /**
-    * Decides whether a tooltip should be shown.
-    */
-    virtual void maybeTip( const QPoint& );
-  private:
-    CHTMLReadDisplayView* m_view;
-  };
-
-  CHTMLReadDisplayView(CHTMLReadDisplay* display, QWidget* parent);
-  /**
-  * Reimplementation from QScrollView. Sets the right slots
-  */
-  virtual void polish();
-  /**
-  * Reimplementatiob from QScrollView.
-  */
-  virtual void contentsDropEvent( QDropEvent* );
-  /**
-  * Reimplementatiob from QScrollView.
-  */
-  virtual void contentsDragEnterEvent( QDragEnterEvent* );
-
-protected slots: // Protected slots
-  /**
-  * Opens the popupmenu at the given position.
-  */
-  void popupMenu( const QString&, const QPoint& );
-
-private:
-  CHTMLReadDisplay* m_display;
-};
-
-#endif
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
deleted file mode 100644
index 2f21112..0000000
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/***************************************************************************
-                          chtmlwritedisplay.cpp  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "chtmlwritedisplay.h"
-
-#include "frontend/displaywindow/cwritewindow.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qpopupmenu.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-//KDE includes
-#include <kaction.h>
-#include <ktoolbar.h>
-#include <klocale.h>
-#include <kfontcombo.h>
-#include <kcolorbutton.h>
-#include <kpopupmenu.h>
-
-CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent)
-  : CPlainWriteDisplay(parentWindow,parent)
-{
-  m_actions.bold = 0;
-  m_actions.italic = 0;
-  m_actions.underline = 0;
-  
-  m_actions.selectAll = 0;
-  
-  setTextFormat(Qt::RichText);
-  setAcceptDrops(true);
-  viewport()->setAcceptDrops(true);
-
-}
-
-CHTMLWriteDisplay::~CHTMLWriteDisplay(){
-}
-
-const QString CHTMLWriteDisplay::plainText() {
-  return QTextEdit::text();
-};
-
-void CHTMLWriteDisplay::toggleBold() {
-  setBold( m_actions.bold->isChecked() );
-};
-
-void CHTMLWriteDisplay::toggleItalic() {
-  setItalic( m_actions.italic->isChecked() );
-};
-
-void CHTMLWriteDisplay::toggleUnderline() {
-  setUnderline( m_actions.underline->isChecked() );
-};
-
-
-void CHTMLWriteDisplay::alignLeft() {
-  setAlignment(Qt::AlignLeft);
-};
-
-void CHTMLWriteDisplay::alignCenter() {
-  setAlignment(Qt::AlignHCenter);
-};
-
-void CHTMLWriteDisplay::alignRight() {
-  setAlignment(Qt::AlignRight);
-};
-
-
-/** The text's alignment changed. Enable the right buttons. */
-void CHTMLWriteDisplay::slotAlignmentChanged( int a ){
-  bool alignLeft = false;
-  bool alignCenter = false;
-  bool alignRight = false;
-//  bool alignJustify = false;
-
-  if (a & Qt::AlignLeft) {
-    alignLeft = true;
-  }
-  else if ((a & Qt::AlignHCenter) || (a & Qt::AlignCenter)) {
-    alignCenter = true;
-  }
-  else if (a & Qt::AlignRight) {
-    alignRight = true;
-  }
-//  else if (a & Qt::AlignJustify) {
-//    alignJustify = true;
-//  }
-  else {
-    alignLeft = true;
-    qWarning("unknown alignment %i", a);
-  }
-
-  m_actions.alignLeft->setChecked( alignLeft );
-  m_actions.alignCenter->setChecked( alignCenter );
-  m_actions.alignRight->setChecked( alignRight );    
-//  m_actions.alignJustify->setChecked( alignJustify );
-}
-
-
-/** Is called when a new color was selected. */
-void CHTMLWriteDisplay::slotColorSelected( const QColor& c){
-  setColor( c );
-}
-
-/** Is called when a text with another color was selected. */
-void CHTMLWriteDisplay::slotColorChanged(const QColor& c){
-  m_colorButton->setColor(c);
-}
-
-
-void CHTMLWriteDisplay::slotFontChanged( const QFont& font ) {
-  m_actions.fontChooser->setFont( font.family() );
-  m_actions.fontSizeChooser->setFontSize( font.pointSize() );
-
-  m_actions.bold->setChecked( font.bold() );
-  m_actions.italic->setChecked( font.italic() );
-  m_actions.underline->setChecked( font.underline() );
-};
-
-void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions) {
-  m_actions.fontChooser = new KFontAction( i18n("Choose a font"),
-    CResMgr::displaywindows::writeWindow::underlinedText::accel,
-    actions,
-		CResMgr::displaywindows::writeWindow::fontFamily::actionName
-  );
-  m_actions.fontChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontFamily::tooltip );
-  m_actions.fontChooser->setWhatsThis( CResMgr::displaywindows::writeWindow::fontFamily::whatsthis );
-  m_actions.fontChooser->plug(bar);
-  connect(m_actions.fontChooser, SIGNAL(activated(const QString&)), this, SLOT(setFamily(const QString&)));
-
-
-  m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"),
-    CResMgr::displaywindows::writeWindow::fontSize::accel,
-    actions,
-		CResMgr::displaywindows::writeWindow::fontSize::actionName
-  );
-  m_actions.fontSizeChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontSize::tooltip );
-  m_actions.fontSizeChooser->setWhatsThis( CResMgr::displaywindows::writeWindow::fontSize::whatsthis );
-  m_actions.fontSizeChooser->plug(bar);
-  connect(m_actions.fontSizeChooser, SIGNAL(fontSizeChanged(int)), this, SLOT(setPointSize(int)));
-
-  m_colorButton = new KColorButton(bar);
-  connect(m_colorButton, SIGNAL(changed(const QColor&)), this, SLOT(slotColorSelected(const QColor&)));
-  bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton);
-  QToolTip::add(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip );
-  QWhatsThis::add(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::whatsthis );
-
-
-  (new KActionSeparator())->plug(bar); //seperate font options from formatting buttons
-
- 	m_actions.bold = new KToggleAction( i18n("Bold"),
-    CResMgr::displaywindows::writeWindow::boldText::icon,
-    CResMgr::displaywindows::writeWindow::boldText::accel,
-    this, SLOT(toggleBold()),
-    actions,
-		CResMgr::displaywindows::writeWindow::boldText::actionName
-  );
-  m_actions.bold->setToolTip( CResMgr::displaywindows::writeWindow::boldText::tooltip );
-  m_actions.bold->setWhatsThis( CResMgr::displaywindows::writeWindow::boldText::whatsthis );
-  m_actions.bold->plug(bar);
-
- 	m_actions.italic = new KToggleAction( i18n("Italic"),
-    CResMgr::displaywindows::writeWindow::italicText::icon,
-    CResMgr::displaywindows::writeWindow::italicText::accel,
-    this, SLOT(toggleItalic()),
-    actions,
-		CResMgr::displaywindows::writeWindow::italicText::actionName
-  );
-  m_actions.italic->setToolTip( CResMgr::displaywindows::writeWindow::italicText::tooltip );
-  m_actions.italic->setWhatsThis( CResMgr::displaywindows::writeWindow::italicText::whatsthis );
-  m_actions.italic->plug(bar);
-
- 	m_actions.underline = new KToggleAction( i18n("Underline"),
-    CResMgr::displaywindows::writeWindow::underlinedText::icon,
-    CResMgr::displaywindows::writeWindow::underlinedText::accel,
-    this, SLOT(toggleUnderline()),
-    actions,
-		CResMgr::displaywindows::writeWindow::underlinedText::actionName
-  );
-  m_actions.underline->setToolTip( CResMgr::displaywindows::writeWindow::underlinedText::tooltip );
-  m_actions.underline->setWhatsThis( CResMgr::displaywindows::writeWindow::underlinedText::whatsthis );
-  m_actions.underline->plug(bar);
-
-
-  (new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
-
- 	m_actions.alignLeft = new KToggleAction( i18n("Left"),
-    CResMgr::displaywindows::writeWindow::alignLeft::icon,
-    CResMgr::displaywindows::writeWindow::alignLeft::accel,
-    this, SLOT( alignLeft()  ),
-    actions,
-		CResMgr::displaywindows::writeWindow::alignLeft::actionName
-  );
-  m_actions.alignLeft->setToolTip( CResMgr::displaywindows::writeWindow::alignLeft::tooltip );
-  m_actions.alignLeft->setWhatsThis( CResMgr::displaywindows::writeWindow::alignLeft::whatsthis );
-  m_actions.alignLeft->plug(bar);
-
- 	m_actions.alignCenter = new KToggleAction( i18n("Center"),
-    CResMgr::displaywindows::writeWindow::alignCenter::icon,
-    CResMgr::displaywindows::writeWindow::alignCenter::accel,
-    this, SLOT(alignCenter()),
-    actions,
-		CResMgr::displaywindows::writeWindow::alignCenter::actionName
-  );
-  m_actions.alignCenter->setToolTip( CResMgr::displaywindows::writeWindow::alignCenter::tooltip );
-  m_actions.alignCenter->setWhatsThis( CResMgr::displaywindows::writeWindow::alignCenter::whatsthis );
-  m_actions.alignCenter->plug(bar);
-
- 	m_actions.alignRight = new KToggleAction( i18n("Right"),
-    CResMgr::displaywindows::writeWindow::alignRight::icon,
-    CResMgr::displaywindows::writeWindow::alignRight::accel,
-    this, SLOT(alignRight()),
-    actions,
-		CResMgr::displaywindows::writeWindow::alignRight::actionName
-  );
-  m_actions.alignRight->setToolTip( CResMgr::displaywindows::writeWindow::alignRight::tooltip );
-  m_actions.alignRight->setWhatsThis( CResMgr::displaywindows::writeWindow::alignRight::whatsthis );
-  m_actions.alignRight->plug(bar);
-
-// 	m_actions.alignJustify = new KToggleAction( i18n("Justify"),
-//    CResMgr::displaywindows::writeWindow::alignJustify::icon,
-//    CResMgr::displaywindows::writeWindow::alignJustify::accel,
-//    this, SLOT( alignJustify()  ),
-//    actions
-//  );
-//  m_actions.alignJustify->setToolTip( CResMgr::displaywindows::writeWindow::alignJustify::tooltip );
-//  m_actions.alignJustify->setWhatsThis( CResMgr::displaywindows::writeWindow::alignJustify::whatsthis );
-//  m_actions.alignJustify->plug(bar);
-
-
-  connect(this, SIGNAL(currentFontChanged(const QFont&)), SLOT(slotFontChanged(const QFont&)));
-  connect(this, SIGNAL(currentAlignmentChanged(int)), SLOT(slotAlignmentChanged(int)));
-  connect(this, SIGNAL(currentColorChanged(const QColor&)), SLOT(slotColorChanged(const QColor&)));
-
-
-  //set initial values for toolbar items
-  slotFontChanged( font() );
-  slotAlignmentChanged( alignment() );
-  slotColorChanged( color() );
-}
-
-/** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
-QPopupMenu* CHTMLWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ){
-  if (!m_actions.selectAll) {
- 	  m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), this, SLOT(selectAll()), this);
-  }
-  
-  KPopupMenu* popup = new KPopupMenu(this);
-	popup->insertTitle(i18n("HTML editor window"));
-  m_actions.selectAll->plug(popup);  
-
-  return popup;
-};
diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h
deleted file mode 100644
index 1a47503..0000000
--- a/bibletime/frontend/display/chtmlwritedisplay.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/***************************************************************************
-                          chtmlwritedisplay.h  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CHTMLWRITEDISPLAY_H
-#define CHTMLWRITEDISPLAY_H
-
-//BibleTime includes
-#include "cplainwritedisplay.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qtextedit.h>
-
-class CWriteWindow;
-
-class QPopupMenu;
-
-class KToggleAction;
-class KFontAction;
-class KFontSizeAction;
-
-class KColorButton;
-
-/** The WYSIWYG implementation of the write display interface.
-  * @author The BibleTime team
-  */
-class CHTMLWriteDisplay : public CPlainWriteDisplay  {
-   Q_OBJECT
-public: 
-  /**
-  * Returns the text of this edit widget.
-  */
-  virtual const QString plainText();
-
-  /**
-  * Creates the necessary action objects and puts them on the toolbar.
-  */
-  virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
-  
-protected:
-	friend class CDisplay;
-	CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent);
-	~CHTMLWriteDisplay();  
-  /**
-  * Reimplementation to show a popup menu if the right mouse butoon was clicked.
-  */
-  virtual QPopupMenu* createPopupMenu( const QPoint& pos );
-
-protected slots:
-  void toggleBold();
-  void toggleItalic();
-  void toggleUnderline();
-
-  void alignLeft();  
-  void alignCenter();
-  void alignRight();
-        
-  void slotFontChanged( const QFont& );  
-  /**
-  * The text's alignment changed. Enable the right buttons.
-  */
-  void slotAlignmentChanged( int );
-  /**
-  * Is called when a new color was selected.
-  */
-  void slotColorSelected( const QColor& );
-  /**
-  * Is called when a text with another color was selected.
-  */
-  void slotColorChanged( const QColor& );
-        
-private:
-  struct {
-    KToggleAction* bold;
-    KToggleAction* italic;
-    KToggleAction* underline;
-
-    KToggleAction* alignLeft;
-	  KToggleAction* alignCenter;
-  	KToggleAction* alignRight;
-   
-    KFontAction* fontChooser;
-    KFontSizeAction* fontSizeChooser;
-
-    //popup menu
-    KAction* selectAll;
-  } m_actions;
-  KColorButton* m_colorButton;
-};
-
-#endif
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
deleted file mode 100644
index 0352583..0000000
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/***************************************************************************
-                          cplainwritedisplay.cpp  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cplainwritedisplay.h"
-
-#include "frontend/cdragdropmgr.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaction.h>
-#include <klocale.h>
-
-CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) : QTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
-//  qWarning("constructor of CPlainWriteDisplay");
-  setTextFormat(Qt::PlainText);
-  setAcceptDrops(true);
-  viewport()->setAcceptDrops(true);
-  
-  connect(this, SIGNAL(textChanged()),
-    connectionsProxy(), SLOT(emitTextChanged()));
-}
-
-CPlainWriteDisplay::~CPlainWriteDisplay(){
-
-}
-
-/** Reimplementation. */
-void CPlainWriteDisplay::selectAll(){
-  QTextEdit::selectAll(true);
-}
-
-void CPlainWriteDisplay::setText( const QString& newText ) {
-  QTextEdit::setText(newText);
-};
-
-const bool CPlainWriteDisplay::hasSelection() {
-  return hasSelectedText();
-};
-
-QWidget* CPlainWriteDisplay::view() {
-  qWarning("CPlainWriteDisplay::view()");
-  return this;
-};
-
-const QString CPlainWriteDisplay::text( const CDisplay::TextType /*format*/, const CDisplay::TextPart /*part*/) {
-  return QString::null;
-};
-
-void CPlainWriteDisplay::print( const CDisplay::TextPart ) {
-
-};
-
-/** Sets the current status of the edit widget. */
-void CPlainWriteDisplay::setModified( const bool modified ){
-  QTextEdit::setModified(modified);
-}
-
-/** Reimplementation. */
-const bool CPlainWriteDisplay::isModified() const{
-  return QTextEdit::isModified();
-}
-
-
-/** Returns the text of this edit widget. */
-const QString CPlainWriteDisplay::plainText(){
-  return QTextEdit::text();
-}
-
-/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */
-QPopupMenu* CPlainWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ){
-  return installedPopup();
-}
-
-/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */
-QPopupMenu* CPlainWriteDisplay::createPopupMenu( ){
-  return installedPopup();
-}
-
-/** Creates the necessary action objects and puts them on the toolbar. */
-void CPlainWriteDisplay::setupToolbar(KToolBar* /*bar*/, KActionCollection* /*actionCollection*/) {
-}
-
-/** Reimplementation to insert the text of a dragged reference into the edit view. */
-void CPlainWriteDisplay::contentsDragEnterEvent( QDragEnterEvent* e ){
-  if (CDragDropMgr::canDecode(e)) {
-    e->accept(true);
-  }
-  else {
-    e->accept(false);
-    e->ignore();
-  }
-}
-
-/** Reimplementation to insert the text of a dragged reference into the edit view. */
-void CPlainWriteDisplay::contentsDragMoveEvent( QDragMoveEvent* e ){
-  if (CDragDropMgr::canDecode(e)) {
-    placeCursor(e->pos());
-    ensureCursorVisible();
-    e->accept(true);
-  }
-  else {
-    e->accept(false);
-    e->ignore();
-  }
-}
-
-/** Reimplementation to manage drops of our drag and drop objects. */
-void CPlainWriteDisplay::contentsDropEvent( QDropEvent* e ){
-  if ( CDragDropMgr::canDecode(e) ) {
-    e->acceptAction();
-
-    CDragDropMgr::ItemList items = CDragDropMgr::decode(e);
-    CDragDropMgr::ItemList::iterator it;
-    for (it = items.begin(); it != items.end(); ++it) {
-      switch ((*it).type()) {
-        case CDragDropMgr::Item::Bookmark:
-        {
-          CSwordModuleInfo* module = backend()->findModuleByName((*it).bookmarkModule());
-          util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-          key->key( (*it).bookmarkKey() );
-
-          QString moduleText = key->strippedText();
-          
-          const QString text = QString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule());
-          
-          placeCursor( e->pos() );
-          insert( text );
-          break;        
-        }
-        case CDragDropMgr::Item::Text:
-        {
-          placeCursor( e->pos() );
-          insert( (*it).text() );
-          break;
-        }  
-        default:
-          break;
-      }
-      
-    };
-  }
-}
diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h
deleted file mode 100644
index 7407aff..0000000
--- a/bibletime/frontend/display/cplainwritedisplay.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************
-                          cplainwritedisplay.h  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPLAINWRITEDISPLAY_H
-#define CPLAINWRITEDISPLAY_H
-
-//Bibletime include files
-#include "cwritedisplay.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qtextedit.h>
-
-class CHTMLWriteDisplay;
-class KAction;
-
-/** The write display implementation for plain source code editing.
-  * @author The BibleTime team
-  */
-class CPlainWriteDisplay : public QTextEdit, public CWriteDisplay  {
-public: 
-  /**
-  * Reimplementation.
-  */
-  virtual void selectAll();
-  /**
-  * Sets the new text for this display widget.
-  */
-  virtual void setText( const QString& newText );
-  /**
-  * Returns true if the display widget has a selection. Otherwise false.
-  */
-  virtual const bool hasSelection();
-  /**
-  * Returns the view of this display widget.
-  */
-  virtual QWidget* view();
-  virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document );
-  virtual void print( const CDisplay::TextPart );
-  /**
-  * Reimplementation.
-  */
-  virtual const bool isModified() const;
-  /**
-  * Sets the current status of the edit widget.
-  */
-  virtual void setModified( const bool modified );
-  /**
-  * Returns the text of this edit widget.
-  */
-  virtual const QString plainText();
-  /**
-  * Creates the necessary action objects and puts them on the toolbar.
-  */
-  virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
-  
-protected:
-	friend class CDisplay;
- 	friend class CHTMLWriteDisplay;
-  
-	CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent);
-	virtual ~CPlainWriteDisplay();
-  /**
-  * Reimplementation from QTextEdit. Provides an popup menu for the given position.
-  */
-  virtual QPopupMenu* createPopupMenu( const QPoint& pos );
-  /**
-  * Reimplementation from QTextEdit. Provides an popup menu.
-  */
-  virtual QPopupMenu* createPopupMenu();
-  /**
-  * Reimplementation to manage drops of our drag and drop objects.
-  */
-  virtual void contentsDropEvent( QDropEvent* e );
-  /**
-  * Reimplementation to insert the text of a dragged reference into the edit view.
-  */
-  virtual void contentsDragEnterEvent( QDragEnterEvent* e );
-  /**
-  * Reimplementation to insert the text of a dragged reference into the edit view.
-  */
-  virtual void contentsDragMoveEvent( QDragMoveEvent* e );
-
-};
-
-#endif
diff --git a/bibletime/frontend/display/creaddisplay.cpp b/bibletime/frontend/display/creaddisplay.cpp
deleted file mode 100644
index 4b6bf15..0000000
--- a/bibletime/frontend/display/creaddisplay.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************
-                          creaddisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "creaddisplay.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordldkey.h"
-
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-
-#include "frontend/cexportmanager.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qpopupmenu.h>
-
-//KDE includes
-#include <klocale.h>
-
-CReadDisplay::CReadDisplay(CReadWindow* readWindow) : CDisplay(readWindow), m_activeAnchor(QString::null) {
-}
-
-CReadDisplay::~CReadDisplay(){
-}
-
-/** Returns the current active anchor. */
-const QString& CReadDisplay::activeAnchor(){
-  return m_activeAnchor;
-}
-
-/** Sets the current anchor to the parameter. */
-void CReadDisplay::setActiveAnchor( const QString& anchor ){
-  m_activeAnchor = anchor;
-}
-
-
-/** Returns true if the display has an active anchor. */
-const bool CReadDisplay::hasActiveAnchor(){
-  return !activeAnchor().isEmpty();
-}
-
-
-void CReadDisplay::print(const CDisplay::TextPart type){
-  CDisplayWindow* window = parentWindow();
-  CSwordKey* const key = window->key();
-  CSwordModuleInfo* module = key->module();
-
-  
-  CExportManager mgr(i18n("Print keys"),false, QString::null, parentWindow()->filterOptions(), parentWindow()->displayOptions());
-        
-  switch (type) {
-		case Document: {
-			if (module->type() == CSwordModuleInfo::Bible) {
-   			CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key);
-
-      	CSwordVerseKey startKey(*vk);
-				startKey.Verse(1);	
-				
-    		CSwordVerseKey stopKey(*vk);
-				if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module))
-					stopKey.Verse( bible->verseCount( bible->bookNumber(startKey.book()), startKey.Chapter() ) );
-				mgr.printKey(module, startKey.key(), stopKey.key());
-  		}
-    	else if (module->type() == CSwordModuleInfo::Lexicon || module->type() == CSwordModuleInfo::Commentary ) {
-    		mgr.printKey(module, key->key(), key->key());
-      }
-      else if (module->type() == CSwordModuleInfo::GenericBook) {
-   			CSwordTreeKey* tree = dynamic_cast<CSwordTreeKey*>(key);
-
-        CSwordTreeKey startKey(*tree);
-//        while (startKey.previousSibling()) { // go to first sibling on this level!
-//        }
-
-    		CSwordTreeKey stopKey(*tree);
-//				if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(module)) {
-//          while ( stopKey.nextSibling() ) { //go to last displayed sibling!
-//          }
-//        }
-				mgr.printKey(module, startKey.key(), stopKey.key());
-      }
-    };
-
-    case AnchorWithText: {
-      if (hasActiveAnchor()) {
-				mgr.printByHyperlink( activeAnchor() );
-      };
-    };
-
-    default:
-    	break;
-	}
-}
-
diff --git a/bibletime/frontend/display/creaddisplay.h b/bibletime/frontend/display/creaddisplay.h
deleted file mode 100644
index e6d3a53..0000000
--- a/bibletime/frontend/display/creaddisplay.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
-                          creaddisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREADDISPLAY_H
-#define CREADDISPLAY_H
-
-#include "cdisplay.h"
-
-class QPopupMenu;
-class QWidget;
-
-/**The base class for all read-only widgets like KHTMLView.
-  *@author The BibleTime team
-  */
-
-class CReadDisplay :  public CDisplay {
-public:
-  /**
-  * Returns true if the display has an active anchor.
-  */
-  const bool hasActiveAnchor();
-  /**
-  * Returns the current active anchor.
-  */
-  const QString& activeAnchor();
-  /**
-  * Moves the widget to the given anchor.
-  */
-  virtual void moveToAnchor( const QString& ) = 0;
-  virtual void print(const CDisplay::TextPart);
-
-
-protected: // Protected methods
-	friend class CDisplay;
- 	friend class CHTMLReadDisplay;
- 	friend class CHTMLReadDisplayView;
-
-	CReadDisplay( CReadWindow* readWindow );
-	~CReadDisplay();
-
-  /**
-  * Sets the current anchor to the parameter.
-  */
-  void setActiveAnchor( const QString& );
-
-private: // Public attributes
-  /**
-  * The member which hols the current anchor.
-  */
-
-  QString m_activeAnchor;
-};
-
-#endif
diff --git a/bibletime/frontend/display/cwritedisplay.cpp b/bibletime/frontend/display/cwritedisplay.cpp
deleted file mode 100644
index 0456457..0000000
--- a/bibletime/frontend/display/cwritedisplay.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
-                          cwritedisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cwritedisplay.h"
-
-#include "frontend/displaywindow/cwritewindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {
-}
-
-CWriteDisplay::~CWriteDisplay(){
-}
-
diff --git a/bibletime/frontend/display/cwritedisplay.h b/bibletime/frontend/display/cwritedisplay.h
deleted file mode 100644
index 283c744..0000000
--- a/bibletime/frontend/display/cwritedisplay.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
-                          cwritedisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CWRITEDISPLAY_H
-#define CWRITEDISPLAY_H
-
-#include "cdisplay.h"
-
-class KActionCollection;
-class KToolBar;
-
-/**The base class for all read/write-display classes.
-  *@author The BibleTime team
-  */
-
-class CWriteDisplay : public CDisplay  {
-protected:
-	friend class CDisplay;
- 	friend class CPlainWriteDisplay;  
-	CWriteDisplay( CWriteWindow* writeWindow );
-	~CWriteDisplay();
-
-public: // Public methods
-  /**
-  * Sets the current modified status of the widget.
-  */
-  virtual void setModified( const bool modified ) = 0;
-  /**
-  * Returns true if the current text was modified.
-  */
-  virtual const bool isModified() const = 0;
-  /**
-  * Returns the text of this edit widget.
-  */
-  virtual const QString plainText() = 0;
-  /**
-  * Creates the necessary action objects and puts them on the toolbar.
-  */
-  virtual void setupToolbar( KToolBar* bar, KActionCollection* actionCollection ) = 0;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/Makefile.am b/bibletime/frontend/displaywindow/Makefile.am
deleted file mode 100644
index a86417c..0000000
--- a/bibletime/frontend/displaywindow/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-INCLUDES = $(all_includes)
-
-libdisplaywindow_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplaywindow.a
-
-libdisplaywindow_a_SOURCES = \
-cbiblereadwindow.cpp \
-cbookreadwindow.cpp \
-ccommentaryreadwindow.cpp \
-cdisplaywindow.cpp \
-clexiconreadwindow.cpp \
-cmodulechooserbar.cpp \
-cmodulechooserbutton.cpp \
-creadwindow.cpp \
-cwritewindow.cpp \
-cplainwritewindow.cpp \
-chtmlwritewindow.cpp \
-cbuttons.cpp
-
-all_headers = \
-cbiblereadwindow.h \
-cbookreadwindow.h \
-ccommentaryreadwindow.h \
-cdisplaywindow.h \
-clexiconreadwindow.h \
-cmodulechooserbar.h \
-cmodulechooserbutton.h \
-creadwindow.h \
-cwritewindow.h \
-cplainwritewindow.h \
-chtmlwritewindow.h \
-cbuttons.h
-
-EXTRA_DIST = $(libdisplaywindow_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/displaywindow/Makefile.in b/bibletime/frontend/displaywindow/Makefile.in
deleted file mode 100644
index 457e00d..0000000
--- a/bibletime/frontend/displaywindow/Makefile.in
+++ /dev/null
@@ -1,836 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libdisplaywindow_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplaywindow.a
-
-libdisplaywindow_a_SOURCES = \
-cbiblereadwindow.cpp \
-cbookreadwindow.cpp \
-ccommentaryreadwindow.cpp \
-cdisplaywindow.cpp \
-clexiconreadwindow.cpp \
-cmodulechooserbar.cpp \
-cmodulechooserbutton.cpp \
-creadwindow.cpp \
-cwritewindow.cpp \
-cplainwritewindow.cpp \
-chtmlwritewindow.cpp \
-cbuttons.cpp
-
-
-all_headers = \
-cbiblereadwindow.h \
-cbookreadwindow.h \
-ccommentaryreadwindow.h \
-cdisplaywindow.h \
-clexiconreadwindow.h \
-cmodulechooserbar.h \
-cmodulechooserbutton.h \
-creadwindow.h \
-cwritewindow.h \
-cplainwritewindow.h \
-chtmlwritewindow.h \
-cbuttons.h
-
-
-EXTRA_DIST = $(libdisplaywindow_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/displaywindow
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libdisplaywindow_a_AR = $(AR) cru
-libdisplaywindow_a_LIBADD =
-am_libdisplaywindow_a_OBJECTS = cbiblereadwindow.$(OBJEXT) \
-	cbookreadwindow.$(OBJEXT) ccommentaryreadwindow.$(OBJEXT) \
-	cdisplaywindow.$(OBJEXT) clexiconreadwindow.$(OBJEXT) \
-	cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \
-	creadwindow.$(OBJEXT) cwritewindow.$(OBJEXT) \
-	cplainwritewindow.$(OBJEXT) chtmlwritewindow.$(OBJEXT) \
-	cbuttons.$(OBJEXT)
-#>- libdisplaywindow_a_OBJECTS = $(am_libdisplaywindow_a_OBJECTS)
-#>+ 11
-libdisplaywindow_a_final_OBJECTS = libdisplaywindow_a.all_cpp.o 
-libdisplaywindow_a_nofinal_OBJECTS = cbiblereadwindow.$(OBJEXT) \
-	cbookreadwindow.$(OBJEXT) ccommentaryreadwindow.$(OBJEXT) \
-	cdisplaywindow.$(OBJEXT) clexiconreadwindow.$(OBJEXT) \
-	cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \
-	creadwindow.$(OBJEXT) cwritewindow.$(OBJEXT) \
-	cplainwritewindow.$(OBJEXT) chtmlwritewindow.$(OBJEXT) \
-	cbuttons.$(OBJEXT)\
-cmodulechooserbutton.moc.o cplainwritewindow.moc.o chtmlwritewindow.moc.o ccommentaryreadwindow.moc.o cbuttons.moc.o cbookreadwindow.moc.o cmodulechooserbar.moc.o creadwindow.moc.o cdisplaywindow.moc.o cbiblereadwindow.moc.o cwritewindow.moc.o clexiconreadwindow.moc.o 
-@KDE_USE_FINAL_FALSE@libdisplaywindow_a_OBJECTS = $(libdisplaywindow_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libdisplaywindow_a_OBJECTS = $(libdisplaywindow_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cbiblereadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbookreadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbuttons.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ccommentaryreadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cdisplaywindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/chtmlwritewindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/clexiconreadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbar.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbutton.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cplainwritewindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/creadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cwritewindow.Po
-#>+ 24
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cmodulechooserbutton.moc.P $(DEPDIR)/cplainwritewindow.moc.P $(DEPDIR)/chtmlwritewindow.moc.P $(DEPDIR)/ccommentaryreadwindow.moc.P $(DEPDIR)/cbuttons.moc.P $(DEPDIR)/cbookreadwindow.moc.P $(DEPDIR)/cmodulechooserbar.moc.P $(DEPDIR)/creadwindow.moc.P $(DEPDIR)/cdisplaywindow.moc.P $(DEPDIR)/cbiblereadwindow.moc.P $(DEPDIR)/cwritewindow.moc.P $(DEPDIR)/clexiconreadwindow.moc.P  $(DEPDIR)/libdisplaywindow_a.all_cpp.P ./$(DEPDIR)/cbiblereadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbuttons.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ccommentaryreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cdisplaywindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbar.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbutton.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/creadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritewindow.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cmodulechooserbutton.moc.P $(DEPDIR)/cplainwritewindow.moc.P $(DEPDIR)/chtmlwritewindow.moc.P $(DEPDIR)/ccommentaryreadwindow.moc.P $(DEPDIR)/cbuttons.moc.P $(DEPDIR)/cbookreadwindow.moc.P $(DEPDIR)/cmodulechooserbar.moc.P $(DEPDIR)/creadwindow.moc.P $(DEPDIR)/cdisplaywindow.moc.P $(DEPDIR)/cbiblereadwindow.moc.P $(DEPDIR)/cwritewindow.moc.P $(DEPDIR)/clexiconreadwindow.moc.P ./$(DEPDIR)/cbiblereadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbuttons.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ccommentaryreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cdisplaywindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbar.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbutton.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/creadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritewindow.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libdisplaywindow_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libdisplaywindow_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/displaywindow/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/displaywindow/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/displaywindow/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libdisplaywindow.a: $(libdisplaywindow_a_OBJECTS) $(libdisplaywindow_a_DEPENDENCIES) 
-	-rm -f libdisplaywindow.a
-	$(libdisplaywindow_a_AR) libdisplaywindow.a $(libdisplaywindow_a_OBJECTS) $(libdisplaywindow_a_LIBADD)
-	$(RANLIB) libdisplaywindow.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbiblereadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbookreadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbuttons.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccommentaryreadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplaywindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlwritewindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clexiconreadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmodulechooserbar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmodulechooserbutton.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cplainwritewindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwritewindow.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-cmodulechooserbutton.moc.cpp: $(srcdir)/cmodulechooserbutton.h
-	$(MOC) $(srcdir)/cmodulechooserbutton.h -o cmodulechooserbutton.moc.cpp
-
-#>+ 2
-mocs: cmodulechooserbutton.moc.cpp
-
-#>+ 3
-cplainwritewindow.moc.cpp: $(srcdir)/cplainwritewindow.h
-	$(MOC) $(srcdir)/cplainwritewindow.h -o cplainwritewindow.moc.cpp
-
-#>+ 2
-mocs: cplainwritewindow.moc.cpp
-
-#>+ 3
-chtmlwritewindow.moc.cpp: $(srcdir)/chtmlwritewindow.h
-	$(MOC) $(srcdir)/chtmlwritewindow.h -o chtmlwritewindow.moc.cpp
-
-#>+ 2
-mocs: chtmlwritewindow.moc.cpp
-
-#>+ 3
-ccommentaryreadwindow.moc.cpp: $(srcdir)/ccommentaryreadwindow.h
-	$(MOC) $(srcdir)/ccommentaryreadwindow.h -o ccommentaryreadwindow.moc.cpp
-
-#>+ 2
-mocs: ccommentaryreadwindow.moc.cpp
-
-#>+ 3
-cbuttons.moc.cpp: $(srcdir)/cbuttons.h
-	$(MOC) $(srcdir)/cbuttons.h -o cbuttons.moc.cpp
-
-#>+ 2
-mocs: cbuttons.moc.cpp
-
-#>+ 3
-cbookreadwindow.moc.cpp: $(srcdir)/cbookreadwindow.h
-	$(MOC) $(srcdir)/cbookreadwindow.h -o cbookreadwindow.moc.cpp
-
-#>+ 2
-mocs: cbookreadwindow.moc.cpp
-
-#>+ 3
-cmodulechooserbar.moc.cpp: $(srcdir)/cmodulechooserbar.h
-	$(MOC) $(srcdir)/cmodulechooserbar.h -o cmodulechooserbar.moc.cpp
-
-#>+ 2
-mocs: cmodulechooserbar.moc.cpp
-
-#>+ 3
-creadwindow.moc.cpp: $(srcdir)/creadwindow.h
-	$(MOC) $(srcdir)/creadwindow.h -o creadwindow.moc.cpp
-
-#>+ 2
-mocs: creadwindow.moc.cpp
-
-#>+ 3
-cdisplaywindow.moc.cpp: $(srcdir)/cdisplaywindow.h
-	$(MOC) $(srcdir)/cdisplaywindow.h -o cdisplaywindow.moc.cpp
-
-#>+ 2
-mocs: cdisplaywindow.moc.cpp
-
-#>+ 3
-cbiblereadwindow.moc.cpp: $(srcdir)/cbiblereadwindow.h
-	$(MOC) $(srcdir)/cbiblereadwindow.h -o cbiblereadwindow.moc.cpp
-
-#>+ 2
-mocs: cbiblereadwindow.moc.cpp
-
-#>+ 3
-cwritewindow.moc.cpp: $(srcdir)/cwritewindow.h
-	$(MOC) $(srcdir)/cwritewindow.h -o cwritewindow.moc.cpp
-
-#>+ 2
-mocs: cwritewindow.moc.cpp
-
-#>+ 3
-clexiconreadwindow.moc.cpp: $(srcdir)/clexiconreadwindow.h
-	$(MOC) $(srcdir)/clexiconreadwindow.h -o clexiconreadwindow.moc.cpp
-
-#>+ 2
-mocs: clexiconreadwindow.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cmodulechooserbutton.moc.cpp cplainwritewindow.moc.cpp chtmlwritewindow.moc.cpp ccommentaryreadwindow.moc.cpp cbuttons.moc.cpp cbookreadwindow.moc.cpp cmodulechooserbar.moc.cpp creadwindow.moc.cpp cdisplaywindow.moc.cpp cbiblereadwindow.moc.cpp cwritewindow.moc.cpp clexiconreadwindow.moc.cpp
-
-#>+ 2
-KDE_DIST=cbuttons.h ccommentaryreadwindow.h cplainwritewindow.h cbookreadwindow.h chtmlwritewindow.h cbiblereadwindow.h cdisplaywindow.h cmodulechooserbar.h cmodulechooserbutton.h clexiconreadwindow.h creadwindow.h cwritewindow.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/displaywindow/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/displaywindow/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libdisplaywindow_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cbiblereadwindow.cpp $(srcdir)/cbookreadwindow.cpp $(srcdir)/ccommentaryreadwindow.cpp $(srcdir)/cdisplaywindow.cpp $(srcdir)/clexiconreadwindow.cpp $(srcdir)/cmodulechooserbar.cpp $(srcdir)/cmodulechooserbutton.cpp $(srcdir)/creadwindow.cpp $(srcdir)/cwritewindow.cpp $(srcdir)/cplainwritewindow.cpp $(srcdir)/chtmlwritewindow.cpp $(srcdir)/cbuttons.cpp cmodulechooserbutton.moc.cpp cplainwritewindow.moc.cpp ccommentaryreadwindow.moc.cpp chtmlwritewindow.moc.cpp cbookreadwindow.moc.cpp cbuttons.moc.cpp cmodulechooserbar.moc.cpp cdisplaywindow.moc.cpp creadwindow.moc.cpp cbiblereadwindow.moc.cpp cwritewindow.moc.cpp clexiconreadwindow.moc.cpp 
-	@echo 'creating libdisplaywindow_a.all_cpp.cpp ...'; \
-	rm -f libdisplaywindow_a.all_cpp.files libdisplaywindow_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libdisplaywindow_a.all_cpp.final; \
-	for file in cbiblereadwindow.cpp cbookreadwindow.cpp ccommentaryreadwindow.cpp cdisplaywindow.cpp clexiconreadwindow.cpp cmodulechooserbar.cpp cmodulechooserbutton.cpp creadwindow.cpp cwritewindow.cpp cplainwritewindow.cpp chtmlwritewindow.cpp cbuttons.cpp cmodulechooserbutton.moc.cpp cplainwritewindow.moc.cpp ccommentaryreadwindow.moc.cpp chtmlwritewindow.moc.cpp cbookreadwindow.moc.cpp cbuttons.moc.cpp cmodulechooserbar.moc.cpp cdisplaywindow.moc.cpp creadwindow.moc.cpp cbiblereadwindow.moc.cpp cwritewindow.moc.cpp clexiconreadwindow.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libdisplaywindow_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdisplaywindow_a.all_cpp.final; \
-	done; \
-	cat libdisplaywindow_a.all_cpp.final libdisplaywindow_a.all_cpp.files > libdisplaywindow_a.all_cpp.cpp; \
-	rm -f libdisplaywindow_a.all_cpp.final libdisplaywindow_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libdisplaywindow_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
deleted file mode 100644
index fca7e8d..0000000
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/***************************************************************************
-                          cbiblereadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbiblereadwindow.h"
-#include "ccommentaryreadwindow.h"
-#include "cbuttons.h"
-
-#include "backend/cswordversekey.h"
-#include "backend/cswordbiblemoduleinfo.h"
-
-#include "frontend/cprofilewindow.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cmdiarea.h"
-#include "util/cresmgr.h"
-
-#include "frontend/display/creaddisplay.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "util/ctoolclass.h"
-
-#include <math.h>
-
-//Qt includes
-#include <qwidgetlist.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kaccel.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-
-CBibleReadWindow::CBibleReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CLexiconReadWindow(moduleList, parent,name) {
-  m_transliterationButton = 0;
-}
-
-CBibleReadWindow::~CBibleReadWindow(){
-}
-
-void CBibleReadWindow::applyProfileSettings( CProfileWindow* const settings ) {
-	CLexiconReadWindow::applyProfileSettings(settings);
-
-	const int count = displaySettingsButton()->menuItemCount();
-	int result = settings->windowSettings();
-	for (int i = count-1; i>=1; i--) {
-		if (result-(int)pow((double)2,i-1)>= 0) { //2^i was added before, so item with index i is set
-			result -= (int)pow((double)2,i-1);
-			displaySettingsButton()->setItemStatus(i,true);
-		}
-		else {
-			displaySettingsButton()->setItemStatus(i,false);
-  	}
-	}
-	displaySettingsButton()->setChanged();
-};
-
-void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) {
-	CLexiconReadWindow::storeProfileSettings(settings);
-
-	const int count = displaySettingsButton()->menuItemCount();
-	int result = 0;
-	//now check	every item
-	for (int i = 1; i < count; i++) { //first item is a title
-		if (displaySettingsButton()->itemStatus(i)) //item is checked
-			result += (int)pow((double)2,i-1);//add 2^i (the i. digit in binary)
-	}
-	settings->setWindowSettings(result);
-};
-
-
-/** Reimplementation. */
-void CBibleReadWindow::insertKeyboardActions( KAccel* const a ){
-  a->insert("Next book",        i18n("Next book"),        "", CResMgr::displaywindows::bibleWindow::nextBook::accel,        0, "");
-	a->insert("Previous book",    i18n("Previous book"),    "", CResMgr::displaywindows::bibleWindow::previousBook::accel,    0, "");
-	a->insert("Next chapter",     i18n("Next chapter"),     "", CResMgr::displaywindows::bibleWindow::nextChapter::accel,     0, "");
-	a->insert("Previous chapter", i18n("Previous chapter"), "", CResMgr::displaywindows::bibleWindow::previousChapter::accel, 0, "");
-	a->insert("Next verse",       i18n("Next verse"),       "", CResMgr::displaywindows::bibleWindow::nextVerse::accel,       0, "");
-	a->insert("Previous verse",   i18n("Previous verse"),   "", CResMgr::displaywindows::bibleWindow::previousVerse::accel,   0, "");
-}
-
-void CBibleReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-
-  CBTConfig::setupAccel( CBTConfig::bibleWindow, accel() );
-  insertKeyboardActions( accel() );
-  CReadWindow::insertKeyboardActions(accel());
-
-  accel()->readSettings(); 
-
-	accel()->setSlot("Next book", this, SLOT(nextBook()));
-  accel()->setSlot("Previous book", this, SLOT(previousBook()));
-  accel()->setSlot("Next chapter", this, SLOT(nextChapter()));
-  accel()->setSlot("Previous chapter", this, SLOT(previousChapter()));
-  accel()->setSlot("Next verse", this, SLOT(nextVerse()));
-  accel()->setSlot("Previous verse", this, SLOT(previousVerse()));
-}
-
-void CBibleReadWindow::initConnections(){
-//  connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), SLOT(keyChanged(CSwordKey*)));
-  CLexiconReadWindow::initConnections();
-
-  if (m_transliterationButton) { // Transliteration is not always available
-    connect(m_transliterationButton, SIGNAL(sigChanged()), SLOT(lookup()));
-  }
-}
-
-void CBibleReadWindow::initView(){
- 	CLexiconReadWindow::initView();
-
-  parentWidget()->installEventFilter( this );  
-
-//  qWarning("initView: %i modules", modules().count());  
-  setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), mainToolBar()) );
-	mainToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
-
-	if (backend()->useICU()){
-	  m_transliterationButton = new CTransliterationButton(&filterOptions(), mainToolBar());
-		mainToolBar()->insertWidget( 3, m_transliterationButton->size().width(), m_transliterationButton );
-	}
-}
-
-/** Reimplementation. */
-void CBibleReadWindow::setupPopupMenu(){
-//	qWarning("CBibleReadWindow::setupPopupMenu()");
-	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Bible window"));
-
- 	m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection());
-  m_actions.selectAll->plug(popup());
-
-  (new KActionSeparator())->plug( popup() );
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon);
- 	m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.referenceOnly);
-	m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), SLOT(copyAnchorTextOnly()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly);
-  m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorWithText()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.referenceAndText);
-  m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(copyDisplayedText()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.chapter);
-  m_actions.copyMenu->insert(new KActionSeparator());
-  m_actions.copy.selectedText = new KAction(i18n("Selected text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copySelection()),actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
-  m_actions.copyMenu->plug(popup());
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon);
- 	m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(saveAnchorWithText()), actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.referenceAndText);
-	m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, SLOT(saveChapterPlain()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.chapterAsPlain);
- 	m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, SLOT(saveChapterHTML()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.chapterAsHTML);
- 	m_actions.saveMenu->plug(popup());
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon);	
- 	m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAnchorWithText()), actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.reference); 	
-  m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAll()),actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.chapter);
- 	m_actions.printMenu->plug(popup());
-}
-
-/** Reimplemented. */
-void CBibleReadWindow::updatePopupMenu(){
-//	qWarning("CBibleReadWindow::updatePopupMenu()");
-
-  m_actions.copy.referenceOnly->setEnabled( displayWidget()->hasActiveAnchor() );
- 	m_actions.copy.referenceTextOnly->setEnabled( displayWidget()->hasActiveAnchor() );
- 	m_actions.copy.referenceAndText->setEnabled( displayWidget()->hasActiveAnchor() );
-	m_actions.copy.selectedText->setEnabled( displayWidget()->hasSelection() );
-
- 	m_actions.save.referenceAndText->setEnabled( displayWidget()->hasActiveAnchor() );
-
-  m_actions.print.reference->setEnabled( displayWidget()->hasActiveAnchor() );
-}
-
-/** Moves to the next book. */
-void CBibleReadWindow::nextBook(){
-	if (verseKey()->next(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CBibleReadWindow::previousBook(){
-	if (verseKey()->previous(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CBibleReadWindow::nextChapter(){
-	if (verseKey()->next(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CBibleReadWindow::previousChapter(){
-	if (verseKey()->previous(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CBibleReadWindow::nextVerse(){
-	if (verseKey()->next(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CBibleReadWindow::previousVerse(){
-	if (verseKey()->previous(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-/** rapper around key() to return the right type of key. */
-CSwordVerseKey* CBibleReadWindow::verseKey(){
-//  qWarning("CBibleReadWindow::key()");
-	CSwordVerseKey* k = dynamic_cast<CSwordVerseKey*>(CDisplayWindow::key());
- 	Q_ASSERT(k);
-	return k;
-}
-
-/** Is called when the key of the keychooser changed. */
-void CBibleReadWindow::keyChanged(CSwordKey* key){
-/*	QWidgetList windows = mdi()->windowList();
-	if (!windows.count()) {
-		return;
-	}
-
-	for (windows.first(); windows.current(); windows.next()) {
-		CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.current());
-		if (w && w->syncAllowed()) {
-			w->lookup( key->key() );
-		}
-	}*/
-}
-
-/** Copies the current chapter into the clipboard. */
-void CBibleReadWindow::copyDisplayedText(){
-//normal function
-  CSwordVerseKey vk(*verseKey());
-  CSwordVerseKey dummy(*verseKey());
-
-  dummy.Verse(1);
-//  qWarning("copyChapter: lower bound is %s", (const char*)dummy);
-  vk.LowerBound(dummy);
-
-  CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first());
-  dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter()));
-//  qWarning("copyChapter: upper bound is %s", (const char*)dummy);
-  vk.UpperBound(dummy);
-
-  CExportManager mgr(i18n("Copy chapter to clipboard ..."), false, i18n("Copying"), filterOptions(), displayOptions());
-  mgr.copyKey(&vk, CExportManager::Text, true);
-}
-
-/** Saves the chapter as valid HTML page. */
-void CBibleReadWindow::saveChapterHTML(){
-  //saves the complete chapter to disk
-
-	CSwordVerseKey dummy(*verseKey());
-  dummy.Verse(1);
-	qWarning("start saving from %s", dummy.key().latin1());
-
-  CSwordVerseKey vk(*verseKey());
-	vk.LowerBound(dummy);
-	qWarning("vk's start is %s", dummy.key().latin1());
-
-  CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first());
-	qWarning("verseCount for %s, chapter %i is %i", (const char*)dummy.book().local8Bit(), dummy.Chapter(), bible->verseCount(dummy.book(), dummy.Chapter()));
-	dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter()));
-
-	vk.UpperBound(dummy);
-
-  CExportManager mgr(i18n("Saving chapter ..."), true, i18n("Saving"), filterOptions(), displayOptions());
-  mgr.saveKey(&vk, CExportManager::HTML, true);
-}
-
-/** Saves the chapter as valid HTML page. */
-void CBibleReadWindow::saveChapterPlain(){
-  //saves the complete chapter to disk
-
-  CSwordVerseKey vk(*verseKey());
-  CSwordVerseKey dummy(*verseKey());
-
-  dummy.Verse(1);
-  vk.LowerBound(dummy);
-
-  CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first());
-  dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter()));
-  vk.UpperBound(dummy);
-
-  CExportManager mgr(i18n("Saving chapter ..."), true, i18n("Saving"), filterOptions(),displayOptions());
-  mgr.saveKey(&vk, CExportManager::Text, true);
-}
-
-void CBibleReadWindow::reload(){
-  CLexiconReadWindow::reload();
-
-	//refresh the book lists
-  verseKey()->setLocale( backend()->booknameLanguage().latin1() );
-  keyChooser()->refreshContent();
-}
-
-/** No descriptions */
-bool CBibleReadWindow::eventFilter( QObject* o, QEvent* e) {
-  const bool ret = CLexiconReadWindow::eventFilter(o,e);
-  if (e && (e->type() == QEvent::FocusIn)) { //sync other windows to this active
-
-		/* This is a hack to work around a KHTML problem (similair to the Drag&Drop problem we had):
-		* If new HTML content is loaded from inside a  kHTML event handler
-		* the widget's state will be confused, i.e. it's scrolling without having
-		* the mousebutton clicked.
-		*
-		* This is not really in a KHTML event handler but works anyway.
-		* Sometime KDE/Qt is hard to use ...
-		*/
-		QTimer::singleShot(0, this, SLOT(syncWindows()));
-	}
-
-	return ret;
-}
-
-void CBibleReadWindow::lookup( CSwordKey* newKey ) {
-	CLexiconReadWindow::lookup(newKey);
-
-	syncWindows();
-}
-
-void CBibleReadWindow::syncWindows() {
-	QWidgetList windows = mdi()->windowList();
-	if (!windows.count()) {
-		return;
-	}
-
-	for (windows.first(); windows.current(); windows.next()) {
-		CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.current());
-		if (w && w->syncAllowed()) {
-			w->lookup( key()->key() );
-		}
-	}
-}
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h
deleted file mode 100644
index ed702fa..0000000
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/***************************************************************************
-                          cbiblereadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBIBLEREADWINDOW_H
-#define CBIBLEREADWINDOW_H
-
-//BibleTime includes
-#include "clexiconreadwindow.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <kaction.h>
-
-
-class CTransliterationButton;
-
-/**The read display window for Bibles.
-  *@author The BibleTime team
-  */
-
-class CBibleReadWindow : public CLexiconReadWindow  {
-   Q_OBJECT
-public: 
-	CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CBibleReadWindow();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* const settings );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* const settings );
-  /**
-  * Reimplementation.
-  */
-  static void insertKeyboardActions( KAccel* const a );
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initConnections();
-  virtual void initView();
-  /**
-  * Reimplementation.
-  */
-  virtual void setupPopupMenu();
-  /**
-	* Reimplemented.
-	*/
-  virtual void updatePopupMenu();
-  /** Event filter.
-  * Reimplementation of the event filter to filter out events like focus in.
-  */
-  virtual bool eventFilter( QObject* o, QEvent* e);
-
-  struct {
-    KAction* selectAll;
-    KActionMenu* copyMenu;
-  	struct {
-			KAction* referenceOnly;
-   		KAction* referenceTextOnly;
-     	KAction* referenceAndText;
-      KAction* chapter;
-      KAction* selectedText;
-   	} copy;
-
-    KActionMenu* saveMenu;
-    struct {
-			KAction* referenceAndText;
-   		KAction* chapterAsPlain;
-     	KAction* chapterAsHTML;
-    } save;
-
-    KActionMenu* printMenu;
-    struct {
-			KAction* reference;
-			KAction* chapter;
-		} print;
-  } m_actions;
-
-
-public slots:
-  void nextBook();
-  void previousBook();
-  void nextChapter();
-  void previousChapter();
-  void nextVerse();
-  void previousVerse();
-  /**
-  * Refreshes the content of this display window and the content of the keychooser.
-  */
-  virtual void reload();
-     
-protected slots: // Protected slots 
-  void keyChanged(CSwordKey* key);
-  /**
-  * Copies the current chapter into the clipboard.
-  */
-  void copyDisplayedText();
-  /**
-  * Saves the chapter as valid HTML page.
-  */
-  void saveChapterHTML();
-  /**
-  * Saves the chapter as valid HTML page.
-  */
-  void saveChapterPlain();
-	virtual void lookup( CSwordKey* newKey );
-	void syncWindows();
-
-private:
-  friend class CCommentaryReadWindow;
-  /**
-  * Wrapper around key() to return the right type of key.
-  */
-  CSwordVerseKey* verseKey();
-
-  CTransliterationButton* m_transliterationButton;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
deleted file mode 100644
index 6507016..0000000
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/***************************************************************************
-                          cbookreadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbookreadwindow.h"
-#include "cmodulechooserbar.h"
-#include "cbuttons.h"
-
-#include "backend/cswordtreekey.h"
-
-#include "frontend/display/cdisplay.h"
-#include "frontend/keychooser/cbooktreechooser.h"
-#include "frontend/cprofilewindow.h"
-
-#include "util/ctoolclass.h"
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qsplitter.h>
-
-//KDE includes
-#include <kaction.h>
-#include <klocale.h>
-
-CBookReadWindow::CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent, name){
-}
-
-CBookReadWindow::~CBookReadWindow(){
-}
-
-void CBookReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::applyProfileSettings(profileWindow);
-
-	const bool enable = static_cast<bool>( profileWindow->windowSettings() );
-	if (enable) {
-    m_treeAction->activate();
-  }
-};
-
-void CBookReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::storeProfileSettings(profileWindow);
-
-  //store information about our show tree structure button
-	profileWindow->setWindowSettings( static_cast<int>( m_treeAction->isChecked() ) );
-};
-
-void CBookReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-};
-
-void CBookReadWindow::insertKeyboardActions( KAccel* /*a*/ ){
-//  CReadWindow::insertKeyboardActions(a);
-};
-
-/** No descriptions */
-void CBookReadWindow::initConnections(){
-	CLexiconReadWindow::initConnections();
- 	connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		this, SLOT(lookup(CSwordKey*)));
- 	connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		keyChooser(), SLOT(updateKey(CSwordKey*)));
- 	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
- 		m_treeChooser, SLOT(updateKey(CSwordKey*)));
-}
-
-/** Init the view */
-void CBookReadWindow::initView(){
-  QSplitter* splitter = new QSplitter(this);
-  setMainToolBar( new KToolBar(this) );
-	addDockWindow(mainToolBar());
-
-  setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-  
-  setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), mainToolBar()) );
-	moduleChooserBar()->setButtonLimit(1);
-	mainToolBar()->insertWidget(1,moduleChooserBar()->sizeHint().width(),moduleChooserBar());
-
-  setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), mainToolBar()) );
-	mainToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
-  
-  m_treeAction = new KToggleAction(i18n("Toggle tree..."), CResMgr::displaywindows::bookWindow::toggleTree::icon, CResMgr::displaywindows::bookWindow::toggleTree::accel, this, SLOT(treeToggled()), actionCollection(), "treeToggle_action");
-	m_treeAction->plug(mainToolBar());
-
-	m_treeChooser = new CBookTreeChooser(modules(), key(), splitter);
-  setDisplayWidget( CDisplay::createReadInstance(this, splitter) ); 	 	
-
-  m_treeAction->setChecked(false);
-	m_treeChooser->hide();
-  	
-  splitter->setResizeMode(m_treeChooser, QSplitter::FollowSizeHint);
-  setCentralWidget( splitter );
-	setIcon(CToolClass::getIconForModule(modules().first()));
-}
-
-/** Is called when the action was executed to toggle the tree view. */
-void CBookReadWindow::treeToggled(){
-	if (m_treeAction->isChecked())
-		m_treeChooser->show();
-	else
-		m_treeChooser->hide();
-}
-
-/** Reimplementation to take care of the tree chooser. */
-void CBookReadWindow::modulesChanged(){
-  CLexiconReadWindow::modulesChanged();
-  m_treeChooser->setModules(modules());
-}
-
-
-//void CBookReadWindow::setupPopupMenu(){
-//	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
-//
-// 	m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection());
-//  m_actions.selectAll->plug(popup());
-//
-//  (new KActionSeparator())->plug( popup() );
-//
-// 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), ICON_EDIT_COPY);
-//
-//  m_actions.copy.reference = new KAction(i18n("Reference"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection());
-// 	m_actions.copyMenu->insert(m_actions.copy.reference);
-//
-//  m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, SLOT(copyDisplayedText()), actionCollection());
-// 	m_actions.copyMenu->insert(m_actions.copy.entry);
-//  m_actions.copyMenu->insert(new KActionSeparator());
-//	m_actions.copy.selectedText = new KAction(i18n("Selected text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copySelection()),actionCollection());
-// 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
-// 	m_actions.copyMenu->plug(popup());
-//
-// 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),ICON_FILE_SAVE);
-//	m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, SLOT(saveAsPlain()),actionCollection());
-// 	m_actions.saveMenu->insert(m_actions.save.entryAsPlain);
-// 	m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, SLOT(saveAsHTML()),actionCollection());
-// 	m_actions.saveMenu->insert(m_actions.save.entryAsHTML);
-// 	m_actions.saveMenu->plug(popup());
-//
-// 	m_actions.printMenu = new KActionMenu(i18n("Print..."),ICON_FILE_PRINT);
-// 	m_actions.print.reference = new KAction(i18n("Reference"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAnchorWithText()), actionCollection());
-// 	m_actions.printMenu->insert(m_actions.print.reference);
-//  m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAll()), actionCollection());
-// 	m_actions.printMenu->insert(m_actions.print.entry);
-// 	m_actions.printMenu->plug(popup());
-//}
-//
-///** Saves the displayed page as plain text. */
-//void CBookReadWindow::saveAsPlain(){
-//
-//}
-//
-///** Saves the current text as as HTML page. */
-//void CBookReadWindow::saveAsHTML(){
-//
-//}
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.h b/bibletime/frontend/displaywindow/cbookreadwindow.h
deleted file mode 100644
index 5d2c4fb..0000000
--- a/bibletime/frontend/displaywindow/cbookreadwindow.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
-                          cbookreadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBOOKREADWINDOW_H
-#define CBOOKREADWINDOW_H
-
-//BibleTime includes
-#include "clexiconreadwindow.h"
-#include "backend/cswordkey.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordversekey.h"
-
-class KToggleAction;
-class CBookTreeChooser;
-
-/**
-  * @author The BibleTime team
-  */
-class CBookReadWindow : public CLexiconReadWindow  {
-  Q_OBJECT
-public:
-	static void insertKeyboardActions( KAccel* a );
-
-	CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CBookReadWindow();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initConnections();
-  virtual void initView();
-
-//  virtual void setupPopupMenu();
-
-private:
-  KToggleAction* m_treeAction;
-  CBookTreeChooser* m_treeChooser;
-
-//  struct {
-//    KAction* selectAll;
-//    KActionMenu* copyMenu;
-//  	struct {
-//      KAction* reference;
-//			KAction* entry;
-//      KAction* selectedText;
-//   	} copy;
-//
-//    KActionMenu* saveMenu;
-//    struct {
-//      KAction* reference;
-//   		KAction* entryAsPlain;
-//     	KAction* entryAsHTML;
-//    } save;
-//
-//    KActionMenu* printMenu;
-//    struct {
-//      KAction* reference;
-//			KAction* entry;
-//		} print;
-//  } m_actions;
-
-private slots: // Private slots
-  /**
-  * Is called when the action was executed to toggle the tree view.
-  */
-  void treeToggled();
-
-protected slots: // Protected slots
-  /**
-  * Reimplementation to take care of the tree chooser.
-  */
-  virtual void modulesChanged();
-//  /**
-//   Saves the current text as as HTML page.
-//  */
-//  virtual void saveAsHTML();
-//  /**
-//   Saves the displayed page as plain text.
-//   */
-//  virtual void saveAsPlain();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp
deleted file mode 100644
index 55ab15a..0000000
--- a/bibletime/frontend/displaywindow/cbuttons.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/***************************************************************************
-                          cbuttons.cpp  -  description
-                             -------------------
-    begin                : Sam Jul 13 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//HibleTime includes
-#include "cbuttons.h"
-
-#include "util/cresmgr.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <kpopupmenu.h>
-#include <klocale.h>
-
-
-CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, QWidget *parent, const char *name )
- : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
- 	m_filterOptions = filterOptions;
-  m_filterOptions->transliteration = 0;
-
-  m_popup = new KPopupMenu(this);	
-	setPopup(m_popup);
-	setPopupDelay(0);
-
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionSelected(int)));
-	populateMenu();
-}
-
-CTransliterationButton::~CTransliterationButton(){
-
-}
-
-/** Resets the buttons with the list of used modules. */
-void CTransliterationButton::reset( ListCSwordModuleInfo& /*modules*/ ){
-  m_popup->clear();
-//  popuplateMenu();
-}
-
-/** Setup the menu entries. */
-void CTransliterationButton::populateMenu(){
-  m_popup->clear();
-  m_popup->insertTitle(i18n("Transliteration"));
-	m_popup->setCheckable(true);
-
-  if (!CPointers::backend()->useICU())
-    return;
-
-  Q_ASSERT(CPointers::backend()->transliterator());
-  if (!CPointers::backend()->transliterator())
-    return;
-
-  sword::StringList options = CPointers::backend()->transliterator()->getOptionValues();
-  sword::StringList::iterator it;
-
-  for (it = options.begin(); it != options.end(); ++it) {
-		int id = m_popup->insertItem(QString::fromLatin1((*it).c_str()));
-		if (m_filterOptions->transliteration == m_popup->indexOf(id)-1 ) { //workaround
-			m_popup->setItemChecked(id, true);
-		}
-  }
-}
-
-/** No descriptions */
-void CTransliterationButton::optionSelected(int ID){
-  for (unsigned int i = 0; i < m_popup->count(); i++)
- 		m_popup->setItemChecked(m_popup->idAt(i),false);	
- 	m_popup->setItemChecked(ID, true);
-	
-  m_filterOptions->transliteration = m_popup->indexOf( ID )-1; //workaround
-  emit sigChanged();
-}
-
-/************************************************
- *********** CDisplaySettingsButton *************
- ************************************************/
-
-CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,QWidget *parent, const char *name )
-	: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name)
-{
-//  qWarning("CDisplaySettingsButton::CDisplaySettingsButton");
-	m_displaySettings = displaySettings;
-	m_moduleSettings = moduleSettings;
-	m_modules = useModules;
-
- 	m_popup = new KPopupMenu(this);	
-	setPopup(m_popup);
-	setPopupDelay(0);
-
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionToggled(int)));
-	populateMenu();
-}
-
-void CDisplaySettingsButton::reset(const ListCSwordModuleInfo& useModules){
-	m_modules = useModules;
-	populateMenu();
-//	if (!populateMenu())
-//		setEnabled(false);
-//	else
-//		setEnabled(true);
-}
-
-
-void CDisplaySettingsButton::optionToggled(int ID){
-	m_popup->setItemChecked( ID, !(m_popup->isItemChecked(ID)));
-	if (!m_popup->text(ID).isEmpty())
-	  *(m_dict[m_popup->text(ID)]) =  m_popup->isItemChecked(ID);
-	emit sigChanged();
-}
-
-/** No descriptions */
-int CDisplaySettingsButton::populateMenu(){
-//  qWarning("CDisplaySettingsButton::populateMenu");
-	int ret = 0;
-
-	m_popup->clear();
-	m_popup->insertTitle(i18n("Display options"));
-	m_popup->setCheckable(true);
-
-  ret += addMenuEntry(i18n("Use linebreaks after each verse"), &m_displaySettings->lineBreaks, (m_modules.first()->type() == CSwordModuleInfo::Bible));
-
-  //only show the verse numbers option for bible modules
-  ret += addMenuEntry(i18n("Show versenumbers"), &m_displaySettings->verseNumbers, (m_modules.first()->type() == CSwordModuleInfo::Bible));
-
-	ret += addMenuEntry(i18n("Show headings"),	&m_moduleSettings->headings,
-		isOptionAvailable(CSwordBackend::headings));	
-	ret += addMenuEntry(i18n("Show footnotes"), &m_moduleSettings->footnotes,
-		isOptionAvailable(CSwordBackend::footnotes ));
-	ret += addMenuEntry(i18n("Highlight words of Jesus"), &m_moduleSettings->redLetterWords,
-		isOptionAvailable(CSwordBackend::redLetterWords ));
-	ret += addMenuEntry(i18n("Show Strong's Numbers"), &m_moduleSettings->strongNumbers,
-		isOptionAvailable(CSwordBackend::strongNumbers ));
-
-	ret += addMenuEntry(i18n("Show morphologic tags"),&m_moduleSettings->morphTags,
-		isOptionAvailable(CSwordBackend::morphTags ));
-	ret += addMenuEntry(i18n("Show lemmas"),&m_moduleSettings->lemmas,
-		isOptionAvailable(CSwordBackend::lemmas ));
-	ret += addMenuEntry(i18n("Show Hebrew vowel points"), &m_moduleSettings->hebrewPoints,
-		isOptionAvailable(CSwordBackend::hebrewPoints ));
-	ret += addMenuEntry(i18n("Show Hebrew cantillation marks"), &m_moduleSettings->hebrewCantillation,
-		isOptionAvailable(CSwordBackend::hebrewCantillation ));
-	ret += addMenuEntry(i18n("Show Greek accents"), &m_moduleSettings->greekAccents,
-		isOptionAvailable(CSwordBackend::greekAccents ));
-	
-  ret += addMenuEntry(i18n("Use alternative textual variant"), &m_moduleSettings->textualVariants,
-		isOptionAvailable(CSwordBackend::textualVariants ));
-  ret += addMenuEntry(i18n("Show scripture cross-references"), &m_moduleSettings->scriptureReferences,
-		isOptionAvailable(CSwordBackend::scriptureReferences ));
-
-	QToolTip::add(this, i18n("Display settings"));
-
-
-	return ret;
-}
-
-/** No descriptions */
-int CDisplaySettingsButton::addMenuEntry( const QString name, const int* option, const bool available){
-	if (available){
-		m_dict.insert( name, option);
-		m_popup->setItemChecked(m_popup->insertItem( name ), *option );
-		return 1;
-	}
-	return 0;
-}
-
-bool CDisplaySettingsButton::isOptionAvailable( const CSwordBackend::FilterTypes option){
-	bool ret = false;
-	for (m_modules.first(); m_modules.current(); m_modules.next())
-		ret = ret || m_modules.current()->has(option);
-	return ret;
-}
-
-/** Returns the number of usable menu items in the setttings menu. */
-const int CDisplaySettingsButton::menuItemCount(){
-	return m_popup->count();
-}
-
-/** Sets the item at position pos to the satet given as 2nd paramter. */
-void CDisplaySettingsButton::setItemStatus( const int index, const bool checked ){
-	const int ID = m_popup->idAt(index);
-	m_popup->setItemChecked(ID, checked);
-	const QString text = m_popup->text(ID);
-	if (m_dict[text])
-	  *(m_dict[text]) = checked;
-}
-
-/** Returns the status of the item at position "index" */
-const bool CDisplaySettingsButton::itemStatus( const int index ){
-	return m_popup->isItemChecked( m_popup->idAt(index) );
-}
-
-/** Sets the status to changed. The signal changed will be emitted. */
-void CDisplaySettingsButton::setChanged(){
-	emit sigChanged();	
-}
diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h
deleted file mode 100644
index 7a84c35..0000000
--- a/bibletime/frontend/displaywindow/cbuttons.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
-                          cbuttons.h  -  description
-                             -------------------
-    begin                : Sam Jul 13 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBUTTONS_H
-#define CBUTTONS_H
-
-//BibleTime includes
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-
-//QT includes
-#include <qdict.h>
-
-//KDE includes
-#include <ktoolbarbutton.h>
-
-class KPopupMenu;
-
-/** This class manages the transliteration of the selected modules.
-  * @author The BibleTime team
-  */
-class CTransliterationButton : public KToolBarButton  {
-   Q_OBJECT
-public: 
-	CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, QWidget *parent, const char *name=0);
-	~CTransliterationButton();
-  /**
-  * Setup the menu entries.
-  */
-  void populateMenu();
-  /**
-  * Resets the buttons with the list of used modules.
-  */
-  void reset( ListCSwordModuleInfo& modules );
-
-protected slots: // Protected slots
-  void optionSelected(int);
-
-private:
-  KPopupMenu* m_popup;
-  CSwordBackend::FilterOptions* m_filterOptions;
-
-signals:
-  void sigChanged();
-};
-
-/** This class manages the display options of the selected modules.
-  * @author The BibleTime team
-  */
-class CDisplaySettingsButton : public KToolBarButton  {
-   Q_OBJECT
-public:
-	CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, QWidget *parent=0, const char *name=0);
-	void reset(const ListCSwordModuleInfo& useModules);
-  /**
-  * Sets the item at position pos to the satet given as 2nd paramter.
-  */
-  void setItemStatus( const int pos, const bool checked );
-  /**
-  * Returns the number of usable menu items in the setttings menu.
-  */
-  const int menuItemCount();
-  /**
-  * Returns the status of the item at position "index"
-  */
-  const bool itemStatus( const int index );
-  /**
-  * Sets the status to changed. The signal changed will be emitted.
-  */
-  void setChanged();
-
-signals:
-	void sigChanged(void);
-
-protected slots:
-	void optionToggled(int ID);
-
-protected:
-	CSwordBackend::FilterOptions*  m_moduleSettings;
-	CSwordBackend::DisplayOptions* m_displaySettings;
-	CSwordBackend::FilterOptions m_available;
-	ListCSwordModuleInfo m_modules;
-
-	QDict<int> m_dict;
-
-	KPopupMenu* m_popup;
-
-  int populateMenu();
-	bool isOptionAvailable( const CSwordBackend::FilterTypes option);
-  int addMenuEntry( const QString name, const int* option, const bool available);
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
deleted file mode 100644
index fd98ea6..0000000
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/***************************************************************************
-                          ccommentaryreadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "ccommentaryreadwindow.h"
-
-#include "frontend/cprofilewindow.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-
-#include "util/ctoolclass.h"
-#include "util/cresmgr.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaction.h>
-#include <kaccel.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-
-CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent,name) {
-}
-
-void CCommentaryReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::applyProfileSettings(profileWindow);
-  if (profileWindow->windowSettings())
-    m_syncButton->setChecked(true);
-};
-
-void CCommentaryReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::storeProfileSettings(profileWindow);
-  profileWindow->setWindowSettings( m_syncButton->isChecked() );
-};
-
-void CCommentaryReadWindow::initView(){
-	CLexiconReadWindow::initView();
-	m_syncButton = new KToggleAction(i18n("Sync with active bible"),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
-		CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
-		actionCollection(),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::actionName
-	);
-	m_syncButton->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); 	m_syncButton->setWhatsThis(CResMgr::displaywindows::commentaryWindow::syncWindow::whatsthis);
-  m_syncButton->plug(mainToolBar());
-}
-
-/** Reimplementation to handle the keychooser refresh. */
-void CCommentaryReadWindow::reload(){
-  CLexiconReadWindow::reload();
-
-	//refresh the book lists
-  verseKey()->setLocale( backend()->booknameLanguage().latin1() );
-  keyChooser()->refreshContent();
-}
-
-/** rapper around key() to return the right type of key. */
-CSwordVerseKey* CCommentaryReadWindow::verseKey(){
-//  qWarning("CCommentaryReadWindow::key()");
-	CSwordVerseKey* k = dynamic_cast<CSwordVerseKey*>(CDisplayWindow::key());
-// 	Q_ASSERT(k);
-	return k;
-}
-
-
-/** Reimplementation. */
-void CCommentaryReadWindow::insertKeyboardActions( KAccel* const a ){
-  a->insert("Next book",        i18n("Next book"),        "", CResMgr::displaywindows::bibleWindow::nextBook::accel, 0, "");
-	a->insert("Previous book",    i18n("Previous book"),    "", CResMgr::displaywindows::bibleWindow::previousBook::accel, 0, "");
-	a->insert("Next chapter",     i18n("Next chapter"),     "", CResMgr::displaywindows::bibleWindow::nextChapter::accel, 0, "");
-	a->insert("Previous chapter", i18n("Previous chapter"), "", CResMgr::displaywindows::bibleWindow::previousChapter::accel, 0, "");
-	a->insert("Next verse",       i18n("Next verse"),       "", CResMgr::displaywindows::bibleWindow::nextVerse::accel, 0, "");
-	a->insert("Previous verse",   i18n("Previous verse"),   "", CResMgr::displaywindows::bibleWindow::previousVerse::accel, 0, "");
-}
-
-void CCommentaryReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-
-  CBTConfig::setupAccel( CBTConfig::commentaryWindow, accel() );
-  CReadWindow::insertKeyboardActions(accel());  
-  insertKeyboardActions( accel() );
-
-  accel()->readSettings();
-
-	accel()->setSlot("Next book", this, SLOT(nextBook()));
-  accel()->setSlot("Previous book", this, SLOT(previousBook()));
-  accel()->setSlot("Next chapter", this, SLOT(nextChapter()));
-  accel()->setSlot("Previous chapter", this, SLOT(previousChapter()));
-  accel()->setSlot("Next verse", this, SLOT(nextVerse()));
-  accel()->setSlot("Previous verse", this, SLOT(previousVerse()));
-}
-
-/** Moves to the next book. */
-void CCommentaryReadWindow::nextBook(){
-	if (verseKey()->next(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CCommentaryReadWindow::previousBook(){
-	if (verseKey()->previous(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CCommentaryReadWindow::nextChapter(){
-	if (verseKey()->next(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CCommentaryReadWindow::previousChapter(){
-	if (verseKey()->previous(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CCommentaryReadWindow::nextVerse(){
-	if (verseKey()->next(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CCommentaryReadWindow::previousVerse(){
-	if (verseKey()->previous(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-const bool CCommentaryReadWindow::syncAllowed() const {
-	return m_syncButton->isChecked();
-}
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
deleted file mode 100644
index fa02bba..0000000
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
-                          ccommentaryreadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CCOMMENTARYREADWINDOW_H
-#define CCOMMENTARYREADWINDOW_H
-
-//BibleTime includes
-#include "cbiblereadwindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-/**
-  *@author The BibleTime team
-  */
-
-class CCommentaryReadWindow : public CLexiconReadWindow  {
-   Q_OBJECT
-public:
-  /**
-  * Reimplementation.
-  */
-  static void insertKeyboardActions( KAccel* const a );
-
-
-  CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-	virtual const bool syncAllowed() const;
-
-public slots: // Public slots
-  void nextBook();
-  void previousBook();
-  void nextChapter();
-  void previousChapter();
-  void nextVerse();
-  void previousVerse();
-  /**
-  * Reimplementation to handle the keychooser refresh.
-  */
-  virtual void reload();
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initView();
-
-private:
-  KToggleAction* m_syncButton;
-  CSwordVerseKey* verseKey();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
deleted file mode 100644
index a832465..0000000
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-/***************************************************************************
-                          cdisplaywindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cdisplaywindow.h"
-#include "creadwindow.h"
-#include "cbiblereadwindow.h"
-#include "ccommentaryreadwindow.h"
-#include "clexiconreadwindow.h"
-#include "cbookreadwindow.h"
-
-#include "cwritewindow.h"
-#include "cplainwritewindow.h"
-#include "chtmlwritewindow.h"
-
-#include "cmodulechooserbar.h"
-#include "cbuttons.h"
-
-#include "backend/cswordkey.h"
-
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "frontend/display/cdisplay.h"
-
-#include "frontend/cmdiarea.h"
-#include "frontend/cprofilewindow.h"
-#include "frontend/cbtconfig.h"
-
-
-//Qt includes
-
-//KDE includes
-#include <kaccel.h>
-
-CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name) {
-  switch (modules.first()->type()) {
-		case CSwordModuleInfo::Bible:
-			return new CBibleReadWindow(modules, parent, name);
-		case CSwordModuleInfo::Commentary:
-			return new CCommentaryReadWindow(modules, parent, name);
-		case CSwordModuleInfo::Lexicon:
-			return new CLexiconReadWindow(modules, parent, name);
-		case CSwordModuleInfo::GenericBook:			
-			return new CBookReadWindow(modules, parent, name);
-		default:
-			qWarning("unknown module type");
-			break;
- 	}
-  return 0;
-}
-
-
-CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const CDisplayWindow::WriteWindowType& type,  const char* name) {
-  if (type == HTMLWindow) {
-    return new CHTMLWriteWindow(modules, parent, name);
-  }
-  else {
-    return new CPlainWriteWindow(modules, parent, name);
-  };
-  return 0;
-}
-
-CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
-  : KMainWindow(parent, name, WDestructiveClose),
-    m_mdi(parent),
-//    m_modules(modules),
-    m_filterOptions(),
-    m_displayOptions(),
-    m_displaySettingsButton(0),    
-    m_keyChooser(0),
-    m_swordKey(0),    
-    m_isReady(false),    
-    m_moduleChooserBar(0),
-    m_mainToolBar(0),
-    m_popupMenu(0),
-    m_displayWidget(0)
-{
-//  qWarning("set modules now");
-  setModules(modules);
- // qWarning("modules setting done");
-}
-
-CDisplayWindow::~CDisplayWindow(){
-}
-
-CMDIArea* const CDisplayWindow::mdi() const {
-	return m_mdi;
-}
-
-/** Returns the right window caption. */
-const QString CDisplayWindow::windowCaption(){
- 	if (!m_modules.count())
-		return QString::null;
-
-//	QString ret = m_modules.first()->name();
-//	if (m_modules.count() > 1) {
-//		for (m_modules.next(); m_modules.current(); m_modules.next())	 {
-//			ret += " | " + m_modules.current();
-//		}
-//	}
-	return m_modules.join(" | ");
-}
-
-/** Returns the used modules as a QPtrList */
-ListCSwordModuleInfo CDisplayWindow::modules() {
-  ListCSwordModuleInfo mods;
-
-  for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) {
-    Q_ASSERT(backend()->findModuleByName(*it));
-    if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) {
-      mods.append(m);
-    }
-  }
-  
-	return mods;
-}
-
-/** Set the window caption. */
-void CDisplayWindow::setCaption( const QString&  ){
-	QWidget::setCaption( windowCaption() );
-}
-
-void CDisplayWindow::insertKeyboardActions( KAccel* const /*accel*/ ) {
-}
-
-/** Is called when this window gets the focus or looses the focus. */
-void CDisplayWindow::windowActivated( const bool hasFocus ){
-	if (accel()) {
-		accel()->setEnabled(hasFocus);
-  }
-}
-
-/** Reimplementation from QWidget. Used to initialize things before the widget is shown. */
-void CDisplayWindow::polish(){
-//  qWarning("CDisplayWindow::polish()");
-  KMainWindow::polish();
-}
-
-/** Refresh the settings of this window. */
-void CDisplayWindow::reload() {
-  //first make sure all used Sword modules are still present
-  for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it){
-    if (!backend()->findModuleByName(*it)) {
-      it = m_modules.remove(it);
-      if (it == m_modules.end()) {
-        break;
-      }
-    }
-  }
-
-	if (m_moduleChooserBar) { //necessary for edit windows which have now chooser bar
-  	m_moduleChooserBar->setModules(modules());
-	}
- 	modulesChanged();
-
-	if (m_modules.count() > 0) {
-    lookup();
-  }
-}
-
-/** Returns the filter options used by this window. */
-CSwordBackend::FilterOptions& CDisplayWindow::filterOptions() {
-	return m_filterOptions;
-}
-
-/** Returns the display options used by this display window. */
-CSwordBackend::DisplayOptions& CDisplayWindow::displayOptions() {
-	return m_displayOptions;
-}
-
-/** Sets the new display options for this window. */
-void CDisplayWindow::setDisplayOptions( const CSwordBackend::DisplayOptions& displayOptions ){
-	m_displayOptions = displayOptions;
-}
-
-/** Sets the new filter options of this window. */
-void CDisplayWindow::setFilterOptions( CSwordBackend::FilterOptions& filterOptions ){
-  m_filterOptions = filterOptions;
-}
-
-/** Returns true if the widget is ready for use. */
-const bool CDisplayWindow::isReady() const {
-	return m_isReady;
-}
-
-/** Set the ready status */
-void CDisplayWindow::setReady( const bool& ready ){
-	m_isReady = ready;
-}
-
-/** Returns true if the window may be closed. */
-bool CDisplayWindow::queryClose(){
-	return true;
-}
-
-/** Returns the keychooser widget of this display window. */
-CKeyChooser* const CDisplayWindow::keyChooser() const {
-	return m_keyChooser;
-}
-
-/** Sets the keychooser widget for this display window. */
-void CDisplayWindow::setKeyChooser( CKeyChooser* ck ){
-  m_keyChooser = ck;
-}
-
-/** Returns the key of this display window. */
-CSwordKey* CDisplayWindow::key() const {
-	return m_swordKey;
-}
-
-/** Sets the new sword key. */
-void CDisplayWindow::setKey( CSwordKey* key ){
-	m_swordKey = key;
-}
-
-void CDisplayWindow::modulesChanged(){
-	if (moduleChooserBar()) { //necessary for write windows
-		setModules( m_moduleChooserBar->getModuleList() );
-	}
-
-	if (!modules().count()) {
-  	close();
-  }
-  else {
-		if (displaySettingsButton()) {
-  		displaySettingsButton()->reset(modules());
-		}
-	  key()->module(modules().first());
-	  keyChooser()->setModules(modules());
-
-	  lookup(key());
-	}
-}
-
-/** Lookup the given key. */
-//void CDisplayWindow::lookup( CSwordKey* ){
-//}
-
-/** Returns the module chooser bar. */
-CModuleChooserBar* const CDisplayWindow::moduleChooserBar() const {
-	return m_moduleChooserBar;
-}
-
-/** Sets the module chooser bar. */
-void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ){
-	if (m_moduleChooserBar) {
- 		disconnect(m_moduleChooserBar, SIGNAL(sigChanged()), this, SLOT(modulesChanged()));
-  }
-
-	if (bar) { //if a new bar should be set!
-    m_moduleChooserBar = bar;
-  	connect(bar, SIGNAL(sigChanged()), SLOT(modulesChanged()));
-  };
-}
-
-/** Sets the modules. */
-void CDisplayWindow::setModules( ListCSwordModuleInfo newModules ){
-  m_modules.clear();
-  for (newModules.first(); newModules.current(); newModules.next()) {
-    m_modules.append(newModules.current()->name());
-  }
-}
-
-/** Initialize the window. Call this method from the outside, because calling this in the constructor is not possible! */
-const bool CDisplayWindow::init( const QString& keyName ){
-  initView();
-  setMinimumSize( 350,300 );
-
-  setCaption(windowCaption());
-  //setup focus stuff.
-  setFocusPolicy(QWidget::ClickFocus);
-  parentWidget()->setFocusPolicy(QWidget::ClickFocus);
-
-  show();
- 	initConnections();
-  initKeyboardActions();
- 	setupPopupMenu();
-  
-  m_filterOptions = CBTConfig::getFilterOptionDefaults();
-	m_displayOptions = CBTConfig::getDisplayOptionDefaults();
-	if (displaySettingsButton()) { 
-		displaySettingsButton()->reset(modules());
-  }
-
-  if (key()) {
-    key()->key(keyName);
-  }
-
-  return true;
-}
-
-/** Returns the main toolbar. */
-KToolBar* const CDisplayWindow::mainToolBar() const{
-  return m_mainToolBar;
-}
-
-/** Sets the main toolbar. */
-void CDisplayWindow::setMainToolBar( KToolBar* bar ){
-	m_mainToolBar = bar;
-}
-
-/** Returns the display settings button */
-CDisplaySettingsButton* const CDisplayWindow::displaySettingsButton() const{
-  return m_displaySettingsButton;
-}
-
-/** Sets the display settings button. */
-void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ){
-  if (m_displaySettingsButton)
-		disconnect(m_displaySettingsButton, SIGNAL( sigChanged() ),this,	SLOT(lookup() ));
-
-  m_displaySettingsButton = button;
- 	connect(m_displaySettingsButton, SIGNAL(sigChanged()),this, SLOT(lookup()));
-}
-
-/** Lookup the current key. Used to refresh the display. */
-void CDisplayWindow::lookup(){
- 	lookup( key() );
-}
-
-void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) {
-  if (!isReady())
-  	return;
-
-	CSwordModuleInfo* m = backend()->findModuleByName(moduleName);
-  if (!m) {
-    return;
-	}
-
-	if (m && modules().containsRef(m) && !keyName.isEmpty()) {
-		key()->key(keyName);
-		keyChooser()->setKey(key()); //the key chooser does send an update signal
-	}
-	else { //given module not chosen by user
-
-		//if the module is displayed in another display window we assume a wrong drop
-		QWidgetList windows = mdi()->windowList();
-  	bool found = false;
-		CDisplayWindow* dw = 0;
-  	for (windows.first(); windows.current(); windows.next()) {
-    	dw = dynamic_cast<CDisplayWindow*>(windows.current());
-     	if (dw && dw->modules().containsRef(m)) {
-				found = true;
-				break;
-			}
-		}
-
-		if (found) { //lookup in the window which has the module displayed
-			dw->lookup(moduleName, keyName);
-  	}
-		else { //create a new window for the given module
-    	ListCSwordModuleInfo mList;
-     	mList.append(m);
-			mdi()->emitCreateDisplayWindow(mList, keyName);
-  	}
-	}
-}
-
-void CDisplayWindow::lookup( const QString& key ) {
-	lookup(modules().first()->name(), key);
-}
-
-/** Update the status of the popup menu entries. */
-void CDisplayWindow::updatePopupMenu(){
-
-}
-
-
-///** Returns the installed popup menu. */
-KPopupMenu* const CDisplayWindow::popup(){
-//	qWarning("CReadWindow::popup()");
-	if (!m_popupMenu) {
- 		m_popupMenu = new KPopupMenu(this);
-		connect(m_popupMenu, SIGNAL(aboutToShow()), this, SLOT(updatePopupMenu()));
-	  if (displayWidget()) {
-	  	displayWidget()->installPopup(m_popupMenu);
-    }
-	  else {
-	  	qWarning("CDisplayWindow:: can't instal popup menu");
-    }
-  }
- 	return m_popupMenu;
-}
-
-/** Returns the display widget used by this implementation of CDisplayWindow. */
-CDisplay* const CDisplayWindow::displayWidget() const {
-  return m_displayWidget;
-}
-
-/** Sets the display widget used by this display window. */
-void CDisplayWindow::setDisplayWidget( CDisplay* newDisplay ){
-  m_displayWidget = newDisplay;
-}
-
-void CDisplayWindow::closeEvent(QCloseEvent* e) {
-//  qWarning("CDisplayWindow::closeEvent(QCloseEvent* e)");
-	if (!queryClose()) {
-		e->ignore();
-	}
-	else {
-		e->accept();
-	}
-}
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h
deleted file mode 100644
index 3639984..0000000
--- a/bibletime/frontend/displaywindow/cdisplaywindow.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/***************************************************************************
-                          cdisplaywindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CDISPLAYWINDOW_H
-#define CDISPLAYWINDOW_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordldkey.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <kmainwindow.h>
-
-
-class CMDIArea;
-class CReadWindow;
-class CWriteWindow;
-class CMDIArea;
-class CProfileWindow;
-class KAccel;
-class CDisplaySettingsButton;
-class CDisplay;
-class CKeyChooser;
-class CModuleChooserBar;
-class CDisplaySettingsButton;
-class KToolBar;
-class KPopupMenu;
-
-/** The base class for all display windows of BibleTime.
-  * @author The BibleTime team
-  */
-
-class CDisplayWindow : public KMainWindow, public CPointers  {
-   Q_OBJECT
-public:
-  enum WriteWindowType {
-    HTMLWindow = 1,
-    PlainTextWindow = 2
-  };
-
-  static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name = 0);
-	static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const WriteWindowType& type = HTMLWindow, const char* name = 0);
-  /**
-  * Insert the keyboard accelerators of this window into the given KAccel object.
-  */
-  static void insertKeyboardActions( KAccel* const accel );
-
- 	CMDIArea* const mdi() const;
-  /**
-  * Returns the right window caption.
-  */
-  const QString windowCaption();
-  /**
-  * Returns the used modules as a QPtrList
-  */
-  ListCSwordModuleInfo modules();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow ) = 0;
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow ) = 0;
-  /**
-  * Set the window caption.
-  */
-  virtual void setCaption( const QString& );
-  /**
-  * Sets the new filter options of this window.
-  */
-  void setFilterOptions( CSwordBackend::FilterOptions& filterOptions );
-  /**
-  * Sets the new display options for this window.
-  */
-  void setDisplayOptions( const CSwordBackend::DisplayOptions& displayOptions );
-  /**
-  * Returns the display options used by this display window.
-  */
-  CSwordBackend::DisplayOptions& displayOptions();
-  /**
-  * Returns the filter options used by this window.
-  */
-  CSwordBackend::FilterOptions& filterOptions();
-  /**
-  * Set the ready status
-  */
-  void setReady( const bool& ready );
-  /**
-  * Returns true if the widget is ready for use.
-  */
-  const bool isReady() const;
-  /**
-  * Returns true if the window may be closed.
-  */
-  virtual bool queryClose();
-  /**
-  * Returns the keychooser widget of this display window.
-  */
-  CKeyChooser* const keyChooser() const;
-  /**
-  * Sets the new sword key.
-  */
-  void setKey( CSwordKey* key );
-  /**
-  * Returns the key of this display window.
-  */
-  CSwordKey* key() const;
-  /**
-  * Initialize the window. Call this method from the outside, because calling this in the constructor is not possible!
-  */
-  virtual const bool init( const QString& key );
-  /**
-  * Sets the main toolbar.
-  */
-  void setMainToolBar( KToolBar* bar );
-  /**
-  * Returns the main toolbar.
-  */
-  KToolBar* const mainToolBar() const;
-  /**
-  * Returns the display settings button
-  */
-  CDisplaySettingsButton* const displaySettingsButton() const;
-  /**
-  * Sets the display settings button.
-  */
-  void setDisplaySettingsButton( CDisplaySettingsButton* button );
-  virtual void setupPopupMenu() = 0;
-  /**
-  * Returns the display widget used by this implementation of CDisplayWindow.
-  */
-  virtual CDisplay* const displayWidget() const;
-  /**
-  * Sets the display widget used by this display window.
-  */
-  virtual void setDisplayWidget( CDisplay* newDisplay );
-
-	/* Returns whether syncs to the active window are allowed at this time for this display window
-	* @return boolean value whether sync is allowed
-	*/
-	virtual const bool syncAllowed() const {
-		return false;
-	};
-
-public slots:
-  /**
-  * Lookup the specified key in the given module. If the module is not chosen withing
-  * this display window create a new displaywindow with the right module in it.
-  */
-  virtual void lookup( const QString& module, const QString& key );
-  /**
-  * Lookup the key in the chosen modules.
-  */
-  virtual void lookup( const QString& key );
-  /**
-  * Refresh the settings of this window.
-  */
-  virtual void reload();
-
-protected:
-	friend class CMDIArea;
-	friend class CBibleReadWindow;
-
-	CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CDisplayWindow();
-  /**
-  * Initializes the intern keyboard actions.
-  */
-  virtual void initKeyboardActions() = 0;
-  /**
-   Is called when this window gets the focus or looses the focus.
-  */
-  virtual void windowActivated( const bool hasFocus );
-  /**
-  * Sets the keychooser widget for this display window.
-  */
-  void setKeyChooser( CKeyChooser* ck );
-  /**
-  * Returns the module chooser bar.
-  */
-  CModuleChooserBar* const moduleChooserBar() const;
-  /**
-  * Lookup the given key.
-  */
-  virtual void lookup( CSwordKey* ) = 0;
-  /**
-  * Sets the module chooser bar.
-  */
-  void setModuleChooserBar( CModuleChooserBar* bar );
-  /**
-  * Sets the modules.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-  /**
-  * Initializes the signal / slot connections of this display window.
-  */
-  virtual void initConnections() = 0;
-  /**
-  * Initialize the view of this display window.
-  */
-  virtual void initView() = 0;
-  /**
-  * Returns the installed popup menu.
-  */
-  KPopupMenu* const popup();
-  virtual void closeEvent(QCloseEvent* e);
-  
-protected slots:
-	virtual void modulesChanged();
-  /**
-  * Lookup the current key. Used to refresh the display.
-  */
-  void lookup();
-  /**
-  * Reimplementation from QWidget. Used to initialize things before this widget is shown.
-  */
-  virtual void polish();
-  virtual void updatePopupMenu();
-  
-private:
-	CMDIArea* m_mdi;
-
-	//we may only cache the module names bacause after a backend relaod the pointers are invalid!
-  QStringList m_modules;
-  
-  CSwordBackend::FilterOptions m_filterOptions;
-	CSwordBackend::DisplayOptions m_displayOptions;
-  CDisplaySettingsButton* m_displaySettingsButton;
-  CKeyChooser* m_keyChooser;
-  CSwordKey* m_swordKey;
-  bool m_isReady;
-  CModuleChooserBar* m_moduleChooserBar;
-  KToolBar* m_mainToolBar;
-  KPopupMenu* m_popupMenu;
-  CDisplay* m_displayWidget;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
deleted file mode 100644
index 5cb3f08..0000000
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/***************************************************************************
-                          chtmlwritewindow.cpp  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "chtmlwritewindow.h"
-
-//frontend includes
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cprofilewindow.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaction.h>
-#include <klocale.h>
-
-
-CHTMLWriteWindow::CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name)
-  : CPlainWriteWindow(modules, parent, name)
-{
-
-}
-
-CHTMLWriteWindow::~CHTMLWriteWindow(){
-
-}
-
-//void CHTMLWriteWindow::setupPopupMenu() {
-//
-//};
-
-void CHTMLWriteWindow::initView() {
-  CWriteDisplay* writeDisplay = CDisplay::createWriteInstance(this, CDisplay::HTMLDisplay);
-  Q_ASSERT(writeDisplay);
- 	setDisplayWidget( writeDisplay );
- 	setCentralWidget( displayWidget()->view() );
-
-  setMainToolBar( new KToolBar(this) );
-  mainToolBar()->setFullSize(true);
-	addDockWindow(mainToolBar());
-
-	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-
-
-  //setip the toolbar
-	m_actions.syncWindow = new KToggleAction(i18n("Sync with active bible"),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
-		CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
-		actionCollection(),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::actionName
-	);
-	m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); m_actions.syncWindow->setWhatsThis(CResMgr::displaywindows::commentaryWindow::syncWindow::whatsthis);
-  m_actions.syncWindow->plug(mainToolBar());
-
-	m_actions.saveText = new KAction( i18n("Save text"),
-    CResMgr::displaywindows::writeWindow::saveText::icon,
-    CResMgr::displaywindows::writeWindow::saveText::accel,
-    this, SLOT( saveCurrentText()  ),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::saveText::actionName
-  );
-  m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip );
-  m_actions.saveText->setWhatsThis( CResMgr::displaywindows::writeWindow::saveText::whatsthis );
-  m_actions.saveText->plug(mainToolBar());
-
- 	m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
-    CResMgr::displaywindows::writeWindow::deleteEntry::icon,
-    CResMgr::displaywindows::writeWindow::deleteEntry::accel,
-    this, SLOT(deleteEntry()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::deleteEntry::actionName
-  );
-  m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip );
-  m_actions.deleteEntry->setWhatsThis( CResMgr::displaywindows::writeWindow::deleteEntry::whatsthis );
-  m_actions.deleteEntry->plug(mainToolBar());
-
-
- 	m_actions.restoreText = new KAction(i18n("Restore original text"),
-    CResMgr::displaywindows::writeWindow::restoreText::icon,
-    CResMgr::displaywindows::writeWindow::restoreText::accel,
-    this, SLOT(restoreText()), actionCollection(),
-		CResMgr::displaywindows::writeWindow::restoreText::actionName
-  );
-  m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip );
-  m_actions.restoreText->setWhatsThis( CResMgr::displaywindows::writeWindow::restoreText::whatsthis );
-  m_actions.restoreText->plug(mainToolBar());
-
-
-  KToolBar* bar = new KToolBar(this);
-  bar->setFullSize(true);
-	addDockWindow(bar);
-
-  writeDisplay->setupToolbar( bar, actionCollection() );
-};
-
-void CHTMLWriteWindow::initConnections() {
-	CWriteWindow::initConnections();
-	
- 	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
-		this, SLOT(lookup(CSwordKey*)));
-  connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()),
-    this, SLOT(textChanged()) );
-};
-
-void CHTMLWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::storeProfileSettings(profileWindow);
-  profileWindow->setWindowSettings( m_actions.syncWindow->isChecked() );
-};
-
-void CHTMLWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::applyProfileSettings(profileWindow);
-  if (profileWindow->windowSettings()) {
-    m_actions.syncWindow->setChecked(true);
-	}
-};
-
-/** Is called when the current text was changed. */
-void CHTMLWriteWindow::textChanged() {
-  m_actions.saveText->setEnabled( displayWidget()->isModified() );
-  m_actions.restoreText->setEnabled( displayWidget()->isModified() );
-}
-
-/** Loads the original text from the module. */
-void CHTMLWriteWindow::restoreText(){
-  lookup(key());
-  displayWidget()->setModified(false);
-  textChanged();
-}
-
-const bool CHTMLWriteWindow::syncAllowed() const {
-	return m_actions.syncWindow->isChecked();
-}
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.h b/bibletime/frontend/displaywindow/chtmlwritewindow.h
deleted file mode 100644
index 7b85434..0000000
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
-                          chtmlwritewindow.h  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CHTMLWRITEWINDOW_H
-#define CHTMLWRITEWINDOW_H
-
-//BibleTime includes
-#include "cplainwritewindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-class KAction;
-
-/** The WYSIWYG implementation of the editor.
-  * @author The BibleTime team
-  */
-class CHTMLWriteWindow : public CPlainWriteWindow  {
-   Q_OBJECT
-public:
-	CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0);
-	virtual ~CHTMLWriteWindow();
-
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* );
-
-	virtual const bool syncAllowed() const;
-
-protected: // Protected methods
-  /**
-  * Initialize the state of this widget.
-  */
-  virtual void initView();
-  virtual void initConnections();
-  virtual const CDisplayWindow::WriteWindowType writeWindowType() {
-    return CDisplayWindow::HTMLWindow;
-  };
-
-protected slots:
-  /**
-  * Is called when the current text was changed.
-  */
-  virtual void textChanged();
-  /**
-  * Loads the original text from the module.
-  */
-  virtual void restoreText();
-
-private:
-  struct {
-    KAction* saveText;
-    KAction* restoreText;
-    KAction* deleteEntry;
-		KToggleAction* syncWindow;
-  } m_actions;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
deleted file mode 100644
index c802cf1..0000000
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/***************************************************************************
-                          clexiconreadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "clexiconreadwindow.h"
-#include "cmodulechooserbar.h"
-#include "cbuttons.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordldkey.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "util/ctoolclass.h"
-#include "util/cresmgr.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaccel.h>
-#include <ktoolbar.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-
-CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) {
-	setKey( CSwordKey::createInstance(moduleList.first()) );
-// 	key()->key("");
-}
-
-CLexiconReadWindow::~CLexiconReadWindow(){
-}
-
-void CLexiconReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-	CReadWindow::applyProfileSettings(profileWindow);
-};
-
-void CLexiconReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-	CReadWindow::storeProfileSettings(profileWindow);
-};
-
-/** Reimplementation. */
-void CLexiconReadWindow::insertKeyboardActions( KAccel* a ){
-  a->insert("Next entry",     i18n("Next entry"),     "", CResMgr::displaywindows::lexiconWindow::nextEntry::accel, 0, "", true, true);
-	a->insert("Previous entry", i18n("Previous entry"), "", CResMgr::displaywindows::lexiconWindow::previousEntry::accel, 0, "", true, true);	
-}
-
-void CLexiconReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-
-  CBTConfig::setupAccel(CBTConfig::lexiconWindow, accel());
-  insertKeyboardActions(accel());
-  CReadWindow::insertKeyboardActions(accel());
-
-  accel()->readSettings();
-
-  accel()->setSlot("Next entry", this, SLOT(nextEntry()));
-  accel()->setSlot("Previous entry",  this, SLOT(previousEntry()));
-};
-
-/** No descriptions */
-void CLexiconReadWindow::initConnections(){
- 	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
-		this, SLOT(lookup(CSwordKey*)));
-}
-
-void CLexiconReadWindow::initView(){
-	setDisplayWidget( CDisplay::createReadInstance(this) );
- 	setCentralWidget( displayWidget()->view() );
-
-  setMainToolBar( new KToolBar(this) );
-  mainToolBar()->setFullSize(true);
-	addDockWindow(mainToolBar());
-
-	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-
-	setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), mainToolBar()) );
-	mainToolBar()->insertWidget(1,moduleChooserBar()->sizeHint().width(),moduleChooserBar());
-
-//  setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), mainToolBar()) );
-//	mainToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
-
-  setIcon(CToolClass::getIconForModule(modules().first()));
-}
-
-void CLexiconReadWindow::setupPopupMenu(){
-	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
-
- 	m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection());
-  m_actions.selectAll->plug(popup());
-
-  (new KActionSeparator())->plug( popup() );
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon);
-
-  m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.reference);
-  m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorWithText()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.entry);
-  m_actions.copyMenu->insert(new KActionSeparator());
-	m_actions.copy.selectedText = new KAction(i18n("Selected text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copySelection()),actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
- 	m_actions.copyMenu->plug(popup());
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::lexiconWindow::saveMenu::icon);	
-	m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, SLOT(saveAsPlain()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.entryAsPlain);
- 	m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, SLOT(saveAsHTML()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.entryAsHTML);
- 	m_actions.saveMenu->plug(popup());
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::lexiconWindow::printMenu::icon);	
- 	m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAnchorWithText()), actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.reference); 	 	
-  m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAll()), actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.entry); 	
- 	m_actions.printMenu->plug(popup());
-}
-
-/** Reimplemented. */
-void CLexiconReadWindow::updatePopupMenu(){
- 	m_actions.copy.reference->setEnabled( displayWidget()->hasActiveAnchor() );
-	m_actions.copy.selectedText->setEnabled( displayWidget()->hasSelection() );
-
- 	m_actions.print.reference->setEnabled( displayWidget()->hasActiveAnchor() );
-}
-
-/** No descriptions */
-void CLexiconReadWindow::nextEntry(){
-  keyChooser()->setKey(ldKey()->NextEntry());
-}
-
-/** No descriptions */
-void CLexiconReadWindow::previousEntry(){
-  keyChooser()->setKey(ldKey()->PreviousEntry());
-}
-
-/** Reimplementation to return the right key. */
-CSwordLDKey* CLexiconReadWindow::ldKey(){
-  return dynamic_cast<CSwordLDKey*>(CDisplayWindow::key());
-}
-
-/** This function saves the entry as html using the CExportMgr class. */
-void CLexiconReadWindow::saveAsHTML(){
-  CExportManager mgr(i18n("Saving entry ..."), true, i18n("Saving"), filterOptions(), displayOptions());
-  mgr.saveKey(key(), CExportManager::HTML, true);  
-}
-
-/** This function saves the entry as html using the CExportMgr class. */
-void CLexiconReadWindow::saveAsPlain(){
-  CExportManager mgr(i18n("Saving entry ..."), true, i18n("Saving"), filterOptions(), displayOptions());
-  mgr.saveKey(key(), CExportManager::Text, true);
-}
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h
deleted file mode 100644
index 1bc9c4f..0000000
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
-                          clexiconreadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CLEXICONREADWINDOW_H
-#define CLEXICONREADWINDOW_H
-
-//BibleTime includes
-#include "creadwindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <kaction.h>
-
-class CSwordKey;
-class CSwordLDKey;
-/**
-  *@author The BibleTime team
-  */
-
-class CLexiconReadWindow : public CReadWindow  {
-   Q_OBJECT
-public: 
-	CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CLexiconReadWindow();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Reimplementation.
-  */
-  static void insertKeyboardActions( KAccel* a );
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initConnections();
-  virtual void initView();
-  virtual void updatePopupMenu();
-  virtual void setupPopupMenu();
-
-private:
-  /**
-  * Reimplementation to return the right key.
-  */
-  CSwordLDKey* ldKey();
-
-  struct {
-    KAction* selectAll;
-    KActionMenu* copyMenu;
-  	struct {
-      KAction* reference;
-			KAction* entry;
-      KAction* selectedText;
-   	} copy;
-
-    KActionMenu* saveMenu;
-    struct {
-      KAction* reference;
-   		KAction* entryAsPlain;
-     	KAction* entryAsHTML;
-    } save;
-
-    KActionMenu* printMenu;
-    struct {
-      KAction* reference;
-			KAction* entry;
-		} print;
-  } m_actions;
-
-protected slots: // Protected slots
-  void previousEntry();
-  void nextEntry();
-  /**
-  * This function saves the entry as html using the CExportMgr class.
-  */
-  void saveAsHTML();
-  /**
-  * This function saves the entry as plain text using the CExportMgr class.
-  */
-  void saveAsPlain();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
deleted file mode 100644
index 69b7f1d..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbar.cpp  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cmodulechooserbar.h"
-#include "cmodulechooserbutton.h"
-
-#include <qtimer.h>
-
-CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent, const char *name )
-  : KToolBar(parent,name),
-  m_moduleType(type),
-  m_idCounter(0),
-	m_buttonLimit(-1) //-1 means no limit
-{
-  //insert buttons if useModules != 0
-	for (useModules.first(); useModules.current(); useModules.next())		 {
-		if ((m_buttonLimit != -1) && ( m_buttonLimit <= (int)m_buttonList.count()) ) { //we reached the button limit
-			break;
-    };
-    
-		addButton( useModules.current() );
-  }
-
-  // We can add a button to choose an additional module
-  if ( (m_buttonLimit == -1) || (m_buttonLimit > (int)m_buttonList.count()) ) { 
-	  addButton(0); //add a button without module set
-  }
-}
-
-/** Adds a button to the toolbar */
-CModuleChooserButton* const CModuleChooserBar::addButton( CSwordModuleInfo* const module ) {
-	CModuleChooserButton* b = new CModuleChooserButton(module, m_moduleType, ++m_idCounter, this);
-	m_buttonList.append(b);	
-	insertWidget( m_idCounter, b->size().width(),b );			
-	
- 	connect( b, SIGNAL(sigAddButton()), this, SLOT(addButton()) );
- 	connect( b, SIGNAL(sigRemoveButton(const int)), this, SLOT(removeButton(const int)) );
- 	connect( b, SIGNAL(sigChanged()), SIGNAL(sigChanged()) );
-	
-	b->show();
-
-  return b;
-}
-
-void CModuleChooserBar::addButton( ) {
-  addButton(0);
-}
-
-/** Removes a button from the toolbar */
-void CModuleChooserBar::removeButton( const int ID ){
-	for (m_buttonList.first(); m_buttonList.current(); m_buttonList.next()) {	
-		if (m_buttonList.current()->getId() == ID) {	//found the right button
-			CModuleChooserButton* b = m_buttonList.current();
-			m_buttonList.removeRef(b);
-			b->hide();
-      b->deleteLater();
-			break;
-		}
-	}		
-	
-	emit sigChanged();
-}
-
-/** Returns a list of selected modules. */
-ListCSwordModuleInfo CModuleChooserBar::getModuleList(){
-	qWarning("getModuleList called: %i buttons", m_buttonList.count());
-  ListCSwordModuleInfo list;
-//	list.setAutoDelete(false);
-//	list.clear();
-	
-	for (m_buttonList.first(); m_buttonList.current(); m_buttonList.next()) {	
-	  if ( CSwordModuleInfo* m = m_buttonList.current()->module() ) {
-  		list.append( m );
-      qWarning("append module %s", m->name().latin1());
-    }
-	}
-	return list;
-}
-
-/** Sets the number of the maximum count of buttons. */
-void CModuleChooserBar::setButtonLimit(const int limit){
-	m_buttonLimit = limit;
-  if (limit == -1) //no need to delete buttons
-    return;
-
-  const int tooMuch = m_buttonList.count() - limit;
-  for (int i = 0; i < tooMuch; ++i) {
-		CModuleChooserButton* b = m_buttonList.last();
-		m_buttonList.remove(b);
-		b->hide();
-		delete b;
-  }
-  
-//	for (m_buttonList.last(); m_buttonList.current() && ((int)m_buttonList.count() > m_buttonLimit); m_buttonList.prev() ) {
-//	}
-}
-
-/** Sets the modules which are chosen in this module chooser bar. */
-void CModuleChooserBar::setModules( ListCSwordModuleInfo useModules ){
-  qWarning("at first %i buttons", m_buttonList.count());
-	setButtonLimit(0);	
-	setButtonLimit(-1);		//these two lines clear the bar
-  qWarning("in the middle %i buttons", m_buttonList.count());
-
-  if (!useModules.count()) {
-    qWarning("no modules available");
-    return;
-  }
-
-  qWarning("chooserBar:setModule:  %i modules", useModules.count());
-	for (useModules.first(); useModules.current(); useModules.next())		 {
-		if ( (m_buttonLimit != -1) && (m_buttonLimit <= (int)m_buttonList.count()) ) {
-			break;
-    }
-
-    addButton( useModules.current() );
-  }
-  if ( (m_buttonLimit == -1) || (m_buttonLimit > (int)m_buttonList.count()) ) {
-	  addButton(0);//add button without module set
-  }
-  qWarning("at the end %i buttons", m_buttonList.count());
-}
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h
deleted file mode 100644
index 180a651..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbar.h  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMODULECHOOSERBAR_H
-#define CMODULECHOOSERBAR_H
-
-//BibleTime includes
-#include "cmodulechooserbutton.h"
-
-#include "backend/cswordmoduleinfo.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qhbox.h>
-
-//KDE includes
-#include <ktoolbar.h>
-
-/**
-  * @author The BibleTime team
-  */
-class CModuleChooserBar : public KToolBar  {
-   Q_OBJECT
-public: 
-	/**
-	* Default constructor
-	*/
-	CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type,  QWidget *parent=0, const char *name=0);
-  /**
-  * Returns a list of selected modules.
-  */
-  ListCSwordModuleInfo getModuleList();
-  /**
-  * Sets the number of the maximum count of buttons.
-  */
-  void setButtonLimit( const int limit);
-  /**
-  * Sets the modules which are chosen in this module chooser bar.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-	
-protected:
-  /**
-  * Adds a button to the toolbar
-  */
-  CModuleChooserButton* const addButton( CSwordModuleInfo* const module );
-
-protected slots: // Protected slots
-  /* Add a button
-  * This slot calls the addButton function above to add a button.
-  */
-  void addButton();
-  /**
-	* Removes a button from the toolbar
-	*/
-	void removeButton( const int ID );
-
-private:
-	QPtrList<CModuleChooserButton> m_buttonList;
-	CSwordModuleInfo::ModuleType m_moduleType;
-	int m_idCounter;
-	int m_buttonLimit;
-
-signals: // Signals
-  void sigChanged();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
deleted file mode 100644
index cf9f40e..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbutton.cpp  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cmodulechooserbutton.h"
-
-#include "backend/cswordbackend.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qtooltip.h>
-#include <qdict.h>
-#include <qvaluelist.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-
-CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, QWidget *parent, const char *name )
-	: KToolBarButton(iconName(), id, parent,name), m_id(id), m_popup(0) {
-
-  m_moduleType = type;	
-	m_module = useModule;
-	if (!m_module) {
-  	m_hasModule = false;
-  }
-  else {
-    m_hasModule = true;
-  }
-	
-	setIcon( iconName() );
-	setPopupDelay(0);
-
-	populateMenu();
-}	
-
-/** Returns the icon used for the current status. */
-const QString CModuleChooserButton::iconName(){
-	switch (m_moduleType) {
-		case CSwordModuleInfo::Bible:
-			if (m_hasModule)
-				return CResMgr::modules::bible::icon_unlocked;
-			else
-				return CResMgr::modules::bible::icon_add;
-		case CSwordModuleInfo::Commentary:
-			if (m_hasModule)
-				return CResMgr::modules::commentary::icon_unlocked;
-			else
-				return CResMgr::modules::commentary::icon_add;
-		case CSwordModuleInfo::Lexicon:
-			if (m_hasModule)
-				return CResMgr::modules::lexicon::icon_unlocked;
-			else
-				return CResMgr::modules::lexicon::icon_add;
-		case CSwordModuleInfo::GenericBook:
-			if (m_hasModule)
-				return CResMgr::modules::book::icon_unlocked;
-			else
-				return CResMgr::modules::book::icon_add;
-		default: //return as default the bible icon
-			return CResMgr::modules::bible::icon_unlocked;
-	}
-}
-
-CSwordModuleInfo* CModuleChooserButton::module() {
-	for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
-  	for (unsigned int i = 0; i < popup->count(); i++) {
-  		if ( m_popup->isItemChecked(popup->idAt(i)) ){
-				QString mod = popup->text(popup->idAt(i));
-  			return backend()->findModuleByName( mod.left(mod.find(" ")) );
-			}
-  	}	
-
-	}
-	return 0; //"none" selected
-}
-
-/** Returns the id used for this button. */
-int CModuleChooserButton::getId() const{
-	return m_id;
-}
-
-/** �s called after a module was selected in the popup */
-void CModuleChooserButton::moduleChosen( int ID ){	
-	for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
-   	for (unsigned int i = 0; i < popup->count(); i++){
-   		popup->setItemChecked(popup->idAt(i),false);	
-   	}	
-   	popup->setItemChecked(ID, true);
-	}
-
-	m_popup->setItemChecked(m_noneId, false); //uncheck the "none" item
-
- 	if (m_popup->text(ID) == i18n("NONE")) { // note: this is for m_popup, the toplevel!
- 		if (m_hasModule) {
- 			emit sigRemoveButton(m_id);
- 			return;
-		}
- 	}
- 	else {
- 	  if (!m_hasModule) {
- 	    emit sigAddButton();
-    }
-    
- 		m_hasModule = true;  	
- 		m_module = module();
-  	setIcon( iconName() );
-   	emit sigChanged();
-
-    setText( i18n("Select a module") );
-    m_popup->changeTitle(m_titleId, i18n("Select a module"));	
-     	
-   	QToolTip::remove(this);
-   	if (module()) {
-   		QToolTip::add(this, module()->name());
-    }
- 	}
-}
-/** No descriptions */
-void CModuleChooserButton::populateMenu(){
-	if (m_popup)
-		delete m_popup;
-	m_submenus.setAutoDelete(true);
-	m_submenus.clear();
-
-	//create popup
-	m_popup = new KPopupMenu(this);	
-
-	if (m_module)
-	  m_titleId = m_popup->insertTitle(i18n("Select a module"));	
-	else
-	  m_titleId = m_popup->insertTitle(i18n("Select an additional module"));	
-
-	m_popup->setCheckable(true);
-
-	m_noneId =	m_popup->insertItem(i18n("NONE"));
-  if ( !m_module )
-		m_popup->setItemChecked(m_noneId, true);
-
-	m_popup->insertSeparator();	
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(moduleChosen(int)));		
-	setPopup(m_popup, true);
-
-	QStringList languages;
-	QDict<KPopupMenu> langdict;
-
-  //the modules list contains only the modules we can use, i.e. same type and same features
-  ListCSwordModuleInfo modules;
-  ListCSwordModuleInfo allMods = backend()->moduleList();
-
-  for (allMods.first(); allMods.current(); allMods.next()) {
-    if (allMods.current()->type() != m_moduleType)
-      continue;
-    modules.append(allMods.current());
-  };
-
-	for (modules.first(); modules.current(); modules.next()) {
- 		QString lang = modules.current()->language().translatedName();
- 		if (lang.isEmpty())
- 			lang = QString::fromLatin1("xx"); //unknown language -- not use English as default!!
- 	 	if (languages.find( lang ) == languages.end() ){ //not yet added
- 			languages += lang;
- 			KPopupMenu* menu = new KPopupMenu;
- 			langdict.insert(lang, menu );
- 			m_submenus.append(menu);
- 			connect(menu, SIGNAL(activated(int)), this, SLOT(moduleChosen(int)));		
- 		}
-	}	
-
-	//Check the appropriate entry
-	for (modules.first(); modules.current(); modules.next()) {
- 		QString lang = modules.current()->language().translatedName();
- 		if (lang.isEmpty())
- 			lang = QString::fromLatin1("xx"); //unknown language
- 		QString name = QString(modules.current()->name()) + QString(" ")+
- 			(modules.current()->isLocked() ? i18n("[locked]") : QString::null); 			
- 		int id = langdict[lang]->insertItem( name );
- 		if ( m_module && modules.current()->name() == m_module->name()) {
- 			langdict[lang]->setItemChecked(id,true);
- 		}
-	}	
-
-	languages.sort();
-  for ( QStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) {
-		m_popup->insertItem( *it, langdict[*it]);
-	}
-
- 	if (module())
- 		QToolTip::add(this, module()->name());
-	else
- 		QToolTip::add(this, i18n("No module selected"));
-
-}
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
deleted file mode 100644
index 71ba563..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbutton.h  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMODULECHOOSERBUTTON_H
-#define CMODULECHOOSERBUTTON_H
-
-//BibleTime includes
-#include "backend/cswordmoduleinfo.h"
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qdict.h>
-#include <qtoolbutton.h>
-
-//KDE includes
-#include <ktoolbarbutton.h>
-#include <kpopupmenu.h>
-
-class KPopupMenu;
-
-/** The CModuleChooserButton displays a list of submenus sorted by language which contain the possible modules
-  * which can be displayed together with the first one.
-  * @author The BibleTime team
-  */
-class CModuleChooserButton : public KToolBarButton, public CPointers  {
-   Q_OBJECT
-public: 
-	CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, QWidget *parent = 0, const char *name = 0 );
-  CSwordModuleInfo* module();
-  /**
-  * Returns the id used for this button.
-  */
-  int getId() const;
-
-protected: // Protected methods
-  void populateMenu();
-	
-private:
-  /**
-  * Returns the icon used for the current status.
-  */
-  const QString iconName();
-	
-	bool m_hasModule;
-  int m_id;
-  int m_noneId;
-	int m_titleId;
-	CSwordModuleInfo::ModuleType m_moduleType;
-	CSwordModuleInfo* m_module;
-
-	KPopupMenu* m_popup;
-	QPtrList<KPopupMenu> m_submenus;
-
-private slots:
-	void moduleChosen(int ID );
-
-signals:
-	void sigRemoveButton(const int ID);
-	void sigAddButton();
-  void sigChanged();
-};
-#endif
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
deleted file mode 100644
index 7ec69f8..0000000
--- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/***************************************************************************
-                          cplainwritewindow.cpp  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cplainwritewindow.h"
-
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cprofilewindow.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qregexp.h>
-
-//KDE includes
-#include <kaction.h>
-#include <kaccel.h>
-#include <klocale.h>
-
-CPlainWriteWindow::CPlainWriteWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CWriteWindow(moduleList, parent, name) {
-	setKey( CSwordKey::createInstance(moduleList.first()) );
-}
-
-
-CPlainWriteWindow::~CPlainWriteWindow(){
-}
-
-/** Initialize the state of this widget. */
-void CPlainWriteWindow::initView(){
-//  qWarning("CPlainWriteWindow::initView()");
- 	setDisplayWidget( CDisplay::createWriteInstance(this) );
-//  Q_ASSERT(displayWidget());
- 	setCentralWidget( displayWidget()->view() );
-
-  setMainToolBar( new KToolBar(this) );
-  mainToolBar()->setFullSize(true);
-	addDockWindow(mainToolBar());
-
-	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-
-	m_actions.syncWindow = new KToggleAction(i18n("Sync with active bible"),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
-		CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
-		actionCollection(),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::actionName
-	);
-	m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); m_actions.syncWindow->setWhatsThis(CResMgr::displaywindows::commentaryWindow::syncWindow::whatsthis);
-  m_actions.syncWindow->plug(mainToolBar());
-
-
-	m_actions.saveText = new KAction(i18n("Save text"),
-    CResMgr::displaywindows::writeWindow::saveText::icon,
-    CResMgr::displaywindows::writeWindow::saveText::accel,
-    this, SLOT(saveCurrentText()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::saveText::actionName
-  );
-  m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip );
-  m_actions.saveText->setWhatsThis( CResMgr::displaywindows::writeWindow::saveText::whatsthis );
-  m_actions.saveText->plug(mainToolBar());
-
-
- 	m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
-    CResMgr::displaywindows::writeWindow::deleteEntry::icon,
-    CResMgr::displaywindows::writeWindow::deleteEntry::accel,
-    this, SLOT(deleteEntry()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::deleteEntry::actionName
-  );
-  m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip );
-  m_actions.deleteEntry->setWhatsThis( CResMgr::displaywindows::writeWindow::deleteEntry::whatsthis );
-  m_actions.deleteEntry->plug(mainToolBar());
-
-
- 	m_actions.restoreText = new KAction(i18n("Restore original text"),
-    CResMgr::displaywindows::writeWindow::restoreText::icon,
-    CResMgr::displaywindows::writeWindow::restoreText::accel,
-    this, SLOT(restoreText()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::restoreText::actionName
-  );
-  m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip );
-  m_actions.restoreText->setWhatsThis( CResMgr::displaywindows::writeWindow::restoreText::whatsthis );
-  m_actions.restoreText->plug(mainToolBar());
-}
-
-void CPlainWriteWindow::initConnections(){
-	CWriteWindow::initConnections();
-	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
-		this, SLOT(lookup(CSwordKey*)));
-
-  connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()),
-    this, SLOT(textChanged()) );
-}
-
-void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::storeProfileSettings(profileWindow);
-  profileWindow->setWindowSettings( m_actions.syncWindow->isChecked() );
-};
-
-void CPlainWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::applyProfileSettings(profileWindow);
-  if (profileWindow->windowSettings()) {
-    m_actions.syncWindow->setChecked(true);
-	}
-};
-
-/** Saves the text for the current key. Directly writes the changed text into the module. */
-void CPlainWriteWindow::saveCurrentText( const QString& key ) {
-  QString t = displayWidget()->plainText();
-  //since t is a complete HTML page at the moment, strip away headers and footers of a HTML page
-  QRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive
-  re.setMinimal(true);
-  t.replace(re, "");
-  t.replace(QRegExp("</body></html>", false), "");//remove footer
-
-	const QString& oldKey = this->key()->key();
-  modules().first()->write(this->key(), t );
-	this->key()->key( oldKey );
-
-  displayWidget()->setModified(false);
-  textChanged();
-}
-
-/** Loads the original text from the module. */
-void CPlainWriteWindow::restoreText(){
-  lookup(key());
-  displayWidget()->setModified(false);
-  textChanged();
-}
-
-/** Is called when the current text was changed. */
-void CPlainWriteWindow::textChanged() {
-	m_actions.saveText->setEnabled( displayWidget()->isModified() );
-  m_actions.restoreText->setEnabled( displayWidget()->isModified() );
-}
-
-/** Deletes the module entry and clears the edit widget, */
-void CPlainWriteWindow::deleteEntry(){
-  modules().first()->deleteEntry( key() );
-  lookup( key() );
-  displayWidget()->setModified(false);
-}
-
-/** Setups the popup menu of this display widget. */
-void CPlainWriteWindow::setupPopupMenu(){
-}
-
-const bool CPlainWriteWindow::syncAllowed() const {
-	return m_actions.syncWindow->isChecked();
-}
-
-void CPlainWriteWindow::initKeyboardActions() {
-  CWriteWindow::initKeyboardActions();
-
-	CBTConfig::setupAccel( CBTConfig::writeWindow, accel() );
-  insertKeyboardActions( accel() );
-
-  accel()->readSettings();
-	//accel()->setSlot("Copy", displayWidget()->connectionsProxy(), SLOT(copySelection()));
-
-/*
-	accel()->setSlot("Next book", this, SLOT(nextBook()));
-  accel()->setSlot("Previous book", this, SLOT(previousBook()));
-  accel()->setSlot("Next chapter", this, SLOT(nextChapter()));
-  accel()->setSlot("Previous chapter", this, SLOT(previousChapter()));
-  accel()->setSlot("Next verse", this, SLOT(nextVerse()));
-  accel()->setSlot("Previous verse", this, SLOT(previousVerse()));
-*/
-}
-
-void CPlainWriteWindow::insertKeyboardActions( KAccel* const a ) {
-  a->insert("Next book",        i18n("Next book"),        "", CResMgr::displaywindows::bibleWindow::nextBook::accel,        0, "");
-	a->insert("Previous book",    i18n("Previous book"),    "", CResMgr::displaywindows::bibleWindow::previousBook::accel,    0, "");
-	a->insert("Next chapter",     i18n("Next chapter"),     "", CResMgr::displaywindows::bibleWindow::nextChapter::accel,     0, "");
-	a->insert("Previous chapter", i18n("Previous chapter"), "", CResMgr::displaywindows::bibleWindow::previousChapter::accel, 0, "");
-	a->insert("Next verse",       i18n("Next verse"),       "", CResMgr::displaywindows::bibleWindow::nextVerse::accel,       0, "");
-	a->insert("Previous verse",   i18n("Previous verse"),   "", CResMgr::displaywindows::bibleWindow::previousVerse::accel,   0, "");
-
-	a->insert("Save text",   i18n("Save text"),   "", CResMgr::displaywindows::writeWindow::saveText::accel,   0, "");
-}
-
-//void CPlainWriteWindow::setupPopupMenu() {
-//	qWarning("Plain wite window: setup popup menu");
-//}
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.h b/bibletime/frontend/displaywindow/cplainwritewindow.h
deleted file mode 100644
index c6d2f84..0000000
--- a/bibletime/frontend/displaywindow/cplainwritewindow.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
-                          cplainwritewindow.h  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPLAINWRITEWINDOW_H
-#define CPLAINWRITEWINDOW_H
-
-//BibleTime includes
-#include "cwritewindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-
-class KAction;
-class KToggleAction;
-
-/** The write window class which offers a plain editor for source code editing.
-  * @author The BibleTime team
-  */
-class CPlainWriteWindow : public CWriteWindow  {
-   Q_OBJECT
-public:
-	CPlainWriteWindow( ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0 );
-	~CPlainWriteWindow();
-
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-
-	/**
-  * Setups the popup menu of this display widget.
-  */
-  virtual void setupPopupMenu();
-	virtual const bool syncAllowed() const;
-
-protected: // Protected methods
-  /**
-  * Initialize the state of this widget.
-  */
-  virtual void initView();
-  virtual void initConnections();
-  virtual const CDisplayWindow::WriteWindowType writeWindowType() {
-    return CDisplayWindow::PlainTextWindow;
-  };
-
-	/**
-  * Initializes the intern keyboard actions.
-  */
-  virtual void initKeyboardActions();
-  /**
-  * Insert the keyboard accelerators of this window into the given KAccel object.
-  */
-  static void insertKeyboardActions( KAccel* const accel );
-//  virtual void setupPopupMenu();
-
-private:
-  struct {
-    KAction* saveText;
-    KAction* deleteEntry;
-    KAction* restoreText;
-		KToggleAction* syncWindow;
-  } m_actions;
-
-protected slots: // Protected slots
-  /**
-  * Saves the text for the current key. Directly writes the changed text into the module.
-  */
-  virtual void saveCurrentText( const QString& );
-  /**
-  * Is called when the current text was changed.
-  */
-  virtual void textChanged();
-  /**
-  * Loads the original text from the module.
-  */
-  virtual void restoreText();
-  /**
-  * Deletes the module entry and clears the edit widget.
-  */
-  virtual void deleteEntry();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp
deleted file mode 100644
index 4535aab..0000000
--- a/bibletime/frontend/displaywindow/creadwindow.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/***************************************************************************
-                          creadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "creadwindow.h"
-
-#include "backend/centrydisplay.h"
-#include "backend/cswordkey.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/cmdiarea.h"
-#include "frontend/cprofilewindow.h"
-//#include "frontend/display/creaddisplay.h"
-#include "frontend/displaywindow/cmodulechooserbar.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-
-//KDE includes
-#include <kpopupmenu.h>
-#include <kaccel.h>
-#include <kstdaccel.h>
-#include <klocale.h>
-
-CReadWindow::CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name )
-  : CDisplayWindow(modules,parent,name),
-    m_displayWidget(0)
-{
-  
-}
-
-CReadWindow::~CReadWindow(){
-//	qWarning("destructor of CReadWindow");
-}
-
-/** Returns the display widget of this window. */
-CReadDisplay* const CReadWindow::displayWidget(){
-	return m_displayWidget;
-}
-
-/** Sets the display widget of this display window. */
-void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ){
-  CDisplayWindow::setDisplayWidget(newDisplay);
- 	if (m_displayWidget) {
-  	disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)), this, SLOT(lookup(const QString&, const QString&)));
-  	disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookup(const QString&)));
-  }
-
-	m_displayWidget = newDisplay;
-  connect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)),this, SLOT(lookup(const QString&, const QString&)));
-  connect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookup(const QString&)));
-}
-
-/** Lookup the given entry. */
-void CReadWindow::lookup( CSwordKey* newKey ){
-	if (!newKey || !modules().first())
-		return;
-
-	if (CEntryDisplay* display = modules().first()->getDisplay()) {	//do we have a display object?
- 		displayWidget()->setText( display->text( modules(), newKey->key(), displayOptions(), filterOptions() ) );
-	}
-	if (key() != newKey) {
-		key()->key(newKey->key());
-	}
-
-  displayWidget()->moveToAnchor( key()->key() );
-	setCaption( windowCaption() );
-}
-
-/** Reimplementation to use the popup menu. */
-const bool CReadWindow::init( const QString& keyName ){
-  CDisplayWindow::init(keyName);
-  keyChooser()->setKey(key());
-	setReady(true);
-
-  return true;
-}
-
-/** Store the settings of this window in the given CProfileWindow object. */
-void CReadWindow::storeProfileSettings(CProfileWindow * const settings){
-	QRect rect;
-	rect.setX(parentWidget()->x());
-	rect.setY(parentWidget()->y());
-	rect.setWidth(width());
-	rect.setHeight(height());
-	settings->setGeometry(rect);
-		
-//	settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
-	settings->setType(modules().first()->type());
-	settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
-	settings->setFocus( (this == mdi()->activeWindow()) ); //set property to true if this window is the active one.
-	
-	if (key()) {
-		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
-		QString oldLang;
-		if (vk) {
-		  oldLang = QString::fromLatin1(vk->getLocale());	
-			vk->setLocale("en"); //save english locale names as default!		
-		}
-		settings->setKey( key()->key() );
-		if (vk) {
-			vk->setLocale(oldLang.latin1());
-		}
-	}
-		
-	QStringList mods;
-  ListCSwordModuleInfo allMods = modules();
-	for (CSwordModuleInfo* m = allMods.first(); m; m = allMods.next()) {
-		mods.append(m->name());
-	}	
-	settings->setModules(mods);
-}
-
-void CReadWindow::applyProfileSettings(CProfileWindow * const settings){
-//  parentWidget()->setUpdatesEnabled(false);
-  setUpdatesEnabled(false);
-	
-	if (settings->maximized()) { //maximize this window
-   // Use parentWidget() to call showMaximized. Otherwise we'd get lot's of X11 errors
-   parentWidget()->showMaximized();
-	}
-	else {
-		const QRect rect = settings->geometry();
-		resize(rect.width(), rect.height());
-		parentWidget()->move(rect.x(), rect.y());
-	}
-	
-	setUpdatesEnabled(true);	
-//  parentWidget()->setUpdatesEnabled(true);
-}
-
-void CReadWindow::insertKeyboardActions( KAccel* const a ){
-  a->remove("Copy");
-  a->insert("Copy", i18n("Copy selected text"),"", KStdAccel::copy(), 0, "");
-}
-
-void CReadWindow::initKeyboardActions() {
-  CBTConfig::setupAccel( CBTConfig::readWindow, accel() );
-  insertKeyboardActions( accel() );
-
-  accel()->readSettings();
-	accel()->setSlot("Copy", displayWidget()->connectionsProxy(), SLOT(copySelection()));
-}
-
-/** No descriptions */
-void CReadWindow::copyDisplayedText(){
-  CExportManager mgr(QString::null);
-  mgr.copyKey(key(),CExportManager::Text,true);
-}
diff --git a/bibletime/frontend/displaywindow/creadwindow.h b/bibletime/frontend/displaywindow/creadwindow.h
deleted file mode 100644
index e6950e3..0000000
--- a/bibletime/frontend/displaywindow/creadwindow.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
-                          creadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREADWINDOW_H
-#define CREADWINDOW_H
-
-//BibleTime includes
-#include "cdisplaywindow.h"
-
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qpopupmenu.h>
-
-class KPopupMenu;
-
-/** The base class for all read-only display windows.
-  * @author The BibleTime team
-  */
-
-class CReadWindow : public CDisplayWindow  {
-   Q_OBJECT
-public: 
-	static void insertKeyboardActions( KAccel* const a );
- 	
-  CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CReadWindow();
-  /**
-  * Reimplementation to use the popup menu.
-  */
-  virtual const bool init( const QString& key );
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings(CProfileWindow * const settings);
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void applyProfileSettings(CProfileWindow * const settings);
-
-protected: // Protected methods
-  /**
-  * Sets the display widget of this display window.
-  */
-  virtual void setDisplayWidget( CReadDisplay* newDisplay );
-  /**
-  * Returns the display widget of this window.
-  */
-  virtual CReadDisplay* const displayWidget();
-  /**
-  * Setup the entries of the popup menu.
-  */
-	virtual void initKeyboardActions();
-
-protected slots:
-  virtual void lookup( CSwordKey* );
-  /**
-  * Update the status of the popup menu entries.
-  */
-  virtual void copyDisplayedText();
-  
-private:
-	CReadDisplay* m_displayWidget;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp
deleted file mode 100644
index a354955..0000000
--- a/bibletime/frontend/displaywindow/cwritewindow.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/***************************************************************************
-                          cwritewindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cwritewindow.h"
-
-#include "backend/cswordmoduleinfo.h"
-
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cprofilewindow.h"
-
-//KDE includes
-#include <kmessagebox.h>
-#include <klocale.h>
-
-CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name )
-  : CDisplayWindow(modules, parent,name), m_writeDisplay(0) {
-}
-
-CWriteWindow::~CWriteWindow(){
-}
-
-
-void CWriteWindow::insertKeyboardActions( KAccel* const /*a*/ ) {
-
-};
-
-const bool CWriteWindow::init( const QString& keyName ) {
-  qWarning("CWriteWindow::init( const QString& keyName )");
-  CDisplayWindow::init(keyName);
-// 	setupPopupMenu();
-  keyChooser()->setKey(key());
-	setReady(true);
-  return true;
-};
-
-
-void CWriteWindow::initConnections() {
-	qWarning("CWriteWindow::initConnections()");
-	Q_ASSERT(keyChooser());
-
-	connect(keyChooser(), SIGNAL(beforeKeyChange(const QString&)),
-		this, SLOT(beforeKeyChange(const QString&))
-	);
-};
-
-void CWriteWindow::initKeyboardActions() {
-};
-
-void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) {
-
-  settings->setWriteWindowType( writeWindowType() );
-  
-	QRect rect;
-	rect.setX(parentWidget()->x());
-	rect.setY(parentWidget()->y());
-	rect.setWidth(width());
-	rect.setHeight(height());
-	settings->setGeometry(rect);
-
-//	settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
-	settings->setType(modules().first()->type());
-	settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
-
-	if (key()) {
-		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
-		QString oldLang;
-		if (vk) {
-			 oldLang = QString::fromLatin1(vk->getLocale());
-			vk->setLocale("en"); //save english locale names as default!
-		}
-		settings->setKey( key()->key() );
-		if (vk) {
-			vk->setLocale(oldLang.latin1());
-		}
-	}
-
-	QStringList mods;
-	for (CSwordModuleInfo* m = modules().first(); m; m = modules().next()) {
-		mods.append(m->name());
-	}
-	settings->setModules(mods);
-};
-
-void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
-	setUpdatesEnabled(false);
-
-	if (settings->maximized()) {
-		parentWidget()->showMaximized();
-	}
-	else {
-		const QRect rect = settings->geometry();
-		resize(rect.width(), rect.height());
-		parentWidget()->move(rect.x(), rect.y());
-		//setGeometry( settings->geometry() );
-	}
-//	displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );
-//	m_htmlWidget->view()->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical );
-
-	setUpdatesEnabled(true);
-};
-
-/** Sets the write display-widget for this write display window. */
-void CWriteWindow::setDisplayWidget( CWriteDisplay* display ){
-  CDisplayWindow::setDisplayWidget(display);
-  m_writeDisplay = display;
-}
-
-/** Look up the given key and display the text. In our case we offer to edit the text. */
-void CWriteWindow::lookup( CSwordKey* newKey ){
-  //set the raw text to the display widget
-	if (!newKey)
-		return;
-
-	if (key() != newKey) { //set passage of newKey to key() if they're different, otherwise we'd get mixed up if we look up newkey which may have a different module set
-		key()->key(newKey->key());
-  }
-
-	if ( modules().first() ) {
-  	displayWidget()->setText( key()->rawText() );
-  }
-	setCaption( windowCaption() );
-}
-
-/** Returns the write display widget used by this window. */
-CWriteDisplay* const CWriteWindow::displayWidget(){
-  return m_writeDisplay;
-}
-
-/** Saves settings */
-bool CWriteWindow::queryClose(){
-//  qWarning("queryClose called!");
-	//save the text if it has changed
-	if (m_writeDisplay->isModified()) {
-		switch (KMessageBox::warningYesNoCancel( this, i18n("Save text before closing?")) ) {
-			case KMessageBox::Yes: { //save and close
-	   		saveCurrentText();
-	   		m_writeDisplay->setModified( false );
-	     	return true;
-			}
-	   	case KMessageBox::No: //don't save and close
-	     	return true;
-	   	default: // cancel, don't close
-	     	return false;
-		}
-	}
-	return true;
-}
-
-void CWriteWindow::beforeKeyChange(const QString& key) {
-	Q_ASSERT(displayWidget());
-	Q_ASSERT(keyChooser());
-	if (!isReady()) {
-		return;
-	}
-
-	//If the text changed and we'd do a lookup ask the user if the text should be saved
-	if (modules().first() && displayWidget()->isModified()) {
-		switch (KMessageBox::warningYesNo( this, i18n("Save changed text?")) ) {
-			case KMessageBox::Yes: { //save the changes
-	   		saveCurrentText( key );
-	     	break;
-			}
-	    default: {// set modified to false so it won't ask again
-				displayWidget()->setModified(false);
-	     	break;
-			}
-		}
-	}
-}
diff --git a/bibletime/frontend/displaywindow/cwritewindow.h b/bibletime/frontend/displaywindow/cwritewindow.h
deleted file mode 100644
index d183d0f..0000000
--- a/bibletime/frontend/displaywindow/cwritewindow.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/***************************************************************************
-                          cwritewindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CWRITEWINDOW_H
-#define CWRITEWINDOW_H
-
-//BibleTime includes
-#include "frontend/display/cwritedisplay.h"
-#include "cdisplaywindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-/**The base class for all write-only display windows.
-  *@author The BibleTime team
-  */
-
-class CWriteWindow : public CDisplayWindow  {
-	Q_OBJECT
-public:
-	static void insertKeyboardActions( KAccel* const a );
-
-	CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	~CWriteWindow();
-  /**
-  * Reimplementation to use the popup menu.
-  */
-  virtual const bool init( const QString& key );
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings(CProfileWindow * const settings);
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void applyProfileSettings(CProfileWindow * const settings);
-  /**
-  * Returns the write display widget used by this window.
-  */
-  CWriteDisplay* const displayWidget();
-  virtual void initConnections();
-  virtual void initKeyboardActions();
-
-public slots:
-  /**
-  * Look up the given key and display the text. In our case we offer to edit the text.
-  */
-  virtual void lookup( CSwordKey* key );
-
-
-protected: // Protected methods
-  /**
-  * Saves the given text as text of the given key. Use this function
-	* as backend in each write window implementation.
-  */
-  void setDisplayWidget( CWriteDisplay* display );
-  virtual const CDisplayWindow::WriteWindowType writeWindowType() = 0;
-  virtual bool queryClose();
-  virtual void saveCurrentText( const QString& key ) = 0;
-
-protected slots:
-  /** Save text to the module
-  */
-  void saveCurrentText() {
-		if(key()) {
-			saveCurrentText(key()->key());
-		};
-	};
-	virtual void beforeKeyChange(const QString&);
-
-private:
-  CWriteDisplay* m_writeDisplay;
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/Makefile.am b/bibletime/frontend/keychooser/Makefile.am
deleted file mode 100644
index 4fa0d18..0000000
--- a/bibletime/frontend/keychooser/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-INCLUDES = $(all_includes)
-
-libkeychooser_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libkeychooser.a
-
-libkeychooser_a_SOURCES = \
-cbiblekeychooser.cpp \
-clexiconkeychooser.cpp \
-ckeychooser.cpp \
-cfx_btn.cpp \
-ckeychooserwidget.cpp \
-cbookkeychooser.cpp \
-cbooktreechooser.cpp
-
-all_headers = ckeychooserwidget.h \
-cfx_btn.h \
-ckeychooser.h \
-clexiconkeychooser.h \
-cbiblekeychooser.h \
-cbookkeychooser.h \
-cbooktreechooser.h
-
-EXTRA_DIST = $(libkeychooser_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/keychooser/Makefile.in b/bibletime/frontend/keychooser/Makefile.in
deleted file mode 100644
index 201c969..0000000
--- a/bibletime/frontend/keychooser/Makefile.in
+++ /dev/null
@@ -1,768 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libkeychooser_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libkeychooser.a
-
-libkeychooser_a_SOURCES = \
-cbiblekeychooser.cpp \
-clexiconkeychooser.cpp \
-ckeychooser.cpp \
-cfx_btn.cpp \
-ckeychooserwidget.cpp \
-cbookkeychooser.cpp \
-cbooktreechooser.cpp
-
-
-all_headers = ckeychooserwidget.h \
-cfx_btn.h \
-ckeychooser.h \
-clexiconkeychooser.h \
-cbiblekeychooser.h \
-cbookkeychooser.h \
-cbooktreechooser.h
-
-
-EXTRA_DIST = $(libkeychooser_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/keychooser
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libkeychooser_a_AR = $(AR) cru
-libkeychooser_a_LIBADD =
-am_libkeychooser_a_OBJECTS = cbiblekeychooser.$(OBJEXT) \
-	clexiconkeychooser.$(OBJEXT) ckeychooser.$(OBJEXT) \
-	cfx_btn.$(OBJEXT) ckeychooserwidget.$(OBJEXT) \
-	cbookkeychooser.$(OBJEXT) cbooktreechooser.$(OBJEXT)
-#>- libkeychooser_a_OBJECTS = $(am_libkeychooser_a_OBJECTS)
-#>+ 8
-libkeychooser_a_final_OBJECTS = libkeychooser_a.all_cpp.o 
-libkeychooser_a_nofinal_OBJECTS = cbiblekeychooser.$(OBJEXT) \
-	clexiconkeychooser.$(OBJEXT) ckeychooser.$(OBJEXT) \
-	cfx_btn.$(OBJEXT) ckeychooserwidget.$(OBJEXT) \
-	cbookkeychooser.$(OBJEXT) cbooktreechooser.$(OBJEXT)\
-crefselectdialog.moc.o cbookkeychooser.moc.o ckeychooserwidget.moc.o cfx_btn.moc.o cbooktreechooser.moc.o ckeychooser.moc.o clexiconkeychooser.moc.o cbiblekeychooser.moc.o 
-@KDE_USE_FINAL_FALSE@libkeychooser_a_OBJECTS = $(libkeychooser_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libkeychooser_a_OBJECTS = $(libkeychooser_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cbiblekeychooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbookkeychooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbooktreechooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cfx_btn.Po ./$(DEPDIR)/ckeychooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ckeychooserwidget.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/clexiconkeychooser.Po
-#>+ 12
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/crefselectdialog.moc.P $(DEPDIR)/cbookkeychooser.moc.P $(DEPDIR)/ckeychooserwidget.moc.P $(DEPDIR)/cfx_btn.moc.P $(DEPDIR)/cbooktreechooser.moc.P $(DEPDIR)/ckeychooser.moc.P $(DEPDIR)/clexiconkeychooser.moc.P $(DEPDIR)/cbiblekeychooser.moc.P  $(DEPDIR)/libkeychooser_a.all_cpp.P ./$(DEPDIR)/cbiblekeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookkeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbooktreechooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cfx_btn.Po ./$(DEPDIR)/ckeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ckeychooserwidget.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconkeychooser.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/crefselectdialog.moc.P $(DEPDIR)/cbookkeychooser.moc.P $(DEPDIR)/ckeychooserwidget.moc.P $(DEPDIR)/cfx_btn.moc.P $(DEPDIR)/cbooktreechooser.moc.P $(DEPDIR)/ckeychooser.moc.P $(DEPDIR)/clexiconkeychooser.moc.P $(DEPDIR)/cbiblekeychooser.moc.P ./$(DEPDIR)/cbiblekeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookkeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbooktreechooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cfx_btn.Po ./$(DEPDIR)/ckeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ckeychooserwidget.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconkeychooser.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libkeychooser_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libkeychooser_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/keychooser/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/keychooser/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/keychooser/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libkeychooser.a: $(libkeychooser_a_OBJECTS) $(libkeychooser_a_DEPENDENCIES) 
-	-rm -f libkeychooser.a
-	$(libkeychooser_a_AR) libkeychooser.a $(libkeychooser_a_OBJECTS) $(libkeychooser_a_LIBADD)
-	$(RANLIB) libkeychooser.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbiblekeychooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbookkeychooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbooktreechooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfx_btn.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ckeychooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ckeychooserwidget.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clexiconkeychooser.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-crefselectdialog.moc.cpp: $(srcdir)/crefselectdialog.h
-	$(MOC) $(srcdir)/crefselectdialog.h -o crefselectdialog.moc.cpp
-
-#>+ 2
-mocs: crefselectdialog.moc.cpp
-
-#>+ 3
-cbookkeychooser.moc.cpp: $(srcdir)/cbookkeychooser.h
-	$(MOC) $(srcdir)/cbookkeychooser.h -o cbookkeychooser.moc.cpp
-
-#>+ 2
-mocs: cbookkeychooser.moc.cpp
-
-#>+ 3
-ckeychooserwidget.moc.cpp: $(srcdir)/ckeychooserwidget.h
-	$(MOC) $(srcdir)/ckeychooserwidget.h -o ckeychooserwidget.moc.cpp
-
-#>+ 2
-mocs: ckeychooserwidget.moc.cpp
-
-#>+ 3
-cfx_btn.moc.cpp: $(srcdir)/cfx_btn.h
-	$(MOC) $(srcdir)/cfx_btn.h -o cfx_btn.moc.cpp
-
-#>+ 2
-mocs: cfx_btn.moc.cpp
-
-#>+ 3
-cbooktreechooser.moc.cpp: $(srcdir)/cbooktreechooser.h
-	$(MOC) $(srcdir)/cbooktreechooser.h -o cbooktreechooser.moc.cpp
-
-#>+ 2
-mocs: cbooktreechooser.moc.cpp
-
-#>+ 3
-ckeychooser.moc.cpp: $(srcdir)/ckeychooser.h
-	$(MOC) $(srcdir)/ckeychooser.h -o ckeychooser.moc.cpp
-
-#>+ 2
-mocs: ckeychooser.moc.cpp
-
-#>+ 3
-clexiconkeychooser.moc.cpp: $(srcdir)/clexiconkeychooser.h
-	$(MOC) $(srcdir)/clexiconkeychooser.h -o clexiconkeychooser.moc.cpp
-
-#>+ 2
-mocs: clexiconkeychooser.moc.cpp
-
-#>+ 3
-cbiblekeychooser.moc.cpp: $(srcdir)/cbiblekeychooser.h
-	$(MOC) $(srcdir)/cbiblekeychooser.h -o cbiblekeychooser.moc.cpp
-
-#>+ 2
-mocs: cbiblekeychooser.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  crefselectdialog.moc.cpp cbookkeychooser.moc.cpp ckeychooserwidget.moc.cpp cfx_btn.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp clexiconkeychooser.moc.cpp cbiblekeychooser.moc.cpp
-
-#>+ 2
-KDE_DIST=cfx_btn.h crefselectdialog.h ckeychooser.h crefselectdialog.cpp cbiblekeychooser.h clexiconkeychooser.h ckeychooserwidget.h cbooktreechooser.h cbookkeychooser.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/keychooser/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/keychooser/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libkeychooser_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cbiblekeychooser.cpp $(srcdir)/clexiconkeychooser.cpp $(srcdir)/ckeychooser.cpp $(srcdir)/cfx_btn.cpp $(srcdir)/ckeychooserwidget.cpp $(srcdir)/cbookkeychooser.cpp $(srcdir)/cbooktreechooser.cpp cbookkeychooser.moc.cpp crefselectdialog.moc.cpp ckeychooserwidget.moc.cpp cfx_btn.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp 
-	@echo 'creating libkeychooser_a.all_cpp.cpp ...'; \
-	rm -f libkeychooser_a.all_cpp.files libkeychooser_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libkeychooser_a.all_cpp.final; \
-	for file in cbiblekeychooser.cpp clexiconkeychooser.cpp ckeychooser.cpp cfx_btn.cpp ckeychooserwidget.cpp cbookkeychooser.cpp cbooktreechooser.cpp cbookkeychooser.moc.cpp crefselectdialog.moc.cpp ckeychooserwidget.moc.cpp cfx_btn.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libkeychooser_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeychooser_a.all_cpp.final; \
-	done; \
-	cat libkeychooser_a.all_cpp.final libkeychooser_a.all_cpp.files > libkeychooser_a.all_cpp.cpp; \
-	rm -f libkeychooser_a.all_cpp.final libkeychooser_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libkeychooser_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
deleted file mode 100644
index 563e187..0000000
--- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/***************************************************************************
-                          cbiblekeychooser.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cbiblekeychooser.h"
-#include "ckeychooserwidget.h"
-#include "cfx_btn.h"
-
-#include "backend/cswordversekey.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qcombobox.h>
-#include <qlistbox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-
-//KDE includes
-#include <klocale.h>
-
-CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name )
-	: CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordVerseKey*>(key))
-{
-	setModules(modules, false);
-	if (!m_modules.count()) {
-		qWarning("CBibleKeyChooser: module is not a Bible or commentary!");
-    m_key = 0;
-		return;
-	}
-
-	QHBoxLayout* layout = new QHBoxLayout(this);
-  layout->setDirection( QBoxLayout::LeftToRight );
-		
-	w_book = new CKeyChooserWidget(m_modules.first()->books(),false,this);	
-	w_book->setToolTips(
-    CResMgr::displaywindows::bibleWindow::bookList::tooltip,
-    CResMgr::displaywindows::bibleWindow::nextBook::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::bibleWindow::previousBook::tooltip
-  );
-	w_book->setWhatsThis(
-    CResMgr::displaywindows::bibleWindow::bookList::whatsthis,
-    CResMgr::displaywindows::bibleWindow::nextBook::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::bibleWindow::previousBook::whatsthis
-  );
-	
-  w_chapter = new CKeyChooserWidget( m_modules.first()->chapterCount(w_book->comboBox()->currentText()),true,this);		
-	w_chapter->setToolTips(
-    CResMgr::displaywindows::bibleWindow::chapterList::tooltip,
-    CResMgr::displaywindows::bibleWindow::nextChapter::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::bibleWindow::previousChapter::tooltip
-  );
-	w_chapter->setWhatsThis(
-    CResMgr::displaywindows::bibleWindow::chapterList::whatsthis,
-    CResMgr::displaywindows::bibleWindow::nextChapter::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::bibleWindow::previousChapter::whatsthis
-  );
-	
-  w_verse = new CKeyChooserWidget( m_modules.first()->verseCount(w_book->comboBox()->currentText(),1),true,this);
-	w_verse->setToolTips(
-    CResMgr::displaywindows::bibleWindow::verseList::tooltip,
-    CResMgr::displaywindows::bibleWindow::nextVerse::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::bibleWindow::previousVerse::tooltip
-  );
-	w_verse->setWhatsThis(
-    CResMgr::displaywindows::bibleWindow::verseList::whatsthis,
-    CResMgr::displaywindows::bibleWindow::nextVerse::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::bibleWindow::previousVerse::whatsthis
-  );
-
-	QWidget::setTabOrder(w_book, w_chapter);
-	QWidget::setTabOrder(w_chapter, w_verse);
-	QWidget::setTabOrder(w_verse, 0);
-		
-	layout->addWidget(w_book,0);
-	layout->addWidget(w_chapter,0);
-	layout->addWidget(w_verse,0);
-
-	/* Book connections */
-	connect(w_book,SIGNAL(changed(int))       ,SLOT(bookChanged(int)));
-	connect(w_book,SIGNAL(focusOut(int))      ,SLOT(bookFocusOut(int)));	
-	
-	/* Chapter Connections */
-	connect(w_chapter,SIGNAL(changed(int))    ,SLOT(chapterChanged(int)));
-	connect(w_chapter,SIGNAL(next_requested()),SLOT(chapterNextRequested()));
-	connect(w_chapter,SIGNAL(prev_requested()),SLOT(chapterPrevRequested()));
-	connect(w_chapter,SIGNAL(focusOut(int))   ,SLOT(chapterFocusOut(int)));
-
-
-	/* Verse Connections */
-	connect(w_verse,SIGNAL(changed(int))      ,SLOT(verseChanged(int)));
-	connect(w_verse,SIGNAL(next_requested())  ,SLOT(verseNextRequested()));
-	connect(w_verse,SIGNAL(prev_requested())  ,SLOT(versePrevRequested()));
-	connect(w_verse,SIGNAL(focusOut(int))     ,SLOT(verseFocusOut(int)));
-}
-
-CSwordKey* const CBibleKeyChooser::key(){
-	if (m_key) {
-    const int chapter =  w_chapter->comboBox()->currentText().toInt();
-    const int verse = w_verse->comboBox()->currentText().toInt();
-		m_key->book(w_book->comboBox()->currentText());
-		m_key->Chapter(chapter < 0 ? 0 : chapter);
-		m_key->Verse(verse < 0 ? 0 : verse);
-	}
-	return m_key;
-}
-
-void CBibleKeyChooser::setKey(CSwordKey* key){
-	if ( !(m_key = dynamic_cast<CSwordVerseKey*>(key)) )
-		return;
-
-	emit (beforeKeyChange(m_key->key())); //required to make direct setKey calls work from the outside
-
-	const int chapter = m_key->Chapter();
-	const int verse = m_key->Verse();
-
-	//reset the keychooser parts only if we found a valid book
-	const int count = w_book->comboBox()->count();
-	const QString desiredBook = m_key->book();
-	bool bookIsValid = false;
-	for (int i = 0; i < count; ++i) {
-		if (w_book->comboBox()->text(i) == desiredBook) {
-			bookIsValid = true;
-			break;
-		}
-	}
-
-	if (bookIsValid) {	//we have a valid book
-		if (w_book->comboBox()->currentText() != m_key->book()) { //necessary?
-			w_book->setItem( m_key->book() );
-		}
-
-		w_chapter->reset(m_modules.first()->chapterCount(m_key->book()), chapter-1, false);
-		w_verse->reset(m_modules.first()->verseCount(m_key->book(), chapter), verse-1, false);
-
-    emit keyChanged(m_key);
-	}
-	else {
-  	w_chapter->comboBox()->setCurrentItem(0);
- 		m_key->Chapter(1);
-
-    w_verse->comboBox()->setCurrentItem(0);
-		m_key->Verse(1);
-	}
-}
-
-void CBibleKeyChooser::chapterNextRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-
-	setUpdatesEnabled(false);
-	if (m_key) {
-		emit beforeKeyChange(m_key->key());
-	}
-	if (m_key->next(CSwordVerseKey::UseChapter)) {
-		setKey(m_key);
-	}
-	setUpdatesEnabled(true);
-}
-
-/**  */
-void CBibleKeyChooser::chapterPrevRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-
-	setUpdatesEnabled(false);
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->previous(CSwordVerseKey::UseChapter))
-		setKey(m_key);
-	setUpdatesEnabled(true);
-}
-
-/**  */
-void CBibleKeyChooser::verseNextRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-	
-	setUpdatesEnabled(false);
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->next(CSwordVerseKey::UseVerse))
-		setKey(m_key);
-	setUpdatesEnabled(true);
-}
-
-/**  */
-void CBibleKeyChooser::versePrevRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-	
-	setUpdatesEnabled(false);	
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->previous(CSwordVerseKey::UseVerse))
-		setKey(m_key);
-	setUpdatesEnabled(true);
-}
-
-void CBibleKeyChooser::bookChanged(int /*i*/){
-//	qWarning("CBibleKeyChooser::bookChanged(int /*i*/)");
- 	Q_ASSERT(m_key);
-
-	if (!isUpdatesEnabled())
-		return;
-
-	setUpdatesEnabled(false);
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->book() != w_book->comboBox()->currentText()) {
-		m_key->book( w_book->comboBox()->currentText() );
-		setKey( m_key );
-	}
-	setUpdatesEnabled(true);
-}
-
-void CBibleKeyChooser::chapterChanged(int /*i*/){
-//	qWarning("CBibleKeyChooser::chapterChanged(int /*i*/)");
-	if (!isUpdatesEnabled())
-		return;
-	
-	setUpdatesEnabled(false);		
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-//	if (m_key)
-//		emit beforeKeyChange(m_key->key());
-
-	if (m_key->Chapter() != w_chapter->comboBox()->currentText().toInt()) {
-		m_key->Chapter( w_chapter->comboBox()->currentText().toInt() );
-		setKey( m_key );
-	}
-
-	setUpdatesEnabled(true);
-}
-
-void CBibleKeyChooser::verseChanged(int /*i*/){
-//	qDebug("CBibleKeyChooser::verseChanged(int /*i*/)");
-	if (!isUpdatesEnabled())
-		return;	
-	
-	setUpdatesEnabled(false);			
-
-	if (m_key->Verse() != w_verse->comboBox()->currentText().toInt()) {		
-		m_key->Verse( w_verse->comboBox()->currentText().toInt() );	
-		setKey( m_key );
-	}
-	
-	setUpdatesEnabled(true);	
-}
-
-/** Reimplementation */
-QSize CBibleKeyChooser::sizeHint(){
-  return QSize( w_book->sizeHint().width() + w_chapter->sizeHint().width() + w_verse->sizeHint().width(), w_book->sizeHint().height());
-}
-
-/** Reimplementation. */
-void CBibleKeyChooser::refreshContent() {
-  if (!m_modules.count() || !m_modules.first())
-    return;
-
-  w_book->reset( m_modules.first()->books(), w_book->comboBox()->currentItem(), false);
-	setKey(m_key);
-}
-
-/** Sets te module and refreshes the combos */
-void CBibleKeyChooser::setModules(ListCSwordModuleInfo modules, const bool refresh){
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if (modules.current()->type() == CSwordModuleInfo::Bible || modules.current()->type() == CSwordModuleInfo::Commentary) {
-      if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules.current())) {
-        m_modules.append(bible);
-      }
-    }
-  }
-
-  if (refresh)
-    refreshContent();
-}
-
-/** called when the book combo lost the focus with reason == tab @param the new book */
-void CBibleKeyChooser::bookFocusOut(int /*index*/){
-	if (!isUpdatesEnabled())
-		return;
-		
-	setUpdatesEnabled(false);
-	
-	m_key->book( w_book->comboBox()->currentText() );
-	const int chapterCount = m_modules.first()->chapterCount( m_modules.first()->bookNumber(m_key->book()));
-	w_chapter->reset( chapterCount, m_key->Chapter()-1, false);
-			
-	const int verseCount = m_modules.first()->verseCount(m_modules.first()->bookNumber(m_key->book()),m_key->Chapter());
-	w_verse->reset(verseCount,m_key->Verse()-1,false);
-
-	setUpdatesEnabled(true);
-}
-
-/** called when the chapter combo lost the focus with reason == tab @param the new chapter */
-void CBibleKeyChooser::chapterFocusOut(int /*index*/){
-	const int chapter = w_chapter->comboBox()->currentText().toInt();
-	m_key->Chapter( chapter );
-	w_verse->reset(m_modules.first()->verseCount(m_modules.first()->bookNumber(m_key->book()),chapter), 0, false);
-}
-
-/** called when the verse combo lost the focus with reason == tab @param the new verse */
-void CBibleKeyChooser::verseFocusOut(int /*index*/){
-	m_key->Verse( w_verse->comboBox()->currentText().toInt() );
-	setKey( m_key );	
-}
-
-/** No descriptions */
-void CBibleKeyChooser::updateKey(CSwordKey* /*key*/){
-}
-
-/** No descriptions */
-void CBibleKeyChooser::adjustFont(){
-//#warning implement a suitable solution. must be based on locales, not on module->isUnicode. Maybe just do nothing? =)
-}
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.h b/bibletime/frontend/keychooser/cbiblekeychooser.h
deleted file mode 100644
index 205919c..0000000
--- a/bibletime/frontend/keychooser/cbiblekeychooser.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/***************************************************************************
-                          cbiblekeychooser.h  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBIBLEKEYCHOOSER_H
-#define CBIBLEKEYCHOOSER_H
-
-#include <qwidget.h>
-#include "ckeychooser.h"
-
-#include "backend/cswordbiblemoduleinfo.h"
-
-class CKeyChooserWidget;
-class CSwordVerseKey;
-
-class CSwordBibleModuleInfo;
-
-class QuickBrowseDialog;
-
-
-/** This class implements the KeyChooser for bibles and commentaries
-	*
-	* it inhertits @ref CKeyChooser
-	*
-	*	it uses 3 @ref CKeyChooserWidget 's to represent the bible keys
-	*
-  * @author The BibleTime team
-  */
-
-class CBibleKeyChooser : public CKeyChooser  {
-   Q_OBJECT
-
-public:
-	/**
-	* the constructor
-	*	you should not need to use this, use @ref CKeyChooser::createInstance instead
-	*/
-	CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-
-public slots:
-	/**
-	* see @ref CKeyChooser::getKey
-	*/
-	CSwordKey* const key();
-	/**
-	* see @ref CKeyChooser::setKey
-	*/
-	virtual void setKey(CSwordKey *key);
-  /**
- 	* Reimplementation
- 	*/
-  virtual QSize sizeHint();
-  /**
-  * Sets te module and refreshes the combos
-  */
-  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = true);
-  /**
- 	* Reimplementation.
- 	*/
-  void refreshContent();
-	/**
-	* used to react to changes in the 3 @ref CKeyChooserWidget 's
-	* @param index not used
-	*/
-	void bookChanged(int index);
-	/**
-	* used to react to changes in the 3 @ref CKeyChooserWidget 's
-	* @param index not used
-	*/
-	void chapterChanged(int index);
-	/**
-	* used to react to changes in the 3 @ref CKeyChooserWidget 's
-	* @param index not used
-	*/
-	void verseChanged(int index);	
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void chapterPrevRequested(void);
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void chapterNextRequested(void);
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void versePrevRequested(void);
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void verseNextRequested(void);
-  void updateKey(CSwordKey* key);
-
-
-protected:
-  virtual void adjustFont();
-
-private:
-	CKeyChooserWidget* w_book;
-	CKeyChooserWidget* w_chapter;
-	CKeyChooserWidget* w_verse;
-	QPtrList<CSwordBibleModuleInfo> m_modules;
-	CSwordVerseKey *m_key;
-
-private slots: // Private slots
-  /**
-  *	called when the book combo lost the focus with reason == tab
-  * @param the new book
-  */
-  void bookFocusOut(int);
-  /**
-  * called when the chapter combo lost the focus with reason == tab
-  * @param the new chapter
-  */
-  void chapterFocusOut(int);
-  /** called when the verse combo lost the focus
-  with reason == tab
-  @param the new verse
-  */
-  void verseFocusOut(int);
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp
deleted file mode 100644
index 315cab0..0000000
--- a/bibletime/frontend/keychooser/cbookkeychooser.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/***************************************************************************
-                          cbookkeychooser.cpp  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbookkeychooser.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qlayout.h>
-#include <qmap.h>
-
-QMap<QObject*, int> boxes;
-
-CBookKeyChooser::CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name)
-	: CKeyChooser(modules, key, parent,name), m_layout(0) {
-
-  setModules(modules, false);
-	m_key = dynamic_cast<CSwordTreeKey*>(key);
-  if (!m_modules.count()) {
-		m_key = 0;
-	}
-  setModules(modules, true);
-	adjustFont();
-}
-
-CBookKeyChooser::~CBookKeyChooser(){
-}
-
-void CBookKeyChooser::setKey(CSwordKey* newKey){
-	setKey(newKey, true);
-}
-
-/** Sets a new key to this keychooser */
-void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal){
-	if (m_key != newKey )
-		m_key = dynamic_cast<CSwordTreeKey*>(newKey);
-	
-	const QString oldKey = m_key->key();
-	QStringList siblings;
-	if (m_key && !oldKey.isEmpty())
-		siblings = QStringList::split("/",oldKey,false);
-
-	int depth = 0;
-	int index = 0;
-	
-	m_key->root();
-	while( m_key->firstChild() && (depth <= int(siblings.count())) ) {
-		const QString key = m_key->key();
-		index = 0;
-		const QString sibling = siblings[depth];
-		if (!sibling.isEmpty()) { //found it
-			bool found = false;			
-			do {
-				++index;
-				found = (m_key->getLocalName() == sibling);
-			} while (!found && m_key->nextSibling());			
-			if (!found)
-				m_key->key( key );
-		}	
-		setupCombo(key, depth++, index);		
-	}
-	
-	//clear the combos which were not filled
-	for (; depth < m_modules.first()->depth(); ++depth)  {
-		CKeyChooserWidget* chooser = m_chooserWidgets.at(depth);
-		if (chooser)
-			chooser->reset(0,0,false);
-	}
-	
-	if (oldKey.isEmpty())
-		m_key->root();
-	else
-		m_key->key(oldKey);
-
-	if (emitSignal)
-		emit keyChanged(m_key);
-}
-
-/** Returns the key of this kechooser. */
-CSwordKey* const CBookKeyChooser::key(){
-	return m_key;
-}
-
-/** Sets another module to this keychooser */
-void CBookKeyChooser::setModules(ListCSwordModuleInfo modules, const bool refresh){
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if ( modules.current()->type() == CSwordModuleInfo::GenericBook ) {
-      if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.current())) {
-        m_modules.append(book);
-      }
-    }
-  }
-
-	//refresh the number of combos
-	if (refresh && m_modules.count() && m_key) {
-		if (!m_layout)
-			m_layout = new QHBoxLayout(this);
-
-		//delete old widgets
-		m_chooserWidgets.setAutoDelete(true);
-		m_chooserWidgets.clear();
-		m_chooserWidgets.setAutoDelete(false);
-		
-		for (int i = 0; i < m_modules.first()->depth(); ++i) {			
-			CKeyChooserWidget* w = new CKeyChooserWidget(0, false, this); //empty keychooser
-			m_chooserWidgets.append( w );
-			connect(w, SIGNAL(changed(int)), SLOT(keyChooserChanged(int)));
-
-			// make sure the boxes don't become too broad.
-			w->comboBox()->setMaximumWidth(200);
-			m_layout->addWidget(w);
-
-      boxes[w] = i;
-
-			w->show();
-		}
-		updateKey(m_key);
-		adjustFont(); // only when refresh is set.		
-	}
-}
-
-/** No descriptions */
-void CBookKeyChooser::adjustFont(){
- 	//Make sure the entries are displayed correctly.
-	for ( CKeyChooserWidget* idx = m_chooserWidgets.first(); idx; idx = m_chooserWidgets.next() ) {
-		idx->comboBox()->setFont( CBTConfig::get( m_modules.first()->language() ).second );
-	}
-}
-
-/** Refreshes the content. */
-void CBookKeyChooser::refreshContent(){
-	if (m_key)
-		updateKey( m_key ); //refresh with current key
-}
-
-void CBookKeyChooser::setupCombo(const QString key, const int depth, const int currentItem){
-	CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth);
-	if ((depth == 0) && chooserWidget && chooserWidget->comboBox()->count()) { //has already items
-		//set now the right item		
-		if (CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth)) {
-			chooserWidget->setItem( chooserWidget->comboBox()->text(currentItem) );
-		}
-		return;
-	}
-	
-	const QString oldKey = m_key->key();	
-	m_key->key(key);
-	
-	//insert an empty item at the top
-	QStringList items;	
-	items << QString::null;
-	do {
-		items << QString::fromLocal8Bit(m_key->getLocalName());
-	}
-	while (m_key->nextSibling());
-		
-	if (chooserWidget) {
-		chooserWidget->reset(items,currentItem,false);
-	}
-	
-	//restore old key
-	m_key->key(oldKey);	
-}
-
-/** A keychooser changed. Update and emit a signal if necessary. */
-void CBookKeyChooser::keyChooserChanged(int /*newIndex*/){
-  const int activeID = boxes[const_cast<QObject*>(sender())]; //no so good code!
-	
-  QStringList items;
-	CKeyChooserWidget* chooser;
-	const int count = m_chooserWidgets.count();
-	for (int i = 0; i < count; ++i) {
-		chooser = m_chooserWidgets.at(i);
-		const QString currentText = (chooser && chooser->comboBox()) ? chooser->comboBox()->currentText() : QString::null;
-		if (currentText.isEmpty() || i > activeID) {
-			break;
-    }
-		items << currentText;
-	}
-
-	QString newKey = QString::fromLatin1("/") + items.join("/");
-	if (newKey.length() > 1)
-		newKey.remove(newKey.length(),1); //remove the traling slash
-	
-	m_key->key(newKey);
-	setKey(m_key);
-}
-
-/** Updates the keychoosers for the given key but emit no signal. */
-void CBookKeyChooser::updateKey(CSwordKey* key){
-	setKey(key, false);
-}
-
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.h b/bibletime/frontend/keychooser/cbookkeychooser.h
deleted file mode 100644
index 08cabf5..0000000
--- a/bibletime/frontend/keychooser/cbookkeychooser.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
-                          cbookkeychooser.h  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBOOKKEYCHOOSER_H
-#define CBOOKKEYCHOOSER_H
-
-//BibleTime includes
-#include "ckeychooser.h"
-#include "ckeychooserwidget.h"
-
-//Sword includes
-
-//Qt includes
-#include <qwidget.h>
-#include <qsize.h>
-#include <qmap.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-
-class CSwordKey;
-class CSwordBookModuleInfo;
-class CSwordTreeKey;
-
-class TreeKeyIdx;
-
-class QHBoxLayout;
-
-/** The keychooser implementation for books.
-  * @author The BibleTime team
-  */
-class CBookKeyChooser : public CKeyChooser  {
-   Q_OBJECT
-public: 
-	CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-	~CBookKeyChooser();
-  /**
-  * Refreshes the content.
-  */
-  virtual void refreshContent();
-  /**
-  * Sets another module to this keychooser
-  */
-  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = false);
-  /**
-  * Returns the key of this kechooser.
-  */
-  virtual CSwordKey* const key();
-  /**
-  * Sets a new key to this keychooser
-  */
-  virtual void setKey(CSwordKey*);
-  /**
-  * Sets a new key to this keychooser
-  */
-  void setKey(CSwordKey*, const bool emitSignal);
-
-
-public slots: // Public slots
-  /**
-  * Updates the keychoosers for the given key but emit no signal.
-  */
-  void updateKey(CSwordKey*);
-
-protected: // Protected methods
-  /**
-  * Fills the combo given by depth with the items from the key having depth "depth".
-	* The parent sibling is given by key.
-	*/
-  void setupCombo(const QString key, const int depth, const int currentItem);
-  /** No descriptions */
-  virtual void adjustFont();
-
-protected slots:
-  /**
-  * A keychooser changed. Update and emit a signal if necessary.
-  */
-  void keyChooserChanged(int);
-  //is called when a keychooser widget wants to jump to the next/previous key
-//  void nextEntry();
-//  void previousEntry();
-
-private:
-	QPtrList<CKeyChooserWidget> m_chooserWidgets;	
-	QPtrList<CSwordBookModuleInfo> m_modules;
-	CSwordTreeKey *m_key;
-	QHBoxLayout* m_layout;
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp
deleted file mode 100644
index 071e808..0000000
--- a/bibletime/frontend/keychooser/cbooktreechooser.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/***************************************************************************
-                          cbooktreechooser.cpp  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbooktreechooser.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qlayout.h>
-#include <qheader.h>
-#include <qlistview.h>
-#include <qcursor.h>
-
-//KDE includes
-#include <kapplication.h>
-
-////////////
-
-CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName)
-	: KListViewItem(parent, after),
-  m_key(key),
-  m_keyName(keyName)
-{	
-  m_key->key(m_keyName);
-  setText(0, QString::fromLatin1(m_key->getLocalName()) );
-};
-
-CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent,CSwordTreeKey* key, const QString keyName)
-	: KListViewItem(parent),
-  m_key(key),
-  m_keyName(keyName)
-{	
-  m_key->key(m_keyName);
-  setText(0, QString::fromLatin1(m_key->getLocalName()) );
-};
-
-CBookTreeChooser::TreeItem::TreeItem(QListView* view, QListViewItem* after,CSwordTreeKey* key, const QString keyName)
-	: KListViewItem(view,after),
-  m_key(key),
-  m_keyName(keyName)
-{	
-  m_key->key(m_keyName);
-  setText(0, QString::fromLatin1(m_key->getLocalName()) );
-};
-
-const QString& CBookTreeChooser::TreeItem::key() const {
-	return m_keyName;
-};	
-
-/** Initializes this item with the correct caption. */
-void CBookTreeChooser::TreeItem::setup() {
-  m_key->key(m_keyName);
-  setExpandable(m_key->hasChildren());
-
-  KListViewItem::setup();
-}
-
-void CBookTreeChooser::TreeItem::createChilds() {
-  m_key->key(m_keyName);
-  m_key->firstChild();
-  QListViewItem* oldItem = 0;
-  do {
-    if (oldItem)
-      oldItem = new TreeItem(this, oldItem, m_key, m_key->key());
-    else
-      oldItem = new TreeItem(this, m_key, m_key->key());
-  } while (m_key->nextSibling());
-}
-
-
-void CBookTreeChooser::TreeItem::setOpen(bool o) {
-  //setup the tree under this item
-  if ((!isOpen() && o) && childCount() == 0) {
-    listView()->viewport()->setCursor(WaitCursor);
-    createChilds();
-    listView()->viewport()->unsetCursor();
-  }
-  KListViewItem::setOpen(o);
-}
-
-//////////////////////////////////
-
-CBookTreeChooser::CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name)
-	: CKeyChooser(modules, key, parent,name) {
-  setModules(modules, false);	
-  m_key = dynamic_cast<CSwordTreeKey*>(key);
-  if (!modules.count()) {
-		m_modules.clear();
-		m_key = 0;
-	}
-
-	//now setup the keychooser widgets
-	QHBoxLayout* layout = new QHBoxLayout(this);
-	
-  m_treeView = new KListView(this);
-	layout->addWidget(m_treeView);	
-//	connect( m_treeView, SIGNAL(executed(QListViewItem*)), SLOT(itemClicked(QListViewItem*)));
-	connect( m_treeView, SIGNAL(selectionChanged(QListViewItem*)), SLOT(itemActivated(QListViewItem*)));  
-	m_treeView->addColumn("Tree");	
-	m_treeView->header()->resizeSection( 0,m_treeView->sizeHint().width());
-	m_treeView->header()->setResizeEnabled(-1);
-	m_treeView->header()->hide();
-	m_treeView->setSorting(-1);
-	m_treeView->setRootIsDecorated(true);
-  m_treeView->setFullWidth(true);
-
-  adjustFont();
-}
-
-CBookTreeChooser::~CBookTreeChooser(){
-}
-
-/** Sets a new key to this keychooser */
-void CBookTreeChooser::setKey(CSwordKey* /*newKey*/){
-}
-
-/** Sets a new key to this keychooser */
-void CBookTreeChooser::setKey(CSwordKey* newKey, const bool emitSignal){
- 	if (m_key != newKey )
-		m_key = dynamic_cast<CSwordTreeKey*>(newKey);
-	
-	const QString key = m_key->key();
-	
-	QStringList siblings;
-	if (m_key && !key.isEmpty())
-		siblings = QStringList::split("/",key,false);
-	
-	//find the right listview item
-	const int count = siblings.count();
-	int index = 0;
-	QString currentSibling = siblings[index];
-	
-  QListViewItem* child = m_treeView->firstChild();
-  while( child && index < count ) {
-  	if (child->text(0) == currentSibling) { //found a parent of our item
-  		//found right entry?
-  		TreeItem* i = dynamic_cast<TreeItem*>(child);
-  		if (!i || i->key() == key) {
-  			break;
-  		}
-  		i->setOpen(true); //automatically creates childs
-      child = i->firstChild();
-  		currentSibling = siblings[++index];
-  	}
-  	else
-			child = child->nextSibling();
-  }
-	
-  m_treeView->setCurrentItem( child );
-  m_treeView->ensureItemVisible(child);
-	if (emitSignal)
-		emit keyChanged(m_key);
-}
-
-/** Returns the key of this kechooser. */
-CSwordKey* const CBookTreeChooser::key(){
-	return m_key;
-}
-
-/** Sets another module to this keychooser */
-void CBookTreeChooser::setModules(ListCSwordModuleInfo modules, const bool refresh){
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.current())) {
-      m_modules.append(book);
-    }
-  }
-	
-	if (refresh && m_modules.count() && m_key) {
-    setupTree();
-//		m_treeView->clear();
-//	
-//    const QString oldKey = m_key->key();
-//		m_key->root();
-//		m_key->firstChild();
-//		setupTree(0,0,m_key);
-//
-//    m_key->key(oldKey);
-//		
-//		updateKey(m_key);
-		adjustFont(); //only when refresh is set.
-	}
-}
-
-/** No descriptions */
-void CBookTreeChooser::adjustFont(){
-  //Make sure the entries are displayed correctly.
-//	if ( m_modules.first()->isUnicode() ){
-		m_treeView->setFont( CBTConfig::get(m_modules.first()->language()).second );
-//		qWarning("Unicode Book detected");
-//	}
-//	else{
-//		m_treeView->setFont( CBTConfig::get(CBTConfig::standard) );
-//		qWarning("Standard Book detected");
-//	}
-}
-
-
-/** Refreshes the content. */
-void CBookTreeChooser::refreshContent(){
-	if (m_key)
-		updateKey( m_key ); //refresh with current key
-}
-
-/** Set up the tree with the current level of key. */
-void CBookTreeChooser::setupTree( QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key ){
-	QListViewItem* item = 0;
-	if (parent)
-		item = new TreeItem(parent, after, key, key->key());
-	else
-		item = new TreeItem(m_treeView, after, key, key->key());
-	
-	if (key->nextSibling())
-		setupTree(parent, item, key);
-}
-
-/** No descriptions */
-void CBookTreeChooser::itemActivated( QListViewItem* item ){
-	TreeItem* i = dynamic_cast<TreeItem*>(item);
-	if (!i)
-    return;
-	m_key->key(i->key());
-  if (i->childCount() > 0 || i->isExpandable())
-    i->setOpen(true);
-
-  emit keyChanged(m_key);      
-}
-
-/** No descriptions */
-void CBookTreeChooser::updateKey( CSwordKey* key ){	
-	setKey(key, false);
-}
-
-/** Reimplementationm to handle tree creation on show. */
-void CBookTreeChooser::show(){
-  CKeyChooser::show();
-  if (!m_treeView->childCount()) {
-    KApplication::setOverrideCursor(WaitCursor);
-    setupTree(); //create the first level of the tree structure
-    m_treeView->resize(m_treeView->sizeHint());
-    KApplication::restoreOverrideCursor();
-  }
-}
-
-/** Creates the first level of the tree structure. */
-void CBookTreeChooser::setupTree(){
- 	m_treeView->clear();
-	
-  const QString oldKey = m_key->key();
- 	m_key->root();
- 	m_key->firstChild();
- 	setupTree(0,0,m_key);
-
-  m_key->key(oldKey);
-		
-  updateKey(m_key);
-}
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.h b/bibletime/frontend/keychooser/cbooktreechooser.h
deleted file mode 100644
index bcbf46c..0000000
--- a/bibletime/frontend/keychooser/cbooktreechooser.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/***************************************************************************
-                          cbooktreechooser.h  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBOOKTREECHOOSER_H
-#define CBOOKTREECHOOSER_H
-
-
-/** The treechooser implementation for books.
-  * @author The BibleTime team
-  */
-//BibleTime includes
-#include "ckeychooser.h"
-#include "ckeychooserwidget.h"
-
-//Sword includes
-
-//Qt includes
-#include <qwidget.h>
-#include <qsize.h>
-#include <qmap.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-
-//KDE includes
-#include <klistview.h>
-
-class CSwordKey;
-class CSwordBookModuleInfo;
-class CSwordTreeKey;
-
-class TreeKeyIdx;
-
-/** The keychooser implementeation for books.
-  * @author The BibleTime team
-  */
-class CBookTreeChooser : public CKeyChooser  {
-   Q_OBJECT
-public:
-	CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-	~CBookTreeChooser();
-  /**
-  * Refreshes the content.
-  */
-  virtual void refreshContent();
-  /**
-  * Sets another module to this keychooser
-  */
-  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = true);
-  /**
-  * Returns the key of this kechooser.
-  */
-  virtual CSwordKey* const key();
-  /**
-  * Sets a new key to this keychooser
-  */
-  virtual void setKey(CSwordKey*);
-  void setKey(CSwordKey*, const bool emitSinal);
-
-public slots: // Public slots
-  virtual void updateKey( CSwordKey* );
-  /**
-  * Reimplementationm to handle tree creation on show.
-  */
-  virtual void show();
-
-
-protected: // Protected methods
-  /**
-  * Set up the tree with the current level of key.
-  */
-  void setupTree( QListViewItem* parent,QListViewItem* after, CSwordTreeKey* key );
-  /**
-  * Creates the first level of the tree structure.
-  */
-  void setupTree();
-  virtual void adjustFont();
-
-protected slots: // Protected slots
-  void itemActivated( QListViewItem* item );
-
-private:
-	class TreeItem : public KListViewItem {
-		public:
-			TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName);
-			TreeItem(QListViewItem* parent, CSwordTreeKey* key, const QString keyName);
-			TreeItem(QListView* view,QListViewItem* after, CSwordTreeKey* key, const QString keyName);
-			const QString& key() const;
-      void createChilds();
-      virtual void setOpen(bool);
-      
-    protected:
-      /**
-      * Initializes this item with the correct caption.
-      */
-      virtual void setup();
-		private:
-			CSwordTreeKey* m_key;
-      QString m_keyName;
-	};
-
-	QPtrList<CSwordBookModuleInfo>	m_modules;
-	CSwordTreeKey* m_key;
-	KListView* m_treeView;
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/cfx_btn.cpp b/bibletime/frontend/keychooser/cfx_btn.cpp
deleted file mode 100644
index fdbfa5d..0000000
--- a/bibletime/frontend/keychooser/cfx_btn.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************
-                          cfx_btn.cpp  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cfx_btn.h"
-#include "../cbtconfig.h"
-
-#include <stdlib.h>
-#include <math.h>
-
-//Qt includes
-#include <qevent.h>
-#include <qapplication.h>
-#include <qcursor.h>
-
-cfx_btn::cfx_btn(QWidget *parent, const char *name ) : QToolButton(parent,name) {
-	setFocusPolicy(QWidget::WheelFocus);
-	setCursor( splitVCursor );
-		
-	m_isLocked = false;
-	connect(this, SIGNAL(pressed() ), SLOT(was_pressed() ));
-	connect(this, SIGNAL(released()), SLOT(was_released()));
-}
-
-const bool cfx_btn::isLocked( ) const {
-	return m_isLocked;
-}
-
-void cfx_btn::was_pressed( ){
-	QApplication::setOverrideCursor( BlankCursor );
-	m_isLocked = true;
-	lock_Point = get_lock_Point();
-	
-	emit lock();
-}
-
-void cfx_btn::was_released( ){
-	QApplication::restoreOverrideCursor();
-	m_isLocked = false;
-	
-	emit unlock();
-}
-
-const QPoint cfx_btn::get_lock_Point() const {
-	return mapToGlobal( QPoint( width()/2, height()/2 ) );
-}
-
-void cfx_btn::mouseMoveEvent( QMouseEvent* e ){
- 	const short signed int scrollDirection = CBTConfig::get(CBTConfig::scroll) ? -1 : 1;
-	
-	if (m_isLocked) {
-		int vchange = (QCursor::pos().y() - lock_Point.y()) * scrollDirection;
-		if (abs(vchange) < 10)
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 0.3));
-		else if (abs(vchange) < 30)
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 0.6));
-		else if (abs(vchange) < 40)
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 1.2));
-		else
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 2.0));
-
-		if (vchange) //not emit 0
-			emit change_requested( vchange );
-		QCursor::setPos( lock_Point );
-	}
-	else
-		QToolButton::mouseMoveEvent(e);
-}
-
-
-
-/** If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is  scrolled like the mouse was pressed and moved. */
-void cfx_btn::wheelEvent( QWheelEvent* e ){
-	/**
-	* The problem is, that wheel events do everytime have the delta value 120
-	*/
- 	const short signed int scrollDirection = CBTConfig::get(CBTConfig::scroll) ? -1 : 1;	
- 	
-	const int vchange = scrollDirection * ((e->delta() > 0) ? (1) : (-1));
-	if (vchange!=0) {//do not emit a change with value 0	
-		emit change_requested( vchange );
-		e->accept();			
-	}
-	else
-		e->ignore();
-}
diff --git a/bibletime/frontend/keychooser/cfx_btn.h b/bibletime/frontend/keychooser/cfx_btn.h
deleted file mode 100644
index 7f40002..0000000
--- a/bibletime/frontend/keychooser/cfx_btn.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/***************************************************************************
-                          cfx_btn.h  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CFX_BTN_H
-#define CFX_BTN_H
-
-#include <qwidget.h>
-#include <qtoolbutton.h>
-
-class QMouseEvent;
-
-/** This Class implements the direct chooser button used in the KeyChooser Widget
-  * @author The BibleTime team
-  */
-class cfx_btn : public QToolButton  {
-   Q_OBJECT
-public:
-	/**
-	* The constructor
-	*/
-	cfx_btn(QWidget *parent=0, const char *name=0);
-  const bool isLocked() const;
-	
-signals:
-	/**
-	* is emitted when the button enters locked state
-	*/
-	void lock();
-	/**
-	* is emitted when the button leaves locked state
-	*/	
-	void unlock();
-	/**
-	* indicates a change the user made by moving the mouse
-	* @param count the number of items to be changed in the KeyChooser ComboBox
-	*/
-	void change_requested(int count);
-
-protected slots:
-	/*
-	* used to process the button press events
-	*/
-	void was_pressed();
-	/**
-	* used to process the button release events
-	*/
-	void was_released();
-
-protected:
-	/**
-	* Reimplementation from @ref QWidget#mouseMoveEvent - processes
-	* the mouse move events
-	*/
-	virtual void mouseMoveEvent( QMouseEvent* e );
-	/**
-	* used to find the lock point - the middle of the button
-	* @return the lock point
-	*/
-	const QPoint get_lock_Point() const;
-  /**
-  * If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is
-	* scrolled like the mouse was pressed and moved.
-	*/
-  virtual void wheelEvent( QWheelEvent* e );
-	
-private:
-	/**
-	* Indicates whether the button is in locked state or not
-	*/
-  bool m_isLocked;
-	/**
-	* stores the lock point
-	*/	
-	QPoint lock_Point;	
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/ckeychooser.cpp b/bibletime/frontend/keychooser/ckeychooser.cpp
deleted file mode 100644
index 4a4ff49..0000000
--- a/bibletime/frontend/keychooser/ckeychooser.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-                          ckeychooser.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ckeychooser.h"
-#include "../../backend/cswordmoduleinfo.h"
-#include "../../backend/cswordbiblemoduleinfo.h"
-#include "../../backend/cswordcommentarymoduleinfo.h"
-#include "../../backend/cswordlexiconmoduleinfo.h"
-
-#include "clexiconkeychooser.h"
-#include "cbiblekeychooser.h"
-#include "cbookkeychooser.h"
-
-CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, QWidget *parent, const char *name )
-	: QWidget(parent, name){
-}
-
-CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent){	
-	if (!modules.count())
-		return 0;
-
-  CKeyChooser* ck = 0;
- 	switch ( modules.first()->type() ){
- 	  case CSwordModuleInfo::Commentary:	 //Bibles and commentaries uise the same key chooser
- 	  case CSwordModuleInfo::Bible:
- 	  	ck = new CBibleKeyChooser(modules,key,parent);
-      break;
- 	  case CSwordModuleInfo::Lexicon:
-			ck = new CLexiconKeyChooser(modules,key,parent);	
-      break;
- 	  case CSwordModuleInfo::GenericBook:
- 	  	ck = new CBookKeyChooser(modules,key,parent);
-      break;
- 	  default:
- 	  	return 0;
- 	}
-  return ck;
-}
diff --git a/bibletime/frontend/keychooser/ckeychooser.h b/bibletime/frontend/keychooser/ckeychooser.h
deleted file mode 100644
index b0979d6..0000000
--- a/bibletime/frontend/keychooser/ckeychooser.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************
-                          ckeychooser.h  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CKEYCHOOSER_H
-#define CKEYCHOOSER_H
-
-#include <qwidget.h>
-
-#include "backend/cswordmoduleinfo.h"
-
-class CSwordModuleInfo;
-class CSwordKey;
-
-/**
-	* The base class for the KeyChooser.
-	* Do not use directly, create a KeyChooser with
-	* @ref #createInstance , this will create the proper one
-	* of the classes that inherit from @ref CKeyChooser
-	*
-  * @author The BibleTime team
-  */
-
-class CKeyChooser : public QWidget {
-   Q_OBJECT
-
-public:
-  /**
-  * Creates a proper Instance, either
-	*
-	 @ref CLexiconKeyChooser or
-	* @ref CBibleKeyChooser
-	* @param info the @ref CModuleInfo to be represented by the KeyChooser
-	* @param key if not NULL, the @ref CKey the KeyChooser should be set to
-	* @param parent the parent of the widget to create
-	*/
-  static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent);
-
-signals:
-	/**
-	* is emitted if the @ref CKey was changed by the user
-	*/
-	void keyChanged(CSwordKey* key);
-	/**
-	* Is emitted before the key is changed!
-	*/
-	void beforeKeyChange(const QString& key);
-	
-public slots:
-	/**
-	* sets the @ref CKey
-	* @param key the key which the widget should be set to
-	*/
-	virtual void setKey(CSwordKey* key) = 0;
-	/**
-	* sets the @ref CKey
-	* @param key the key which the widget should be set to
-	*/
-	virtual void updateKey(CSwordKey* key) = 0;	
-	/**
-	* gets the current @ref CKey
-	*
-	* @return the current @ref CKey
-	*/
-  virtual CSwordKey* const key() = 0;	
-  /**
-  * Sets the module of this keychooser and refreshes the comboboxes
-  */
-  virtual void setModules( ListCSwordModuleInfo modules, const bool refresh = true ) = 0;
-  /**
-  * Freshes the content of the different key chooser parts.
-  */
-  virtual void refreshContent() = 0;
-
-protected:
-	/**
-	* the constructor - DO NOT USE! -- use @ref #createInstance instead!
-	*/
-	CKeyChooser(ListCSwordModuleInfo info, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-  /**
-  * Set the appropriate font do display the modules
-  */
-  virtual void adjustFont() = 0;
-
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
deleted file mode 100644
index e4723eb..0000000
--- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/***************************************************************************
-                          ckeychooserwidget.cpp  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-//BibleTime includes
-#include "ckeychooserwidget.h"
-#include "cfx_btn.h"
-#include "../cbtconfig.h"
-
-//Qt includes
-#include <qlineedit.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qlistbox.h>
-#include <qtoolbutton.h>
-#include <qevent.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qpixmap.h>
-#include <qapplication.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qrect.h>
-
-const unsigned int WIDTH = 16;
-const unsigned int ARROW_HEIGHT = 12;
-const unsigned int MOVER_HEIGHT = 6;
-
-CKCComboBox::CKCComboBox(bool rw,QWidget* parent,const char* name)
-  : QComboBox(rw,parent,name){
-	setFocusPolicy(QWidget::WheelFocus);
-  if (lineEdit()) {
-  	installEventFilter( lineEdit() );
-  }
-}
-
-/** Reimplementation. */
-bool CKCComboBox::eventFilter( QObject *o, QEvent *e ){			
-//	qWarning("CKCComboBox::eventFilter( QObject *o, QEvent *e )");
-	if (e->type() == QEvent::FocusOut) {
-		QFocusEvent* f = static_cast<QFocusEvent*>(e);
-		if (o == lineEdit() && f->reason() == QFocusEvent::Tab) {
-	    int index = listBox()->index( listBox()->findItem(currentText()) );
-	    if (index == -1)
-				index = 0;// return 0 if not found
-	  	setCurrentItem( index );	
-	    emit focusOut( index );  	
-	  }
-	  else if (/*o == lineEdit() &&*/ f->reason() == QFocusEvent::Popup) {
-			return false;
-		}
-	  else if (/*o == lineEdit() && */f->reason() == QFocusEvent::ActiveWindow) {
-			emit activated(currentText());
-			return true;
-		}
-	  else if (/*o == lineEdit() &&*/ f->reason() == QFocusEvent::Mouse) {
-			emit activated(currentText());
-			return true;
-		}		
-	  else if (o == listBox()) {  //???
-			return false;
-		}
-	  else if (o == this) {
-			emit activated(currentText());
-			return true;
-		}		
-	}
-//	qWarning("not handled!");
-  return QComboBox::eventFilter(o,e);	
-}
-
-/** Scrolls in the list if the wheel of the mouse was used. */
-void CKCComboBox::wheelEvent( QWheelEvent* e ) {
-	const signed int change = (int)((float)e->delta()/(float)120);
-	int current = currentItem();
-	
-	if ((current+change >= 0) && (current+change<count()) ) {
-		setCurrentItem(current+change);
-		e->accept();
-		emit activated( currentItem() );
-	}
-	else {
-		e->ignore();
-	}
-}
-
-//**********************************************************************************/
-
-CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals,  QWidget *parent, const char *name) : QWidget(parent,name) {
-	m_useNextPrevSignals = useNextPrevSignals;
-	for (int index=1; index <= count; index++)
-		m_list.append( QString::number(index) );	
-	init();
-	reset(m_list,0,false);
-};
-
-CKeyChooserWidget::CKeyChooserWidget(QStringList *list, const bool useNextPrevSignals, QWidget *parent, const char *name ) : QWidget(parent,name) {
-	m_useNextPrevSignals = useNextPrevSignals;		
-	if (list)
-		m_list = *list;//copy the items of list
-	else
-		m_list.clear();
-	init();
-	reset(m_list,0,false);	
-}
-
-void CKeyChooserWidget::changeCombo(int i){
-	if (!isUpdatesEnabled())
-		return;
-	setUpdatesEnabled(false);
-	
-	int current = comboBox()->currentItem();
-
-	//index of highest Item
-	const int count = comboBox()->count()-1;
-	int j = current + i;
-	if (i > 0){
-		if (j <= count)
-			comboBox()->setCurrentItem(j);
-		else
-			comboBox()->setCurrentItem(count);
-	}
-	else if (i < 0){
-		if (j>=0)
-			comboBox()->setCurrentItem(j);
-		else
-			comboBox()->setCurrentItem(0);
-	}	
-	if (!isResetting && !btn_fx->isLocked() && (current != comboBox()->currentItem()))	
-		emit changed(comboBox()->currentItem());
-		
-	setUpdatesEnabled(true);		
-}
-
-void CKeyChooserWidget::reset(const int count, int index, bool do_emit){
-	if (!isUpdatesEnabled())
-		return;
-
-	m_list.clear();
-	for (int i=1; i <= count; i++)
-		m_list.append( QString::number(i) );
-	reset(&m_list,index,do_emit);
-}
-
-void CKeyChooserWidget::reset(QStringList& list, int index, bool do_emit){
-	if (!isUpdatesEnabled())
-		return;
-	
-	m_list = list;
-	reset(&m_list,index,do_emit);
-	
-	isResetting = false;
-}
-
-
-void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit){
-	if (isResetting || !isUpdatesEnabled())
-		return;
-	isResetting = true;	
-	
-	oldKey = QString::null;
-
-//  m_comboBox->setUpdatesEnabled(false);
-  //DON'T REMOVE THE HIDE: Otherwise QComboBox's sizeHint() function won't work properly
-  m_comboBox->hide();
-  m_comboBox->clear(); 
-	if (list) {
-		m_comboBox->insertStringList(*list);
-  }
-
-  if (!list || (list && !list->count())) { //nothing in the combobox
-		btn_up->setEnabled( true );
-		btn_fx->setEnabled( true );
-		btn_down->setEnabled( true );	
-		setEnabled(false);
-	}
-	else if (!isEnabled()) { //was disabled
-		setEnabled(true);	
-		const bool enableButtons = list && (list->count()>=1);
-		btn_up->setEnabled( enableButtons );
-		btn_fx->setEnabled( enableButtons );
-		btn_down->setEnabled( list && (list->count()>1) );
-	}
-
-  if (list->count()) {
-  	m_comboBox->setCurrentItem(index);
-  }
-	if (do_emit) {
-		emit changed(m_comboBox->currentItem());				
-	}
-
-  const QSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
-  //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly!
-  m_comboBox->show();
-
-//  m_comboBox->setFont( m_comboBox->font() );
-//  m_comboBox->setUpdatesEnabled(true);
-
-	isResetting = false;	
-}
-
-void CKeyChooserWidget::lock(void){
-	comboBox()->setEditable(false);
-	oldKey = comboBox()->currentText();
-}
-
-void CKeyChooserWidget::unlock(void){
-	comboBox()->setEditable(true);
-	comboBox()->setEditText(comboBox()->text(comboBox()->currentItem()));
-	if (comboBox()->currentText() != oldKey);
-		emit changed(comboBox()->currentItem());
-}
-
-/** Initializes this widget. We need this function because we have more than one constructor. */
-void CKeyChooserWidget::init(){
-	oldKey = QString::null;
-	btn_up = btn_down = btn_fx = 0;
-
-	setFocusPolicy(QWidget::WheelFocus);			
-			
-	m_comboBox = new CKCComboBox( true, this );
-	m_comboBox->setAutoCompletion( true );
-	m_comboBox->setInsertionPolicy(QComboBox::NoInsertion);
-	m_comboBox->setFocusPolicy(QWidget::WheelFocus);
-	
-	m_mainLayout = new QHBoxLayout( this );
-	m_mainLayout->addWidget(m_comboBox,5);
-  
-	QVBoxLayout* m_buttonLayout = new QVBoxLayout();	
-	m_buttonLayout->setAlignment(Qt::AlignHCenter | Qt::AlignCenter);
-
-	btn_up = new QToolButton( UpArrow, this, "btn_up" );	
-	btn_up->setFixedSize(WIDTH, ARROW_HEIGHT);
-	btn_up->setFocusPolicy(QWidget::NoFocus);	
-	
-	btn_fx = new cfx_btn( this, "btn_fx" );
-	btn_fx->setFixedSize(WIDTH, MOVER_HEIGHT);
-	btn_fx->setFocusPolicy(QWidget::NoFocus);	
-	
-	btn_down = new QToolButton( DownArrow, this, "btn_down" );	
-	btn_down->setFixedSize(WIDTH, ARROW_HEIGHT);
-	btn_down->setFocusPolicy(QWidget::NoFocus);	
-	
-	m_buttonLayout->addWidget( btn_up,0 );	
-	m_buttonLayout->addWidget( btn_fx,0 );	
-	m_buttonLayout->addWidget( btn_down,0 );
-	
-	m_mainLayout->addLayout( m_buttonLayout );
-	m_mainLayout->addSpacing(2);
-
-	setTabOrder(m_comboBox, 0);
-		
-// signals and slots connections
- 	if ( CBTConfig::get(CBTConfig::scroll) ) {
-		if (m_useNextPrevSignals) {
-			connect(btn_up, SIGNAL(clicked()), SIGNAL(prev_requested()) );	
-			connect(btn_down, SIGNAL(clicked()), SIGNAL(next_requested()) );
-	  }
-	  else {
-			connect(btn_up, SIGNAL(clicked()), SLOT(previous()) );	
-			connect(btn_down, SIGNAL(clicked()), SLOT(next()) );	
-	  }
-	}
-	else {
-		if (m_useNextPrevSignals) {
-			connect(btn_up, SIGNAL(clicked()), SIGNAL(next_requested()) );	
-			connect(btn_down, SIGNAL(clicked()), SIGNAL(prev_requested()) );
-	  }
-	  else {
-			connect(btn_up, SIGNAL(clicked()), SLOT(next()) );	
-			connect(btn_down, SIGNAL(clicked()), SLOT(previous()) );	
-		}
-	}
-	
-	connect(btn_fx, SIGNAL(lock()), SLOT(lock()) );
-	connect(btn_fx, SIGNAL(unlock()), SLOT(unlock()) );
-	connect(btn_fx, SIGNAL(change_requested(int)), SLOT(changeCombo(int)) );
-	
-	connect(m_comboBox, SIGNAL(activated(int)), SLOT(slotComboChanged(int)));
-	connect(m_comboBox, SIGNAL(activated(const QString&)), SLOT(slotReturnPressed(const QString&)));
- 	connect(m_comboBox, SIGNAL(focusOut(int)), SIGNAL(focusOut(int)));	
-		
-	isResetting = false;
-}
-
-/** Is called when the return key was presed in the combobox. */
-void CKeyChooserWidget::slotReturnPressed( const QString& text){
-	for (int index=0; index < comboBox()->count(); index++) {
-		if (comboBox()->text(index) == text) {
-			if (/*!oldKey.isNull() &&*/ text != oldKey)	//if the key has changed
-				emit changed(index);
-			break;
-		}
-	}
-}
-
-/** Is called when the current item of the combo box was changed. */
-void CKeyChooserWidget::slotComboChanged(int index){
-//	qWarning("CKeyChooserWidget::slotComboChanged(int index)");
-	if (!isUpdatesEnabled())
-		return;
-	setUpdatesEnabled(false);	
-	
-	const QString key = comboBox()->text( index );
-	if (oldKey.isNull() || (oldKey != key))
-		emit changed(index);
-	oldKey = key;
-
-	setUpdatesEnabled(true);		
-}
-
-/** Sets the tooltips for the given entries using the parameters as text. */
-void CKeyChooserWidget::setToolTips( const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip){
-//  qWarning("add tooltip heklps: %s, %s, %s, %s", comboTip.latin1(), nextEntryTip.latin1(), scrollButtonTip.latin1(), previousEntryTip.latin1());
-
-  QToolTip::add(comboBox(),comboTip);
-	QToolTip::add(btn_fx,  scrollButtonTip);
-
- 	if ( CBTConfig::get(CBTConfig::scroll) ){
-		QToolTip::add(btn_down, nextEntryTip);
-		QToolTip::add(btn_up,	previousEntryTip);
-	}
-	else {
-		QToolTip::add(btn_up,   nextEntryTip);
-		QToolTip::add(btn_down, previousEntryTip);
-	}
-}
-
-/** No descriptions */
-void CKeyChooserWidget::setWhatsThis(const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip){
-//  qWarning("add whatsthis heklps: %s, %s, %s, %s", comboTip.latin1(), nextEntryTip.latin1(), scrollButtonTip.latin1(), previousEntryTip.latin1());
-  QWhatsThis::add(comboBox(),comboTip);
-	QWhatsThis::add(btn_fx,  scrollButtonTip);
-
- 	if ( CBTConfig::get(CBTConfig::scroll) ) {
-		QWhatsThis::add(btn_down, nextEntryTip);
-		QWhatsThis::add(btn_up,   previousEntryTip);
-	}
-	else {
-		QWhatsThis::add(btn_up,   nextEntryTip);
-		QWhatsThis::add(btn_down, previousEntryTip);
-	}
-}
-
-/** Sets the current item to the one with the given text */
-bool CKeyChooserWidget::setItem( const QString item ){
-	bool ret = false;
-	const int count = comboBox()->count();
-	for (int i = 0; i < count; ++i) {
-		if (comboBox()->text(i) == item) {
-			comboBox()->setCurrentItem(i);
-			ret = true;
-			break;
-		}
-	}
-	if (!ret)
-		comboBox()->setCurrentItem(-1);
-	return ret;
-}
-
-/** Jump to the next entry. */
-void CKeyChooserWidget::next(){
-	if (comboBox()->currentItem() != comboBox()->count()-1) {// not last entry
-		comboBox()->setCurrentItem( comboBox()->currentItem()+1 );
-		emit changed(comboBox()->currentItem());
-	}
-}
-
-/** Jump to the previous entry. */
-void CKeyChooserWidget::previous(){
-	if (comboBox()->currentItem() != 0) {// not last entry
-		comboBox()->setCurrentItem( comboBox()->currentItem()-1 );
-		emit changed(comboBox()->currentItem());
-	}
-}
-
-QComboBox* CKeyChooserWidget::comboBox(){
-	return m_comboBox;
-}
-
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.h b/bibletime/frontend/keychooser/ckeychooserwidget.h
deleted file mode 100644
index 2707ced..0000000
--- a/bibletime/frontend/keychooser/ckeychooserwidget.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/***************************************************************************
-                          ckeychooserwidget.h  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CKEYCHOOSERWIDGET_H
-#define CKEYCHOOSERWIDGET_H
-
-#include <qwidget.h>
-#include <qmap.h>
-
-#include <qcombobox.h>
-#include <qstringlist.h>
-
-class cfx_btn;
-class CLexiconKeyChooser;
-//class CMinMaxLayout;
-
-class QIconSet;
-//class QComboBox;
-class QToolButton;
-class QStringList;
-class QPoint;
-class QMouseEvent;
-class QWheelEvent;
-class QHBoxLayout;
-
-/*
-* We use this class to conrtol the focus move in the combobox
-* This class is used in the key chooser widgets
-*/
-class CKCComboBox : public QComboBox {
-  Q_OBJECT
-
-public:
-  CKCComboBox(bool rw, QWidget * parent=0, const char * name=0 );
-  /**
-  * Returns the size this widget would like to have.
-  */
-//  virtual QSize sizeHint() const;
-
-protected:
-  /**
-  * Reimplementation.
-  */
-  virtual bool eventFilter( QObject *o, QEvent *e );
-  /**
-  * Scrolls in the list if the wheel of the mouse was used.
-  */
-  virtual void wheelEvent( QWheelEvent* e);
-
-signals:
-  /**
-  * Emitted when the user moves the focus away from the combo by pressing tab
-  */
-	void focusOut(int itemIndex);
-};
-
-/**
-	* This class implements the KeyCooser Widget, which
-	* consists of a @ref QComboBox, two normal ref @QToolButton
-	* and a enhanced @ref cfx_btn
-	*
-  * @author The BibleTime team
-  */
-class CKeyChooserWidget : public QWidget  {
-   Q_OBJECT
-public:
-	/**
-	* the constructor
-	*/
-	CKeyChooserWidget(QStringList *list=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0);
-	/**
-	* the constructor
-	*/
-	CKeyChooserWidget(int count=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0);	
-	/**
-	* This function does clear the combobox, then fill in
-	* the StringList, set the ComboBox' current item to index
-	* and if do_emit is true, it will emit @ref #changed
-	*
-	* @param list the stringlist to be inserted
-	* @param index the index that the combobox is to jump to
-	* @param do_emit should we emit @ref #changed(int)
-	*/	
-	void reset(const int count, int index, bool do_emit);
-	void reset(QStringList& list, int index, bool do_emit);
-	void reset(QStringList *list, int index, bool do_emit);	
- 	/**
- 	* Initializes this widget. We need this function because
- 	* we have more than one constructor.
- 	*/
- 	virtual void init();
-  /**
-  *
-  */
-//  virtual void adjustSize();
-  /**
-  * Sets the QWhatsThis help for the different parts.
-  */
-  void setWhatsThis(const QString comboTip, const QString nextEntry, const QString scrollButton, const QString previousEntry);
-  /**
-  * Sets the tooltips for the given entries using the parameters as text.
-  */
-  void setToolTips( const QString comboTip, const QString nextEntry, const QString scrollButton, const QString previousEntry);
-  /**
-  * Sets the current item to the one with the given text
-  */
-  bool setItem( const QString item);
-  /**
-  * Return the combobox of this key chooser widget.
-  */
-  QComboBox* comboBox();
-
-public slots:
-	/**
-	* is called to lock the combobox
-	*/
-	void lock();
-	/**
-	* is called to unlock the combobox
-	*/
-	void unlock();
-	/**
-	* is called to move the combobox to a certain index
-	* @param index the index to jump to
-	*/
-	void changeCombo(int index);
-
-signals:
-	/**
-	* is emittd to proceed to the next entry, which may
-	*	require changes in other widgets also
-	*/
-	void next_requested(void);
-	/**
-	* see @ref #next_requested
-	*/
-	void prev_requested(void);
-	/**
-	* Is emitted if the widget changed, but
-	* only if it is not locked or being reset
-	*
-	* @param the current ComboBox index
-	*/
-	void changed(int index);
-	/**
-	* Is emitted if the widget was left with a focus out event.
-	* @param index The new index of the ComboBox
-	*/
-	void focusOut(int index);
-
-protected:
-	/**
-	* indicates wheter we are resetting at the moment
-	*/
-	bool isResetting;
-	/**
- 	* Returns the icons set which contains the UP button.
- 	*/
-//	QIconSet getUpIconSet();
-  /**
-  * Returns the icons set which contains the button used to change the current item.
-  */
-//  QIconSet getMoverIconSet();
-  /**
-  *  Returns the icons set which contains the down button.
-  */
-//  QIconSet getDownIconSet();
-	/**
-	*
-	*/
-	QString oldKey;
-  /**
-	*
-	*/
-	QToolButton* btn_up;
-	/**
-	*
-	*/
-	QToolButton* btn_down;
-	/**
-	*
-	*/
-	cfx_btn* btn_fx;
-	
-protected slots: // Protected slots
-  /**
-  * Is called when the return key was presed in the combobox.
-  */
-  void slotReturnPressed( const QString& );
-	/**
-  * Is called when the current item of the combo box was changed.
-  */
-  void slotComboChanged(int);
-
-private:
-	friend class CLexiconKeyChooser;
-	QStringList	m_list;
-	bool m_useNextPrevSignals;
-	/**
-	* Members should never be public!!
-	*/
-	CKCComboBox* m_comboBox;
-	QHBoxLayout *m_mainLayout;
-
-private slots: // Private slots
-  /**
-  * Jump to the previous entry.
-  */
-  void previous();
-  /**
-  * Jump to the next entry.
-  */
-  void next();
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
deleted file mode 100644
index 1baea99..0000000
--- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/***************************************************************************
-                          clexiconkeychooser.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "clexiconkeychooser.h"
-#include "ckeychooserwidget.h"
-#include "cfx_btn.h"
-
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-
-//STL headers
-#include <algorithm>
-#include <iterator>
-#include <map>
-
-//Qt includes
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-
-//KDE includes
-#include <klocale.h>
-
-CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name )
-	: CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordLDKey*>(key)){
-
-  setModules(modules, false);
-	
- //we use a layout because the key chooser should be resized to full size
- 	m_layout = new QHBoxLayout(this,QBoxLayout::LeftToRight);
-  m_layout->setResizeMode(QLayout::FreeResize);
-
-	m_widget = new CKeyChooserWidget(0, false, this);
-	m_widget->comboBox()->setMaximumWidth(450);
-	m_widget->setToolTips(
-    CResMgr::displaywindows::lexiconWindow::entryList::tooltip,
-    CResMgr::displaywindows::lexiconWindow::nextEntry::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::lexiconWindow::previousEntry::tooltip
-  );
-	m_widget->setWhatsThis(
-    CResMgr::displaywindows::lexiconWindow::entryList::whatsthis,
-    CResMgr::displaywindows::lexiconWindow::nextEntry::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::lexiconWindow::previousEntry::whatsthis
-  );
-
-	m_layout->addWidget(m_widget,0,Qt::AlignLeft);
-	
-	connect(m_widget,SIGNAL(changed(int)),SLOT(activated(int)));
-	connect(m_widget,SIGNAL(focusOut(int)),SLOT(activated(int)));
-
-  setModules(modules, true);
-	adjustFont();
-}
-
-CSwordKey* const CLexiconKeyChooser::key(){
-	return m_key;
-}
-
-void CLexiconKeyChooser::setKey(CSwordKey* key){	
- 	if (!(m_key = dynamic_cast<CSwordLDKey*>(key)))
-		return;		
-
-  QString newKey = m_key->key();
-	const int index =	m_widget->comboBox()->listBox()->index(m_widget->comboBox()->listBox()->findItem( newKey ));
-  m_widget->comboBox()->setCurrentItem(index);	
-
-  emit keyChanged( m_key );
-}
-
-void CLexiconKeyChooser::activated(int index){
-	const QString text = m_widget->comboBox()->text(index);	
-
-  // To prevent from eternal loop, because activated() is emitted again
- 	if (m_key && m_key->key() != text) {
-		m_key->key(text); 	
-	 	setKey(m_key);
-	}
-}
-
-inline const bool my_cmpEntries(const QString& a, const QString& b) {
-  return a < b;
-};
-
-/** Reimplementation. */
-void CLexiconKeyChooser::refreshContent(){
-  if (m_modules.count() == 1) {                                                                              
-    m_widget->reset(m_modules.first()->entries(), 0, true);	
-  }
-  else {
-    typedef std::multimap<unsigned int, QStringList*> EntryMap;
-    EntryMap entryMap;
-    QStringList* entries = 0;
-    for (m_modules.first(); m_modules.current(); m_modules.next()) {
-      entries = m_modules.current()->entries();
-      entryMap.insert( std::make_pair(entries->count(), entries) );
-    }
-
-    QStringList goodEntries; //The string list which contains the entries which are available in all modules
-    
-    EntryMap::iterator it = entryMap.begin(); //iterator to go thoigh all selected modules    
-    QStringList refEntries = *(it->second); //copy the items for the first time
-    QStringList* cmpEntries = ( ++it )->second; //list for comparision, starts with the second module in the map   
-
-    while(it != entryMap.end()) {
-      std::set_intersection(
-        refEntries.begin(), --(refEntries.end()), //--end() is the last valid entry
-        cmpEntries->begin(), --(cmpEntries->end()),
-        std::back_inserter(goodEntries), //append valid entries to the end of goodEntries
-        my_cmpEntries  //ci_cmpEntries is the comparision function
-      );
-
-      cmpEntries = ( ++it )->second; //this is a pointer to the string list of a new module
-      
-      /*
-      * use the good entries for next comparision,
-      * because the final list can only have the entries of goodEntries as maxiumum
-      */
-      refEntries = goodEntries;
-    };
-    
-    m_widget->reset(goodEntries, 0, true); //write down the entries
-  } //end of ELSE
-}
-
-/** No descriptions */
-void CLexiconKeyChooser::adjustFont(){
-	//Make sure the entries are displayed correctly.
-		m_widget->comboBox()->setFont( CBTConfig::get( m_modules.first()->language() ).second );
-}
-
-/** Sets the module and refreshes the combo boxes */
-void CLexiconKeyChooser::setModules( ListCSwordModuleInfo modules, const bool refresh ) {
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if (CSwordLexiconModuleInfo* lexicon = dynamic_cast<CSwordLexiconModuleInfo*>(modules.current())) {
-      m_modules.append(lexicon);
-    }
-  }
-  if (refresh){
-    refreshContent();
-		adjustFont();
-	}
-}
-
-/** No descriptions */
-void CLexiconKeyChooser::updateKey(CSwordKey*){
-}
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.h b/bibletime/frontend/keychooser/clexiconkeychooser.h
deleted file mode 100644
index fc6aaa9..0000000
--- a/bibletime/frontend/keychooser/clexiconkeychooser.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
-                          clexiconkeychooser.h  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CLEXICONKEYCHOOSER_H
-#define CLEXICONKEYCHOOSER_H
-
-#include <qwidget.h>
-#include "ckeychooser.h"
-#include "backend/cswordldkey.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-
-class CKeyChooserWidget;
-class QHBoxLayout;
-
-/**
-	* This class implements the KeyChooser for lexicons
-	*
-	* it inhertits @ref CKeyChooser
-	*	it uses 1 @ref CKeyChooserWidget to represent the lexicon keys
-	*
-  * @author The BibleTime team
-  */
-class CLexiconKeyChooser : public CKeyChooser  {
-   Q_OBJECT
-public:
-	/**
-	* The constructor
-	*
-	*	you should not need to use this, use @ref CKeyChooser::createInstance instead
-	*/
-	CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-
-public slots:
-	/**
-	* see @ref CKeyChooser::getKey
-	* @return Return the key object we use.
-	*/
-	virtual CSwordKey* const key();
-	/**
-	* see @ref CKeyChooser::setKey
-	*/
-	virtual void setKey(CSwordKey* key);
-	/**
-	* used to react to changes in the @ref CKeyChooserWidget
-	*
-	* @param index not used
-	**/
-	virtual void activated(int index);	
-  /**
-  * Reimplementatuion.
-  */
-  virtual void refreshContent();
-  /**
-  * Sets the module and refreshes the combo boxes of this keychooser.
-  */
-  virtual void setModules( ListCSwordModuleInfo modules, const bool refresh = true );
-
-protected:	
-	class CLexiconPresenter;	
-	friend class CLexiconPresenter;	
-	CKeyChooserWidget *m_widget;
-	CSwordLDKey* m_key;
-	QPtrList<CSwordLexiconModuleInfo> m_modules;
-	QHBoxLayout *m_layout;
-
-  virtual void adjustFont();
-
-public slots: // Public slots
-  virtual void updateKey(CSwordKey* key);
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp
deleted file mode 100644
index 62e3eb7..0000000
--- a/bibletime/frontend/keychooser/crefselectdialog.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*************************************************************************** 
-    crefselectdialog.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "crefselectdialog.h"
-
-// QT
-#include "qlayout.h"
-#include "qlineedit.h"
-#include "qlabel.h"
-
-// backend
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-
-//KDE includes
-#include <klocale.h>
-
-
-//CRefSelectDialog::CRefSelectDialog(QWidget *parent)
-//  : KDialogBase(parent, "Refenences",
-//		true, i18n("Refenence selector"),
-//		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true),
-//  m_oldPos(0,0)
-//
-//{
-//   m_page = new QWidget( this );
-//   m_placeholder = new QWidget( m_page);
-//   QVBoxLayout* layout = new QVBoxLayout( m_page, 0, spacingHint());
-//   m_lineedit = new QLineEdit( QString::null, m_page, "select" );
-//   m_lineedit->setMinimumWidth(fontMetrics().maxWidth()*8);
-//
-//   QHBoxLayout* hlayout = new QHBoxLayout(m_page, 0, spacingHint());
-//   hlayout->addWidget(new QLabel(i18n("Verse key:"), m_page));
-//   hlayout->addWidget(m_lineedit);
-//   layout->addItem(hlayout);
-//   layout->addWidget(m_placeholder);
-//
-//   m_chooser = NULL;
-//   m_oldParent = NULL;
-//   setMainWidget(m_page);
-//
-//   connect(this, SIGNAL(okClicked()), SLOT(slotPressedOk()));
-//   connect(this, SIGNAL(cancelClicked()), SLOT(slotPressedCancel()));
-//}
-//
-//CRefSelectDialog::~CRefSelectDialog() {
-//}
-//
-//
-//void CRefSelectDialog::setChooser(CKeyChooser* const chooser) {
-//  if (chooser && chooser != m_chooser) {
-//    if (m_chooser) restoreParent();
-//
-//    m_chooser = chooser;
-//
-//    // store old owner and position
-//    m_oldParent = chooser->parentWidget(false);
-//    m_oldPos = chooser->pos();
-//
-//    // we temporary borrow chooser widget from the MDI window
-//    m_placeholder->setMinimumSize(chooser->size());
-//    chooser->reparent(m_placeholder, QPoint(0,0), true);
-//  }
-//}
-//
-//void CRefSelectDialog::slotPressedOk() {
-//  // go to proper key
-//  CSwordKey* key = m_chooser->key();
-//  key->key(m_lineedit->text());
-//  m_chooser->setKey(key);
-//
-//  // restore parent of stolen widget
-//  restoreParent();
-//}
-//
-//void CRefSelectDialog::slotPressedCancel() {
-//  // restore parent of stolen widget
-//  restoreParent();
-//}
-//
-//void CRefSelectDialog::restoreParent() {
-//  if (m_chooser && m_oldParent) {
-//    m_chooser->reparent(m_oldParent, m_oldPos, true);
-//  }
-//  m_chooser = NULL;
-//}
-
-
-
-
-
-
diff --git a/bibletime/frontend/keychooser/crefselectdialog.h b/bibletime/frontend/keychooser/crefselectdialog.h
deleted file mode 100644
index cd93ea6..0000000
--- a/bibletime/frontend/keychooser/crefselectdialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************** 
-    crefselectdialog.h  -  description
-                             -------------------
-    begin                : Wed Sep 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREFSELECTDIALOG_H
-#define CREFSELECTDIALOG_H
-//Qt includes
-#include <qwidget.h>
-#include <qstring.h>
-class QLineEdit;
-
-//KDE includes
-#include <kdialog.h>
-#include <kdialogbase.h>
-
-
-// BT includes
-#include "ckeychooser.h"
-
-//class CRefSelectDialog : public KDialogBase  {
-//  Q_OBJECT
-// public:
-//  CRefSelectDialog(QWidget *parent);
-//  virtual ~CRefSelectDialog();
-//
-//  void setChooser(CKeyChooser* const chooser);
-//
-// public slots:
-//   void slotPressedOk();
-//   void slotPressedCancel();
-//
-//
-// protected:
-//   void restoreParent();
-//
-// private:
-//  QWidget*     m_page;
-//  QWidget*     m_placeholder;
-//  QWidget*     m_oldParent;
-//  CKeyChooser* m_chooser;
-//  QLineEdit*   m_lineedit;
-//  QPoint       m_oldPos;
-//};
-#endif
-
-
-
-
-
diff --git a/bibletime/frontend/kstartuplogo.cpp b/bibletime/frontend/kstartuplogo.cpp
deleted file mode 100644
index df3c076..0000000
--- a/bibletime/frontend/kstartuplogo.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/***************************************************************************
-                          kstartuplogo.cpp  -  description
-                             -------------------
-    begin                : Sat Sep 11 1999
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//Own includes
-#include "kstartuplogo.h"
-
-//Qt includes
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kstandarddirs.h>
-//#include <kimageio.h>
-
-//static objects
-static KStartupLogo* startupLogo = 0;
-
-void KStartupLogo::createSplash() {
-	deleteSplash();
-	startupLogo = new KStartupLogo();
-}
-
-void KStartupLogo::showSplash() {
-	if (startupLogo) {
-		startupLogo->show();
-  }
-}
-
-void KStartupLogo::hideSplash() {
-	if (startupLogo) {
-		startupLogo->hide();
-  }
-}
-
-void KStartupLogo::deleteSplash() {
-	delete startupLogo;
-	startupLogo = 0;
-}
-
-	
-void KStartupLogo::setStatusMessage(const QString& message) {
-	if (startupLogo) {
-		startupLogo->setText(message);
-  }
-}
-
-KStartupLogo::KStartupLogo()
-	: QWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) {
-
-  QPixmap pm;	
-	if ( !pm.load(locate("BT_pic","startuplogo.png")) ) {
-  	qWarning("Can't load startuplogo! Check your installation.");
-  }
-
-  setBackgroundPixmap(pm);
-
-  //Please not change the margin
-  textLabel = new QLabel(this);
-  textLabel->setGeometry(0,pm.height(),pm.width(),textLabel->sizeHint().height()+10);
-  textLabel->setBackgroundColor( QColor("#0d6de9") );
-  textLabel->setFrameStyle(QFrame::Panel | QFrame::Plain);
-  textLabel->setLineWidth(1);
-  textLabel->setScaledContents( true );
-
-  QFont f;
-  f.setBold( true );
-  textLabel->setFont( f );
-
-	QPalette p = palette();
-  p.setColor( QPalette::Inactive, QColorGroup::Text, Qt::white );
-  p.setColor( QPalette::Inactive, QColorGroup::Foreground, Qt::white );
-  p.setColor( QPalette::Normal, QColorGroup::Text, Qt::white );
-  p.setColor( QPalette::Normal, QColorGroup::Foreground, Qt::white );
-  setPalette( p );
-
-  setGeometry (
-    (KApplication::desktop()->width()-pm.width())/2,
-		(KApplication::desktop()->height()-pm.height()-textLabel->height())/2,
-    pm.width(),
-    pm.height()+textLabel->height()
-  );
-}
-
-void KStartupLogo::setText(const QString text){
-	//Please not make the text bold & let the first character be blank
-  textLabel->setText( QString::fromLatin1(" %1").arg(text) );
-  KApplication::kApplication()->processEvents();
-}
-
-/** Makes the splashscreen the toplevel window. */
-void KStartupLogo::raiseSplash(){
-	if (startupLogo) {
-    startupLogo->raise();
-    startupLogo->setActiveWindow();
-    startupLogo->textLabel->show();
-  }
-}
-
-/** Lowers the splash screen one window down, so it's possible to make it not to hide tip windows or other startup stuff. */
-void KStartupLogo::lowerSplash(){
-	if (startupLogo) {
-    startupLogo->lower();
-  }
-}
diff --git a/bibletime/frontend/kstartuplogo.h b/bibletime/frontend/kstartuplogo.h
deleted file mode 100644
index 5123bf3..0000000
--- a/bibletime/frontend/kstartuplogo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
-                          kstartuplogo.h  -  description                              
-                             -------------------                                         
-    begin                : Sat Sep 11 1999                                           
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de                                     
- ***************************************************************************
- ***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   * 
- *                                                                         *
- ***************************************************************************/
-
-
-#ifndef KSTARTUPLOGO_H
-#define KSTARTUPLOGO_H
-
-#include <qwidget.h>
-
-//forward declarations
-class QLabel;
-
-
-/**
-	* This class provides a startuplogo.
-  * @author The team of BibleTime
-  */
-class KStartupLogo : public QWidget {
-public:
-	static void createSplash();
-	static void showSplash();
-	static void hideSplash();
-	static void deleteSplash();		
-	static void setStatusMessage(const QString& message);
-  /** Makes the splashscreen the toplevel window. */
-  static void raiseSplash();
-  /** Lowers the splash screen one window down, so it's possible to make it not to hide tip windows or other startup stuff. */
-  static void lowerSplash();
-
-private:
-	KStartupLogo();
-  void setText(const QString text);
-  QLabel* textLabel;
-};
-
-#endif
-
-
-
-
-
-
diff --git a/bibletime/frontend/mainindex/Makefile.am b/bibletime/frontend/mainindex/Makefile.am
deleted file mode 100644
index e79b5b8..0000000
--- a/bibletime/frontend/mainindex/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES = $(all_includes)
-libmainindex_a_METASOURCES = AUTO
-noinst_LIBRARIES = libmainindex.a
-
-libmainindex_a_SOURCES = \
-cmainindex.cpp \
-cindexitem.cpp
-
-all_headers = \
-cmainindex.h \
-cindexitem.h
-
-EXTRA_DIST = $(libmainindex_a_SOURCES) $(all_headers)
-
-
-
-
-
diff --git a/bibletime/frontend/mainindex/Makefile.in b/bibletime/frontend/mainindex/Makefile.in
deleted file mode 100644
index 1ae5e2d..0000000
--- a/bibletime/frontend/mainindex/Makefile.in
+++ /dev/null
@@ -1,685 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-#>- libmainindex_a_METASOURCES = AUTO
-noinst_LIBRARIES = libmainindex.a
-
-libmainindex_a_SOURCES = \
-cmainindex.cpp \
-cindexitem.cpp
-
-
-all_headers = \
-cmainindex.h \
-cindexitem.h
-
-
-EXTRA_DIST = $(libmainindex_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/mainindex
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libmainindex_a_AR = $(AR) cru
-libmainindex_a_LIBADD =
-am_libmainindex_a_OBJECTS = cmainindex.$(OBJEXT) cindexitem.$(OBJEXT)
-#>- libmainindex_a_OBJECTS = $(am_libmainindex_a_OBJECTS)
-#>+ 5
-libmainindex_a_final_OBJECTS = libmainindex_a.all_cpp.o 
-libmainindex_a_nofinal_OBJECTS = cmainindex.$(OBJEXT) cindexitem.$(OBJEXT)\
-cmainindex.moc.o 
-@KDE_USE_FINAL_FALSE@libmainindex_a_OBJECTS = $(libmainindex_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libmainindex_a_OBJECTS = $(libmainindex_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cindexitem.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cmainindex.Po
-#>+ 4
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cmainindex.moc.P  $(DEPDIR)/libmainindex_a.all_cpp.P ./$(DEPDIR)/cindexitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cmainindex.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cmainindex.moc.P ./$(DEPDIR)/cindexitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cmainindex.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libmainindex_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libmainindex_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/mainindex/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/mainindex/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/mainindex/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libmainindex.a: $(libmainindex_a_OBJECTS) $(libmainindex_a_DEPENDENCIES) 
-	-rm -f libmainindex.a
-	$(libmainindex_a_AR) libmainindex.a $(libmainindex_a_OBJECTS) $(libmainindex_a_LIBADD)
-	$(RANLIB) libmainindex.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cindexitem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmainindex.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-cmainindex.moc.cpp: $(srcdir)/cmainindex.h
-	$(MOC) $(srcdir)/cmainindex.h -o cmainindex.moc.cpp
-
-#>+ 2
-mocs: cmainindex.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cmainindex.moc.cpp
-
-#>+ 2
-KDE_DIST=cindexitem.h cmainindex.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/mainindex/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/mainindex/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libmainindex_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cmainindex.cpp $(srcdir)/cindexitem.cpp cmainindex.moc.cpp 
-	@echo 'creating libmainindex_a.all_cpp.cpp ...'; \
-	rm -f libmainindex_a.all_cpp.files libmainindex_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libmainindex_a.all_cpp.final; \
-	for file in cmainindex.cpp cindexitem.cpp cmainindex.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libmainindex_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libmainindex_a.all_cpp.final; \
-	done; \
-	cat libmainindex_a.all_cpp.final libmainindex_a.all_cpp.files > libmainindex_a.all_cpp.cpp; \
-	rm -f libmainindex_a.all_cpp.final libmainindex_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libmainindex_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp
deleted file mode 100644
index 4977400..0000000
--- a/bibletime/frontend/mainindex/cindexitem.cpp
+++ /dev/null
@@ -1,1253 +0,0 @@
-/***************************************************************************
-                          cindexitem.cpp  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cindexitem.h"
-#include "cmainindex.h"
-
-#include "backend/creferencemanager.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/clanguagemgr.h"
-
-#include "frontend/searchdialog/csearchdialog.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/ctooltipmanager.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cinputdialog.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/cdragdropmgr.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-
-#include <string.h>
-
-//Qt includes
-#include <qdragobject.h>
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qtextstream.h>
-
-//KDE includes
-#include <kconfig.h>
-#include <klocale.h>
-#include <kfiledialog.h>
-#include <kiconloader.h>
-#include <kstandarddirs.h>
-
-#define CURRENT_SYNTAX_VERSION 1
-
-using std::string;
-
-CItemBase::CItemBase(CMainIndex* mainIndex, const Type type)
-  : KListViewItem(mainIndex),
-    m_type(type),
-    m_sortingEnabled(true)
-{
-  
-}
-
-CItemBase::CItemBase(CItemBase* parentItem, const Type type)
-  : KListViewItem(parentItem),
-    m_type(type),
-    m_sortingEnabled(true)
-{
-
-}
-
-CItemBase::~CItemBase() {
-}
-
-const QString CItemBase::toolTip() {
-  return QString::null;
-}
-
-/** Returns the used main index. */
-CMainIndex* CItemBase::listView() const{
-  return dynamic_cast<CMainIndex*>( QListViewItem::listView() );
-}
-
-void CItemBase::init() {
-  update();
-}
-
-void CItemBase::update() {
-}
-
-const CItemBase::Type& CItemBase::type() const{
-  return m_type;
-};
-
-void CItemBase::moveAfter( CItemBase* const item ){
-	if (!item)
-		return;
-	
-	if ( parent() != item->parent() ) { //different levels
-//		if (type == AllowDifferentParents) { //different parents are allowed
-//			if (item->parent())
-//				item->parent()->insertItem(this); //insert item to the childs
-//			else
-//				listView()->insertItem(this);
-//			moveItem(item);
-//		}
-	}
-	else {
-		moveItem(item); //both items are on the same level, so we can use moveItem
-	}
-}
-
-void CItemBase::dropped( QDropEvent* /*e*/ ) {
-}
-
-
-/** Returns true if the given action should be enabled in the popup menu. */
-const bool CItemBase::enableAction( const MenuAction /*action*/ ){
-  return false; //this base class has no valif actions
-}
-
-/** No descriptions */
-const bool CItemBase::isMovable(){
-  return false;
-}
-
-const bool CItemBase::allowAutoOpen( const QMimeSource* ) const {
-  return false;
-};
-
-/** This function engables or disables sorting depending on the parameter. */
-void CItemBase::setSortingEnabled( const bool& enableSort ){
-  m_sortingEnabled = enableSort;
-}
-
-/** Returns true whether the sorting is enabled or not. */
-const bool CItemBase::isSortingEnabled(){
-  return m_sortingEnabled;
-}
-
-/** Reimplementation which takes care of the our sortingEnabled setting. */
-void CItemBase::sortChildItems( int col, bool asc ){
-  if (!isSortingEnabled()) {
-    return;
-  }
-  else {
-    KListViewItem::sortChildItems( col, asc );
-  }
-}
-
-/** Reimplementation which takes care of the our sortingEnabled setting. */
-void CItemBase::sort(){
-  if (!isSortingEnabled()) {
-    return;
-  }
-  else {
-    KListViewItem::sort();
-  }
-}
-
-/* ---------------------------------------------- */
-/* ---------- new class: CModuleItem ------------ */
-/* ---------------------------------------------- */
-
-CModuleItem::CModuleItem(CTreeFolder* parentItem, CSwordModuleInfo* module) : CItemBase(parentItem), m_module(module) {
-}
-
-CModuleItem::~CModuleItem() {
-}
-
-/** No descriptions */
-void CModuleItem::update(){
-  if (m_module) {
-    setPixmap(0, CToolClass::getIconForModule(m_module));
-    setText(0,m_module->name() );
-  }
-}
-
-void CModuleItem::init(){
-  setDragEnabled(false);
-  setDropEnabled(true);
-
-  update();
-}
-
-
-/** Reimplementation to handle text drops on a module. In this case open the searchdialog. In the case of a referebnce open the module at the given position. */
-bool CModuleItem::acceptDrop( const QMimeSource* src ) const {
-  if (CDragDropMgr::canDecode(src)) {
-    if (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark) {
-      CDragDropMgr::Item item = CDragDropMgr::decode(src).first();
-      CSwordModuleInfo* m = backend()->findModuleByName( item.bookmarkModule() );
-      if (m && module()->type() == m->type()) { //it makes only sense
-        return true;
-      }
-      //but we also allow drops from bibles on commentaries and the other way from commentaries
-      else if (m && (module()->type() == CSwordModuleInfo::Bible) && (m->type() == CSwordModuleInfo::Commentary)) {
-        return true;
-      }
-      else if (m && (module()->type() == CSwordModuleInfo::Commentary) && (m->type() == CSwordModuleInfo::Bible)) {
-        return true;
-      }
-    }
-    else if(CDragDropMgr::dndType(src) == CDragDropMgr::Item::Text) { //text drop on a module
-      return true;
-    };
-  }
-  return false; //default return value
-}
-
-/** No descriptions */
-void CModuleItem::dropped( QDropEvent* e ){
-  /* Something was dropped on a module item
-  *
-  * 1. If the drop type is plain text open the searchdialog for this text and start the search
-  * 2. If the type is Bookmark, open the module at the specified position
-  *
-  * We support only the first drop item, more is not useful
-  */
-
-  if (acceptDrop(e)) {
-    CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e);
-    CDragDropMgr::Item item = dndItems.first();
-    if (CDragDropMgr::dndType(e) == CDragDropMgr::Item::Text) { //open the searchdialog
-//      qWarning("Text dropped!");
-  		if ( module() ) {
-        ListCSwordModuleInfo modules;
-        modules.append(module());
-
-        CSearchDialog::openDialog(modules, item.text());
-      }
-    }
-    else if (CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) { //open the module
-//      qWarning("type is Bookmark!");    
-      CSwordModuleInfo* m = backend()->findModuleByName( item.bookmarkModule() );
-      if (m) { //it makes only sense to create a new window for a module with the same type
-        if ((module()->type() == m->type()) ||
-            ((module()->type() == CSwordModuleInfo::Bible || module()->type() == CSwordModuleInfo::Commentary)
-            && (m->type() == CSwordModuleInfo::Bible || m->type() == CSwordModuleInfo::Commentary)))
-        { //same base type of module
-          ListCSwordModuleInfo modules;
-          modules.append(module());
-
-          listView()->emitModulesChosen(modules, item.bookmarkKey());
-        };
-      }
-    }
-//    else {
-////      qWarning("type is Unknown!");
-//    };
-  };
-}
-
-
-/** Reimplementation. */
-const QString CModuleItem::toolTip(){
-    QString text;
-		text = QString::fromLatin1("<DIV STYLE=\"border-bottom:thin solid black;\">")
-      + i18n("Module")
-      + QString::fromLatin1(": <B>%1</B></DIV>").arg( module()->name() )
-      + ((module()->category() == CSwordModuleInfo::Cult) ? QString::fromLatin1("<B>%1</B><BR>").arg(i18n("Take care, this module contains cult / questionable material!")) : QString::null);
-		text += QString::fromLatin1("<DIV STYLE=\"border-bottom:thin solid black;\">") + module()->config(CSwordModuleInfo::Description) + QString::fromLatin1("</DIV>");
-		text += i18n("Language")+ QString::fromLatin1(": %1<BR>").arg(module()->language().translatedName());
-		if (module()->isEncrypted())
-			text += i18n("Unlock key") + QString::fromLatin1(": %1<BR>")
-				.arg(!module()->config(CSwordModuleInfo::CipherKey).isEmpty() ? module()->config(CSwordModuleInfo::CipherKey) : QString("<FONT COLOR=\"red\">%1</FONT>").arg(i18n("not set")));
-		if (module()->hasVersion())
-			text += i18n("Version") + QString::fromLatin1(": %1<BR>").arg(module()->config(CSwordModuleInfo::ModuleVersion));
-     	     	
-   	QString options;
-   	unsigned int opts;
-   	for (opts = CSwordBackend::filterTypesMIN; opts <= CSwordBackend::filterTypesMAX; ++opts){
-   		if (module()->has( static_cast<CSwordBackend::FilterTypes>(opts) )) {
-     		if (!options.isEmpty())
-     			options += QString::fromLatin1(", ");
-     		options += CSwordBackend::translatedOptionName( static_cast<CSwordBackend::FilterTypes>(opts) );
-   		}
-   	}
-   	if (!options.isEmpty())
-   		text += i18n("Options") + QString::fromLatin1(": <font size= \"-1\">") + options + QString::fromLatin1("</font>");
-     		
-		if (text.right(4) == QString::fromLatin1("<BR>"))
-			text = text.left(text.length()-4);
-		return text;
-}
-
-/** Returns the used module. */
-CSwordModuleInfo* const CModuleItem::module() const {
-  return m_module;
-}
-
-/** Returns the about module info of the used module. */
-const QString CModuleItem::aboutInfo(){
-	QString text;	
-
-  if (module()->hasVersion())
-    text += QString::fromLatin1("<b>%1:</b> %2<br>")
-    	.arg(i18n("Version"))
-    	.arg(module()->config(CSwordModuleInfo::ModuleVersion));
-
-	text += QString::fromLatin1("<b>%1:</b> %2<br><b>%3:</b> %4<br>")
-		.arg(i18n("Location"))
-		.arg(module()->config(CSwordModuleInfo::AbsoluteDataPath))
-		.arg(i18n("Language"))
-		.arg(module()->language().translatedName());
-
-	if (module()->isWritable())
-		text += QString::fromLatin1("<b>%1:</b> %2<br>")
-							.arg(i18n("Writable"))
-							.arg(i18n("yes"));
-
-	if ( module()->isEncrypted() )
-		text += QString::fromLatin1("<b>%1:</b> %2<br>")
-							.arg(i18n("Unlock key"))
-							.arg(module()->config(CSwordModuleInfo::CipherKey));	
-
-	QString options;
-	unsigned int opts;
-	for (opts = CSwordBackend::filterTypesMIN; opts <= CSwordBackend::filterTypesMAX; ++opts){
-		if (module()->has( static_cast<CSwordBackend::FilterTypes>(opts) )){
-  		if (!options.isEmpty())
-  			options += QString::fromLatin1(", ");
-  		options += CSwordBackend::translatedOptionName( static_cast<CSwordBackend::FilterTypes>(opts) );
-		}
-	}
-	if (!options.isEmpty())
-		text += QString("<b>%1:</b> %2<br>")
-			.arg(i18n("Features"))
-			.arg(options);
-
-  if (m_module->category() == CSwordModuleInfo::Cult) { //clearly say the module contains cult/questionable materials
-    text += QString::fromLatin1("<BR><B>%1</B><BR><BR>")
-              .arg(i18n("Take care, this module contains cult / questionable material!"));
-  };
-
-	text += QString::fromLatin1("<b>%1:</b><br> <font size=\"-1\">%2</font>")
-						.arg(i18n("About"))
-						.arg(module()->config(CSwordModuleInfo::AboutInformation));
-  return text;
-}
-
-
-/** Reimplementation from  CItemBase. */
-const bool CModuleItem::enableAction( const MenuAction action ){
-  if (action == EditModule) {
-    if (!module())
-      return false;
-    return module()->isWritable();
-  }
-
-  if (action == SearchInModules || action == AboutModule)
-    return true;
-  if (module()->isEncrypted() && action == UnlockModule)
-    return true;
-  return false;
-}
-
-/* ----------------------------------------------*/
-/* ---------- new class: CBookmarkItem ------------*/
-/* ----------------------------------------------*/
-
-CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description)
-  : CItemBase(parentItem),
-    m_description(description),
-    m_moduleName(module ? module->name() : QString::null)
-{
-  if ((module && (module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary))  ) {
-    CSwordVerseKey vk(0);
-    vk = key;
-    vk.setLocale("en");
-    m_key = vk.key(); //the m_key member is always the english key!
-  }
-  else {
-    m_key = key;
-  };
-
-  m_startupXML = QDomElement(); //empty XML code
-}
-
-CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, QDomElement& xml )
-  : CItemBase(parentItem),
-    m_key(QString::null),
-    m_description(QString::null),
-    m_moduleName(QString::null)
-{
-  m_startupXML = xml;
-}
-
-CBookmarkItem::~CBookmarkItem() {
-
-}
-
-/** No descriptions */
-void CBookmarkItem::update(){
-  const QString title = QString::fromLatin1("%1 (%2)").arg(key()).arg(module() ? module()->name() : i18n("unknown"));
-  setText(0, title);
-  setPixmap(0,SmallIcon(CResMgr::mainIndex::bookmark::icon,16));
-}
-
-void CBookmarkItem::init(){
-  if (!m_startupXML.isNull()) { //we have some XML code to parse
-    loadFromXML(m_startupXML);
-  }
-
-  update();
-  setDropEnabled(false);
-  setDragEnabled(false);
-
-//  if (!module())
-//    setSelectable(false);
-}
-
-/** Reimplementation. */
-const QString CBookmarkItem::toolTip(){
-  if (!module()) {
-    return QString::null;
-  }
-
-  return CTooltipManager::textForReference(module()->name(), key(), description());
-}
-
-/** Returns the used module. */
-CSwordModuleInfo* const CBookmarkItem::module() {
-  CSwordModuleInfo* m = backend()->findModuleByName(m_moduleName);
-//  Q_ASSERT(m);
-  return m;
-}
-
-/** Returns the used key. */
-const QString CBookmarkItem::key(){
-  const QString englishKeyName = englishKey();
-  if (!module()) {
-    return englishKeyName;
-  }
-
-  QString returnKeyName = englishKeyName;
-  if ((module()->type() == CSwordModuleInfo::Bible) || (module()->type() == CSwordModuleInfo::Commentary)) {
-    CSwordVerseKey vk(0);
-    vk = englishKeyName;
-    vk.setLocale( backend()->booknameLanguage().latin1() );
-
-    returnKeyName = vk.key(); //the returned key is always in the currently set bookname language
-  }
-
-  return returnKeyName;
-}
-
-/** Returns the used description. */
-const QString& CBookmarkItem::description(){
-  return m_description;
-}
-
-/** No descriptions */
-const bool CBookmarkItem::isMovable(){
-  return true;
-}
-
-/** Reimplementation to handle  the menu entries of the main index. */
-const bool CBookmarkItem::enableAction(const MenuAction action){
-  if (action == ChangeBookmark || (module() && (action == PrintBookmarks)) || action == DeleteEntries)
-    return true;
-
-  return false;
-}
-
-void CBookmarkItem::print(){
-  if (!module())
-    return;
-
-  CExportManager mgr(i18n("Print bookmark"),false);
-  mgr.printKey(module(), key(), key(), description());
-}
-
-/** Changes this bookmark. */
-void CBookmarkItem::rename(){
-  bool ok  = false;
-  QString newDescription = CInputDialog::getText(i18n("Change description ..."),i18n("Enter a new description for the chosen bookmark."), description(), &ok, listView(), true);
-  if (ok) {
-    m_description = newDescription;
-    update();
-  }
-}
-
-/** Reimplementation of CItemBase::saveToXML. */
-QDomElement CBookmarkItem::saveToXML( QDomDocument& doc ){
-  QDomElement elem = doc.createElement("Bookmark");
-
-  elem.setAttribute("key", englishKey());
-  elem.setAttribute("description", description());
-  elem.setAttribute("modulename", m_moduleName);
-  elem.setAttribute("moduledescription", module() ? module()->config(CSwordModuleInfo::Description) : QString::null);
-
-  return elem;
-}
-
-void CBookmarkItem::loadFromXML( QDomElement& element ) {
-  if (element.isNull())
-    return;
-
-  //find the right module
-  if (element.hasAttribute("modulename")) {
-		//we use the name in all cases, even if the module isn't installed anymore
-		m_moduleName = element.attribute("modulename");
-  }
-
-  if (element.hasAttribute("key")) {
-    m_key = element.attribute("key");
-  }
-
-  if (element.hasAttribute("description")) {
-    m_description = element.attribute("description");
-  }
-}
-
-/** Returns the english key. */
-const QString& CBookmarkItem::englishKey(){
-  return m_key;
-}
-
-/** Reimplementation. Returns false everytime because a bookmarks  has not possible drops. */
-bool CBookmarkItem::acceptDrop(const QMimeSource* /*src*/){
-  return false;
-}
-
-/****************************************/
-/*****  class: CItemFolder  *************/
-/****************************************/
-
-CFolderBase::CFolderBase(CMainIndex* mainIndex, const Type type) : CItemBase(mainIndex, type) {
-}
-
-CFolderBase::CFolderBase(CFolderBase* parentItem, const Type type) : CItemBase(parentItem, type) {
-}
-
-CFolderBase::CFolderBase(CFolderBase* parentFolder, const QString& caption) : CItemBase(parentFolder){
-  setText(0, caption);
-}
-
-CFolderBase::~CFolderBase() {
-}
-
-const bool CFolderBase::isFolder() {
-  return true;
-}
-
-void CFolderBase::update() {
-  CItemBase::update();
-  if (isOpen() && childCount())
-    setPixmap(0, SmallIcon(CResMgr::mainIndex::openedFolder::icon, 16));
-  else
-    setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-}
-
-void CFolderBase::init() {
-  CItemBase::init();
-  setDropEnabled(false);
-  setDragEnabled(false);
-}
-
-/** No descriptions */
-void CFolderBase::setOpen( bool open ){
-  KListViewItem::setOpen(open);
-  update();
-}
-
-/** The function which renames this folder. */
-void CFolderBase::rename(){
-  startRename(0);
-}
-
-/** Creates a new sub folder of this folder. */
-void CFolderBase::newSubFolder(){
-  if (dynamic_cast<CBookmarkFolder*>(this) || dynamic_cast<Bookmarks::SubFolder*>(this) ) {
-    Bookmarks::SubFolder* f = new Bookmarks::SubFolder(this, i18n("New folder"));
-    f->init();
-
-    listView()->setCurrentItem(f);
-    listView()->ensureItemVisible(f);
-    f->rename();
-  }
-}
-
-/** Reimplementation. Returns true if the drop is accepted. */
-const bool CFolderBase::allowAutoOpen( const QMimeSource* ) const{
-  return true;
-}
-
-/** Reimplementation. Returns false because folders have no use for drops (except for the bookmark folders) */
-bool CFolderBase::acceptDrop(const QMimeSource*){
-//  qWarning("CFolderBase::acceptDrop");
-  return false;
-}
-
-/****************************************/
-/*****  class: CTreeFolder  *************/
-/****************************************/
-
-
-CTreeFolder::CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language) : CFolderBase(mainIndex, type) {
-  m_language = language;
-}
-
-CTreeFolder::CTreeFolder(CFolderBase* item, const Type type, const QString& language) : CFolderBase(item, type) {
-  m_language = language;
-}
-
-CTreeFolder::~CTreeFolder(){
-}
-
-void CTreeFolder::addGroup(const Type type, const QString language){
-  CTreeFolder* i = 0;
-  if (type == BookmarkFolder) {
-    i = new CBookmarkFolder(this);
-  }
-  else if (type == OldBookmarkFolder) {
-    i = new Bookmarks::OldBookmarksFolder(this);
-  }
-  else {
-    i = new CTreeFolder(this, type, language);
-  }
-  i->init();
-  if (!i->childCount())
-    delete i;
-}
-
-void CTreeFolder::addModule(CSwordModuleInfo* const module){
-  CModuleItem* i = new CModuleItem(this, module);
-  i->init();
-}
-
-void CTreeFolder::addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description){
-  CBookmarkItem* i = new CBookmarkItem(this, module, key, description);
-  i->init();
-}
-
-void CTreeFolder::update(){
-  CFolderBase::update();
-}
-
-void CTreeFolder::init(){
-  if (language() == "*") {
-    switch (type()) {
-      case BibleModuleFolder:
-        setText(0,i18n("Bibles"));
-        break;
-      case CommentaryModuleFolder:
-        setText(0,i18n("Commentaries"));
-        break;
-      case LexiconModuleFolder:
-        setText(0,i18n("Lexicons"));
-        break;
-      case BookModuleFolder:
-        setText(0,i18n("Books"));
-        break;
-      case DevotionalModuleFolder:
-        setText(0,i18n("Daily devotionals"));
-        break;
-      case GlossaryModuleFolder:
-        setText(0,i18n("Glossaries"));
-        break;
-      case BookmarkFolder:
-        setText(0,i18n("Bookmarks"));
-        break;
-      case OldBookmarkFolder:
-        setText(0,i18n("Old bookmarks"));
-        break;
-      default:
-        setText(0, i18n("Unknown"));
-        break;
-    };
-  }
-  else {
-    CLanguageMgr::Language lang = languageMgr()->languageForAbbrev( language() );
-    
-    setText(0, !language().isEmpty() ? ( lang.isValid() ? lang.translatedName() : language()) : i18n("Unknown language"));
-  }
-  initTree();
-  update();
-}
-
-void CTreeFolder::initTree(){
-//  qWarning("CTreeMgr::initTree");
-  if (type() == Unknown)
-    return;
-
-  CSwordModuleInfo::ModuleType moduleType = CSwordModuleInfo::Unknown;
-  if (type() == BibleModuleFolder)
-    moduleType = CSwordModuleInfo::Bible;
-  else if (type() == CommentaryModuleFolder)
-    moduleType = CSwordModuleInfo::Commentary;
-  else if (type() == LexiconModuleFolder || type() == GlossaryModuleFolder || type() == DevotionalModuleFolder)
-    moduleType = CSwordModuleInfo::Lexicon;
-  else if (type() == BookModuleFolder)
-    moduleType = CSwordModuleInfo::GenericBook;
-
-  //get all modules by using the given type
-  ListCSwordModuleInfo allModules = backend()->moduleList();
-  ListCSwordModuleInfo usedModules;
-  for (CSwordModuleInfo* m = allModules.first(); m; m = allModules.next()) {
-    if (m->type() == moduleType) { //found a module, check if the type is correct (devotional etc.)
-      if (type() == GlossaryModuleFolder && !m->category() == CSwordModuleInfo::Glossary) { //not a gglossary
-        continue;
-      }
-      if (type() == DevotionalModuleFolder && (m->category() != CSwordModuleInfo::DailyDevotional)) {//not a devotional
-        continue;
-      }
-      if (type() == LexiconModuleFolder && ( (m->category() == CSwordModuleInfo::DailyDevotional) || (m->category() == CSwordModuleInfo::Glossary) )) {
-        //while looking for lexicons glossaries and devotionals shouldn't be used
-        continue;
-      }
-
-      if (language() == QString::fromLatin1("*") || (language() != QString::fromLatin1("*") && QString::fromLatin1(m->module()->Lang()) == language()) )//right type and language!
-        usedModules.append(m);
-    }
-  }
-
-  //we have now all modules we want to have
-  if (language() == QString::fromLatin1("*")) { //create subfolders for each language
-    QStringList usedLangs;
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      QString lang = QString::fromLatin1(m->module()->Lang());
-//      if (lang.isEmpty())
-//        lang = ");
-      if (!usedLangs.contains(lang)) {
-        usedLangs.append(lang);
-      }
-    }
-    QStringList::iterator it;
-    for (it = usedLangs.begin(); it != usedLangs.end(); ++it) {
-      addGroup(/**it,*/ type(), *it);
-    }
-  }
-  else if (usedModules.count() > 0){ //create subitems with the given type and language
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      addModule(m);
-    }
-  }
-
-  sortChildItems(0,true);
-}
-
-const QString& CTreeFolder::language() const {
-  return m_language;
-};
-
-/* --------------------------------------------------*/
-/* ---------- new class: CBookmarkFolder::SubFolder--*/
-/* --------------------------------------------------*/
-
-namespace Bookmarks {
-  /* --------------------------------------------------------------------------*/
-  /* ---------- new class: CBookmarkFolder::OldBookmarkImport -----------------*/
-  /* --------------------------------------------------------------------------*/
-  const QString OldBookmarkImport::oldBookmarksXML( const QString& configFileName ) {
-    QString fileName = (configFileName.isEmpty()) ? "bt-groupmanager" : configFileName;
-    KConfig* config = new KSimpleConfig( fileName );
-
-    KConfigGroupSaver groupSaver(config, configFileName.isEmpty() ? "Groupmanager" : "Bookmarks");
-
-    QDomDocument doc("DOC");
-    doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-    QDomElement content = doc.createElement("SwordBookmarks");
-    content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-    doc.appendChild(content);
-
-    //first create the bookmark groups in the XML document, then add the bookmarks to each parent
-    QMap<int, QDomElement> parentMap; //maps parent ids to dom elements
-
-
-  	QStringList	groupList = config->readListEntry("Groups");
-  	QValueList<int>	parentList = config->readIntListEntry("Group parents");
-
-    QStringList::Iterator it_groups = groupList.begin();
-  	QValueList<int>::Iterator it_parents = parentList.begin();
-
-    int parentIDCounter = 0;
-  	while ( (it_groups != groupList.end()) && (it_parents != parentList.end()) ) {
-      QDomElement parentElement = (*it_parents == -1) ? content : parentMap[*it_parents];
-      if (parentElement.isNull()) {
-        qWarning("EMPTY PARENT FOUND!");
-        parentElement = content;
-      };
-
-      QDomElement elem = doc.createElement("Folder");
-      elem.setAttribute("caption", (*it_groups));
-      parentMap.insert(parentIDCounter, elem);
-
-      parentElement.appendChild( elem );
-
-
-  		++it_parents;
-    	++it_groups;
-      ++parentIDCounter;
-    }
-
-    //groups are now read in, create now the bookmarks
-  	parentList 	= config->readIntListEntry("Bookmark parents");
-    QStringList	bookmarkList 							= config->readListEntry("Bookmarks");
-  	QStringList	bookmarkModulesList 			= config->readListEntry("Bookmark modules");
-  	QStringList	bookmarkDescriptionsList 	= config->readListEntry("Bookmark descriptions");
-
-  	it_parents  = parentList.begin();
-  	QStringList::Iterator it_bookmarks 	  = bookmarkList.begin();
-  	QStringList::Iterator it_modules 		  = bookmarkModulesList.begin();
-  	QStringList::Iterator it_descriptions	= bookmarkDescriptionsList.begin();
-
-  	while ( it_bookmarks != bookmarkList.end()
-            && it_parents != parentList.end()
-  			 		&& it_modules != bookmarkModulesList.end()
-          )
-    {
-      QDomElement parentElement = ((*it_parents) == -1) ? content : parentMap[(*it_parents)];
-      if (parentElement.isNull()) {
-        qWarning("EMPTY PARENT FOUND!");
-        parentElement = content;
-      };
-      QDomElement elem = doc.createElement("Bookmark");
-
-      elem.setAttribute("key", *it_bookmarks);
-      elem.setAttribute("description", *it_descriptions);
-      elem.setAttribute("modulename", *it_modules);
-
-      CSwordModuleInfo* m = CPointers::backend()->findModuleByName( *it_modules );
-      elem.setAttribute("moduledescription", m ? m->config(CSwordModuleInfo::Description) : QString::null);
-
-      parentElement.appendChild( elem );
-
-
-  		++it_parents;
-  		++it_modules;
-  		++it_descriptions;
-  		++it_bookmarks;
-    };
-
-    return doc.toString();
-  };
-
- /********************
- *   New class: OldBookmarkFolder
- *********************/
-
- OldBookmarksFolder::OldBookmarksFolder(CTreeFolder* folder) : CBookmarkFolder(folder, OldBookmarkFolder) {
- }
-
- OldBookmarksFolder::~OldBookmarksFolder() {
- }
-
- /** Reimplementation to handle special bookmark tree. */
- void OldBookmarksFolder::initTree(){
-   // Import the bookmarks of the previous BibleTime versions
-   if (!CBTConfig::get( CBTConfig::readOldBookmarks )) { //if we havn't yet loaded the old bookmarks
-     loadBookmarksFromXML( Bookmarks::OldBookmarkImport::oldBookmarksXML() );
-   }
- }
-
-
- QDomElement OldBookmarksFolder::saveToXML( QDomDocument& doc ) {
-   QDomElement elem = doc.createElement("Folder");
-   elem.setAttribute("caption", text(0));
-
-   // Append the XML nodes of all child items
-   CItemBase* i = dynamic_cast<CItemBase*>(firstChild());
-   while( i ) {
-     if (i->parent() == this) {
-       QDomElement newElem = i->saveToXML( doc );
-       if (!newElem.isNull()) {
-         elem.appendChild( newElem ); //append to this folder
-       }
-     }
-     i = dynamic_cast<CItemBase*>( i->nextSibling() );
-   }
-
-   // Save to config, that we imported the old bookmarks and that we have them on disk
-   CBTConfig::set( CBTConfig::readOldBookmarks, true );
-
-   return elem;
- }
-
- void OldBookmarksFolder::loadFromXML( QDomElement& /*element*/ ) {
-   //this function is empty because the folder imports the old 1.2 bookmarks from the bt-groupmanager config file
- }
-
-
- // New class SubFolder
-
- SubFolder::SubFolder(CFolderBase* parentItem, const QString& caption) : CBookmarkFolder(parentItem, BookmarkFolder) {
-   m_startupXML = QDomElement();
-   setText( 0, caption );
- }
-
- SubFolder::SubFolder(CFolderBase* parentItem, QDomElement& xml ) : CBookmarkFolder(parentItem, BookmarkFolder) {
-   m_startupXML = xml;
- }
-
- SubFolder::~SubFolder() {
- }
-
- void SubFolder::init() {
-   CFolderBase::init();
-   if (!m_startupXML.isNull())
-     loadFromXML(m_startupXML);
-
-   setDropEnabled(true);
-   setRenameEnabled(0,true);
- }
-
-// /** Is called when an item was dropped on this subfolder. */
-// bool SubFolder::acceptDrop(const QMimeSource * src) const {
-//   return CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark);
-// }
-
- /** Reimplementation from  CItemBase. */
- const bool SubFolder::enableAction(const MenuAction action){
-   if (action == ChangeFolder || action == NewFolder || action == DeleteEntries || action == ImportBookmarks )
-     return true;
-
-   if (action == ExportBookmarks || action == ImportBookmarks )
-     return true; //not yet implemented
-
-   return false;
- }
-
- /** Returns the XML code which represents the content of this folder. */
- QDomElement SubFolder::saveToXML( QDomDocument& doc ) {
-   /**
-   * Save all subitems (bookmarks and folders) to the XML file.
-   * We get the XML code for the items by calling their own saveToXML implementations.
-   */
-   QDomElement elem = doc.createElement("Folder");
-   elem.setAttribute("caption", text(0));
-
-   //append the XML nodes of all child items
-   CItemBase* i = dynamic_cast<CItemBase*>(firstChild());
-   while( i ) {
-     if (i->parent() == this) {
-       QDomElement newElem = i->saveToXML( doc );
-       if (!newElem.isNull()) {
-         elem.appendChild( newElem ); //append to this folder
-       }
-     }
-     i = dynamic_cast<CItemBase*>( i->nextSibling() );
-   }
-   return elem;
- }
-
- /** Loads the content of this folder from the XML code passed as argument to this function. */
- void SubFolder::loadFromXML( QDomElement& elem ) {
-   //get the caption and restore all child items!
-   if (elem.hasAttribute("caption"))
-     setText(0, elem.attribute("caption"));
-
-   //restore all child items
-   QDomElement child = elem.firstChild().toElement();
-   CItemBase* oldItem = 0;
-   while ( !child.isNull() && child.parentNode() == elem ) {
-     CItemBase* i = 0;
-     if (child.tagName() == "Folder") {
-       i = new Bookmarks::SubFolder(this, child);
-     }
-     else if (child.tagName() == "Bookmark") {
-       i = new CBookmarkItem(this, child);
-     }
-     i->init();
-     if (oldItem)
-       i->moveAfter(oldItem);
-     oldItem = i;
-
-     child = child.nextSibling().toElement();
-   }
- }
-};
-
-
-/* --------------------------------------------------*/
-/* ---------- new class: CBookmarkFolder ------------*/
-/* --------------------------------------------------*/
-
-CBookmarkFolder::CBookmarkFolder(CMainIndex* mainIndex, const Type type) : CTreeFolder(mainIndex, type, "*") {
-  setSortingEnabled(false);
-}
-
-CBookmarkFolder::CBookmarkFolder(CFolderBase* parentItem, const Type type) : CTreeFolder(parentItem, type, "*") {
-  setSortingEnabled(false);
-}
-
-CBookmarkFolder::~CBookmarkFolder() {
-}
-
-void CBookmarkFolder::initTree(){
-  addGroup(OldBookmarkFolder, "*");
-
-  KStandardDirs stdDirs;
- 	const QString path = stdDirs.saveLocation("data", "bibletime/");	
-  if (!path.isEmpty()) {
-    loadBookmarks(path + "bookmarks.xml");
-  }
-}
-
-/** Reimplementation. */
-const bool CBookmarkFolder::enableAction(const MenuAction action){
-  if (action == NewFolder || action == ImportBookmarks)
-    return true;
-
-  if (action == ExportBookmarks && childCount())
-    return true;
-
-  return false;
-}
-
-
-void CBookmarkFolder::exportBookmarks(){
-  QString fileName = KFileDialog::getSaveFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Export bookmarks"));
-  if (!fileName.isEmpty()) {
-    saveBookmarks( fileName, false ); //false means we don't want to overwrite the file without asking the user
-  };
-}
-
-
-void CBookmarkFolder::importBookmarks(){
-  QString fileName = KFileDialog::getOpenFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Import bookmarks"));
-  if (!fileName.isEmpty()) {
-    //we have to decide if we should load an old bookmark file from 1.2 or earlier or the new XML format of > 1.3    
-    if ( !loadBookmarks(fileName) ) { //if this failed try to load it as old bookmark file
-      loadBookmarksFromXML( Bookmarks::OldBookmarkImport::oldBookmarksXML( fileName ) );
-    };
-  };
-}
-
-bool CBookmarkFolder::acceptDrop(const QMimeSource * src) const {
-  qWarning("bool CBookmarkFolder::acceptDrop(const QMimeSource * src): return%ii", (CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark)));
-  return (CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark));
-}
-
-void CBookmarkFolder::dropped(QDropEvent *e) {
-  qWarning("CBookmarkFolder::dropped?");
-  if (acceptDrop(e)) {
-    qWarning("CBookmarkFolder: item drop accepted");
-    CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e);
-
-    qWarning("decoded items: %i", dndItems.count() );
-    CDragDropMgr::ItemList::Iterator it;
-    CItemBase* previousItem = 0;
-    for( it = dndItems.begin(); it != dndItems.end(); ++it) {
-      CSwordModuleInfo* module = backend()->findModuleByName( (*it).bookmarkModule() );
-      CBookmarkItem* i = new CBookmarkItem(this, module, (*it).bookmarkKey(), (*it).bookmarkDescription());
-      qWarning("created new item");
-      if (previousItem) {
-        i->moveAfter( previousItem );
-        qWarning("moved new item");
-      }
-      i->init();
-      previousItem = i;
-    };
-  };
-}
-
-/** Saves the bookmarks in a file. */
-const bool CBookmarkFolder::saveBookmarks( const QString& filename, const bool& forceOverwrite ){
-  QDomDocument doc("DOC");
-  doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-  QDomElement content = doc.createElement("SwordBookmarks");
-  content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-  doc.appendChild(content);
-
-  //append the XML nodes of all child items
-  CItemBase* i = dynamic_cast<CItemBase*>( firstChild() );
-  while( i ) {
-    if (i->parent() == this) { //only one level under this folder
-      QDomElement newElem = i->saveToXML( doc ); // the cild creates it's own XML code
-      if (!newElem.isNull()) {
-        content.appendChild( newElem ); //append to this folder
-      }
-    }
-    i = dynamic_cast<CItemBase*>( i->nextSibling() );
-  }
-
-	return CToolClass::savePlainFile(filename, doc.toString(), forceOverwrite, QTextStream::UnicodeUTF8);
-}
-
-const bool CBookmarkFolder::loadBookmarksFromXML( const QString& xml ){
-	QDomDocument doc;
-	doc.setContent(xml);
-  QDomElement document = doc.documentElement();
-  if( document.tagName() != "SwordBookmarks" ) {
-    qWarning("Not a BibleTime Bookmark XML file");
-		return false;
-	}
-
-  CItemBase* oldItem = 0;
-  //restore all child items
-  QDomElement child = document.firstChild().toElement();
-  while ( !child.isNull() && child.parentNode() == document) {
-    CItemBase* i = 0;
-    if (child.tagName() == "Folder") {
-      i = new Bookmarks::SubFolder(this, child);
-    }
-    else if (child.tagName() == "Bookmark") {
-      i = new CBookmarkItem(this, child);
-    }
-    if (!i) {
-      break;
-    }
-
-    i->init();
-    if (oldItem) {
-      i->moveAfter(oldItem);
-    }
-    oldItem = i;
-
-    if (!child.nextSibling().isNull()) {
-      child = child.nextSibling().toElement();
-    }
-    else {
-      break;
-    }
-  }
-  return true;
-}
-
-/** Loads bookmarks from a file. */
-const bool CBookmarkFolder::loadBookmarks( const QString& filename ){
-  QFile file(filename);	
-	if (!file.exists())
-		return false;
-
-  QString xml;	
-	if (file.open(IO_ReadOnly)) {		
-		QTextStream t;
-		t.setEncoding(QTextStream::UnicodeUTF8); //set encoding before file is used for input!
-		t.setDevice(&file);
-    xml = t.read();
-		file.close();	
-	}
-
-  return loadBookmarksFromXML( xml );
-}
-
-/* NEW CLASS */
-
-CGlossaryFolder::CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage)
-  : CTreeFolder(mainIndex, type, fromLanguage)
-{
-  m_fromLanguage = fromLanguage;
-  m_toLanguage = toLanguage;  
-}
-
-CGlossaryFolder::CGlossaryFolder(CFolderBase* item, const Type type, const QString& fromLanguage, const QString& toLanguage)
-  : CTreeFolder(item, type, fromLanguage)
-{
-  m_fromLanguage = fromLanguage;
-  m_toLanguage = toLanguage;
-}
-
-CGlossaryFolder::~CGlossaryFolder(){
-}
-
-void CGlossaryFolder::initTree(){
-  if (type() == Unknown)
-    return;
-
-  //get all modules by using the lexicon type
-  ListCSwordModuleInfo allModules = backend()->moduleList();
-  ListCSwordModuleInfo usedModules;
-  for (CSwordModuleInfo* m = allModules.first(); m; m = allModules.next()) {
-    if (m->type() == CSwordModuleInfo::Lexicon) { //found a module, check if the type is correct (devotional etc.)
-      if ((type() == GlossaryModuleFolder) && (m->category() != CSwordModuleInfo::Glossary)) { //not a glossary
-        continue;
-      }
-      //found a glossary
-      if (language() == QString::fromLatin1("*")
-        || (language() != QString::fromLatin1("*")
-          && m->config(CSwordModuleInfo::GlossaryFrom) == fromLanguage()
-          && m->config(CSwordModuleInfo::GlossaryTo) == toLanguage()
-      )
-        )
-      { //right type and language!
-        usedModules.append(m);
-      }
-    }
-  }
-
-  //we have now all modules we want to have
-  if (language() == QString::fromLatin1("*")) { //create subfolders for each language
-    typedef std::pair<QString, QString> LanguagePair;
-    typedef QValueList<LanguagePair> LanguagePairList;
-    
-    LanguagePairList usedLangs;
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      LanguagePair langPair( m->config(CSwordModuleInfo::GlossaryFrom), m->config(CSwordModuleInfo::GlossaryTo) );
-      if (!usedLangs.contains(langPair)) {
-        usedLangs.append(langPair);
-      }
-    }
-    LanguagePairList::iterator it;
-    for (it = usedLangs.begin(); it != usedLangs.end(); ++it) {
-      addGroup(type(), (*it).first, (*it).second);
-    }
-  }
-  else if (usedModules.count() > 0){ //create subitems with the given type and languages
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      addModule(m);
-    }
-  }
-
-  sortChildItems(0,true);  
-}
-
-void CGlossaryFolder::init(){
-  if (language() == "*") {
-    setText(0,i18n("Glossaries"));
-  }
-  else {
-    CLanguageMgr::Language fromLang = languageMgr()->languageForAbbrev( m_fromLanguage );    
-    CLanguageMgr::Language toLang = languageMgr()->languageForAbbrev( m_toLanguage );
-
-    QString fromLangString  = fromLang.translatedName();
-    QString toLangString    = toLang.translatedName();
-        
-    if (fromLangString.isEmpty()) { //use abbrev!
-      fromLangString = m_fromLanguage;
-    };
-    if (toLangString.isEmpty()) { //use abbrev!
-      toLangString = m_toLanguage;
-    };
-    
-        
-    setText(0, fromLangString + " - " + toLangString );
-  }
-  initTree();
-  update();
-}
-
-/** Returns the language this glossary folder maps from. */
-const QString& CGlossaryFolder::fromLanguage() const{
-  return m_fromLanguage;
-}
-
-/** Returns the language this glossary folder maps to. */
-const QString& CGlossaryFolder::toLanguage() const{
-  return m_toLanguage;
-}
-
-void CGlossaryFolder::addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage) {
-  CTreeFolder* i = new CGlossaryFolder(this, type, fromLanguage, toLanguage);
-  i->init();
-  if (!i->childCount())
-    delete i;
-}
-
diff --git a/bibletime/frontend/mainindex/cindexitem.h b/bibletime/frontend/mainindex/cindexitem.h
deleted file mode 100644
index c0fc642..0000000
--- a/bibletime/frontend/mainindex/cindexitem.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/***************************************************************************
-                          cindexitem.h  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CINDEXITEM_H
-#define CINDEXITEM_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-#include "backend/cswordmoduleinfo.h"
-
-//Qt includes
-#include <qdom.h>
-
-//KDE includes
-#include <klistview.h>
-
-class KConfig;
-class CFolderBase;
-class CTreeFolder;
-class CMainIndex;
-
-class CItemBase : public KListViewItem, public CPointers {
-public:
-  enum Type {
-    Unknown = 0,
-    BookmarkFolder,
-    Bookmark,
-    OldBookmarkFolder, /* Bookmarks in the old format from BibleTime 1.1.x and 1.2.x */
-    BibleModuleFolder,
-    CommentaryModuleFolder,
-    LexiconModuleFolder,
-    BookModuleFolder,
-    DevotionalModuleFolder,
-    GlossaryModuleFolder,
-    ModuleLanguageFolder,
-    Module
-  };
-  enum MenuAction {
-    NewFolder = 0,
-    ChangeFolder,
-
-    ChangeBookmark,
-    ImportBookmarks,
-    ExportBookmarks,
-    PrintBookmarks,
-
-    DeleteEntries,
-
-    EditModule,
-    SearchInModules,
-    UnlockModule,
-    AboutModule,
-
-    ActionBegin = NewFolder,
-    ActionEnd = AboutModule
-  };
-
-  CItemBase(CMainIndex* mainIndex, const Type type = Unknown);
-  CItemBase(CItemBase* item, const Type type = Unknown);
-
-  virtual ~CItemBase();
-  virtual const QString toolTip();
-  virtual CMainIndex* listView() const;
-  /**
-  * Returns if the implementation of this class is a folder item or not.
-  * Reimplement this function to return the correct value.
-  */
-  virtual const bool isFolder() { return false; };
-  const Type& type() const;
-
-  virtual void init();
-  virtual void update();
-  void moveAfter( CItemBase* const item );
-  /**
-  * Returns true if the given action should be enabled in the popup menu.
-  */
-  virtual const bool enableAction( const MenuAction action );
-  virtual const bool isMovable();
-
-  /**
-  * Returns the XML code which represents the content of this folder.
-  */
-  virtual QDomElement saveToXML( QDomDocument& /*document*/ ) { return QDomElement(); };
-  /**
-  * Loads the content of this folder from the XML code passed as argument to this function.
-  */
-  virtual void loadFromXML( QDomElement& /*element*/ ) {};
-  /**
-  * Returns true whether the sorting is enabled or not.
-  */
-  const bool isSortingEnabled();
-  /**
-  * This function engables or disables sorting depending on the parameter.
-  */
-  void setSortingEnabled( const bool& enableSorting );
-  /**
-  * Reimplementation which takes care of the our isSortingEnabled() setting.
-  */
-  virtual void sortChildItems( int col, bool asc );
-  /**
-  * Reimplementation which takes care of the our isSortingEnabled() setting.
-  */
-  virtual void sort();
-
-protected:
-  friend class CMainIndex;
-  virtual void dropped( QDropEvent* e );
-  /**
-  * Reimplementation. Returns true if the auto opening of this folder is allowd
-  * The default return value is "false"
-  */
-  virtual const bool allowAutoOpen( const QMimeSource* src ) const;
-  
-private:
-  Type m_type;
-  bool m_sortingEnabled;
-};
-
-class CModuleItem : public CItemBase {
-public:
-	CModuleItem(CTreeFolder* item, CSwordModuleInfo* module);
-	virtual ~CModuleItem();
-  virtual CSwordModuleInfo* const module() const;
-  virtual const QString toolTip();
-
-  /**
-  * Reimplementation from  CItemBase.
-  */
-  virtual const bool enableAction( const MenuAction action );
-  virtual void update();
-  virtual void init();
-  /**
-  * Returns the about module info of the used module.
-  */
-  const QString aboutInfo();
-
-protected: // Protected methods
-  /**
-  * Reimplementation to handle text drops on a module.
-  * In this case open the searchdialog. In the case of a referebnce open the module at the given position.
-  */
-  virtual bool acceptDrop( const QMimeSource* src ) const;
-  virtual void dropped( QDropEvent* e );
-
-private:
-  CSwordModuleInfo* m_module;
-};
-
-class CBookmarkItem : public CItemBase {
-public:
-	CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description);
-	CBookmarkItem(CFolderBase* parentItem, QDomElement& xml);
-	~CBookmarkItem();
-  CSwordModuleInfo* const module();
-  const QString key();
-  const QString& description();
-  virtual const QString toolTip();
-
-  virtual void update();
-  virtual void init();
-  virtual const bool isMovable();
-  /**
-  * Reimplementation to handle  the menu entries of the main index.
-  */
-  virtual const bool enableAction(const MenuAction action);
-  /**
-  * Prints this bookmark.
-  */
-  void print();
-  /**
-  * Changes this bookmark.
-  */
-  void rename();
-  /**
-  * Reimplementation of CItemBase::saveToXML.
-  */
-  virtual QDomElement saveToXML( QDomDocument& document );
-  /**
-  * Loads the content of this folder from the XML code passed as argument to this function.
-  */
-  virtual void loadFromXML( QDomElement& element );
-
-private:
-  QString m_key;
-  QString m_description;
-  QString m_moduleName;
-
-  QDomElement m_startupXML;
-
-private: // Private methods
-  /**
-  * Returns the english key.
-  * Only used internal of this class implementation.
-  */
-  const QString& englishKey();
-protected: // Protected methods
-  /**
-  * Reimplementation. Returns false everytime
-  * because a bookmarks 
-  * has not possible drops.
-  */
-  virtual bool acceptDrop(const QMimeSource * src);
-  /**
-  * Compares this item to another one. Used for sorting.
-  */
-//  virtual int compare( QListViewItem*, int col, bool ascending) const;
-};
-
-
-class CFolderBase : public CItemBase {
-public:
-  CFolderBase(CMainIndex* mainIndex, const Type type);
-  CFolderBase(CFolderBase* parentFolder, const Type type);
-  CFolderBase(CFolderBase* parentFolder, const QString& caption);
-  virtual ~CFolderBase();
-
-  virtual const bool isFolder();
-
-  virtual void update();
-  virtual void init();
-  virtual void setOpen( bool open );
-  /**
-  * The function which renames this folder.
-  */
-  void rename();
-  virtual void newSubFolder();
-
-protected:
-  /**
-  * Reimplementation. Returns true if the auto opening of this folder is allowd
-  */
-  virtual const bool allowAutoOpen( const QMimeSource* src ) const;  
-  /** Reimplementation. Returns false because folders have no use for drops (except for the bookmark folders) */
-  bool acceptDrop(const QMimeSource * src);
-};
-
-/** The base class for all items in the tree. Subclasses for module folders, modules and bookmarks exist.
-  * @author The BibleTime team
-  */
-class CTreeFolder : public CFolderBase {
-public: 
-	CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language );
-	CTreeFolder(CFolderBase* parentFolder, const Type type, const QString& language );
-	~CTreeFolder();
-  virtual void addGroup(const Type type, const QString language);
-  virtual void addModule(CSwordModuleInfo* const);
-  virtual void addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description);
-
-  virtual void initTree();
-
-  virtual void update();
-  virtual void init();
-
- virtual const QString& language() const;
-
-private:
-  QString m_language;
-};
-
-class CGlossaryFolder : public CTreeFolder {
-public:
-	CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage );
-	CGlossaryFolder(CFolderBase* parentFolder, const Type type, const QString& fromLanguage, const QString& toLanguage );
-	~CGlossaryFolder();
-  
-  virtual void initTree();
-  virtual void init();
-  virtual void addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage);
-  /**
-  * Returns the language this glossary folder maps from.
-  */
-  const QString& fromLanguage() const;
-  /**
-  * Returns the language this glossary folder maps from.
-  */
-  const QString& toLanguage() const;
-
-private:
-  QString m_fromLanguage;
-  QString m_toLanguage;  
-};
-
-class CBookmarkFolder : public CTreeFolder {
-public:
-	CBookmarkFolder(CMainIndex* mainIndex, const Type type = BookmarkFolder);
-	CBookmarkFolder(CFolderBase* parentItem, const Type type = BookmarkFolder);
-	virtual ~CBookmarkFolder();
-  virtual const bool enableAction(const MenuAction action);
-  virtual void exportBookmarks();
-  virtual void importBookmarks();
-  virtual bool acceptDrop(const QMimeSource * src) const;
-  virtual void dropped(QDropEvent *e);
-
-  /**
-  * Loads bookmarks from XML content
-  */
-  const bool loadBookmarksFromXML( const QString& xml );
-  /**
-  * Loads bookmarks from a file.
-  */
-  const bool loadBookmarks( const QString& );
-  /**
-  * Saves the bookmarks in a file.
-  */
-  const bool saveBookmarks( const QString& filename, const bool& forceOverwrite = true );
-
-protected: // Protected methods
-  virtual void initTree();
-};
-
-
-namespace Bookmarks {
-  class OldBookmarksFolder : public CBookmarkFolder {
-  public:
-  	OldBookmarksFolder(CTreeFolder* item);
-  	virtual ~OldBookmarksFolder();
-    virtual void initTree();
-    /**
-    * Returns the XML code which represents the content of this folder.
-    */
-    virtual QDomElement saveToXML( QDomDocument& document );
-    /**
-    * Loads the content of this folder from the XML code passed as argument to this function.
-    */
-    virtual void loadFromXML( QDomElement& element );
-  };
-
-  class OldBookmarkImport {
-  public:
-    /**
-    * This function converts the old config based bookmarks into a valid 1.3 XML file, so importing is easy
-    */
-    static const QString oldBookmarksXML( const QString& configFileName = QString::null );
-  private:
-  // made provate because we offer one static functions which doesn't need constructor and destructor
-    OldBookmarkImport();
-    ~OldBookmarkImport();    
-  };
-      
-  class SubFolder : public CBookmarkFolder {
-  public:
-    SubFolder(CFolderBase* parentItem, const QString& caption);
-    SubFolder(CFolderBase* parentItem, QDomElement& xml);
-    virtual ~SubFolder();
-    virtual void init();
-    /**
-    * Reimplementation from  CItemBase.
-    */
-    const bool enableAction(const MenuAction action);
-    /**
-    * Returns the XML code which represents the content of this folder.
-    */
-    virtual QDomElement saveToXML( QDomDocument& document );
-    /**
-    * Loads the content of this folder from the XML code passed as argument to this function.
-    */
-    virtual void loadFromXML( QDomElement& element );
-
-  private:
-    QDomElement m_startupXML;
-  };
-};
-  
-#endif
diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
deleted file mode 100644
index fe7279a..0000000
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ /dev/null
@@ -1,634 +0,0 @@
-/***************************************************************************
-                          cmainindex.cpp  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cmainindex.h"
-#include "cindexitem.h"
-
-#include "backend/creferencemanager.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "frontend/searchdialog/csearchdialog.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cdragdropmgr.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qheader.h>
-#include <qwhatsthis.h>
-#include <qlistview.h>
-#include <qdragobject.h>
-#include <qinputdialog.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kpopupmenu.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
-
-CMainIndex::ToolTip::ToolTip(QWidget* parent) : CToolTip(parent) {
-}
-
-void CMainIndex::ToolTip::maybeTip(const QPoint& p) {
-	if (!parentWidget()->inherits("CMainIndex"))
-		return;
-	
-	CMainIndex* m = 0;
-	if ( !(m = dynamic_cast<CMainIndex*>(parentWidget())) )
-		return;	
-
-  CItemBase* i = 0;
-	if ( !( i = dynamic_cast<CItemBase*>(m->itemAt(p))) )
-		return;
-	
-	QRect r = m->itemRect(i);
-	if (!r.isValid()) {
-		return;
-  }
-	
-	//get type of item and display correct text
-	const QString text = i->toolTip();
-	if (!text.isEmpty()) {
-    	QPoint globalPoint = m->viewport()->mapTo(m, p);
-		tip(globalPoint, r, text);
-	}
-}
-
-/*new class : CMainIndex*/
-CMainIndex::CMainIndex(QWidget *parent) : KListView(parent),
-  m_searchDialog(0), m_toolTip(0), m_itemsMovable(false), m_autoOpenFolder(0), m_autoOpenTimer(this)
-{
-  initView();
-  initConnections();
-}
-
-CMainIndex::~CMainIndex(){
-  saveBookmarks();
-}
-
-/** Reimplementation. Adds the given group to the tree. */
-void CMainIndex::addGroup(const CItemBase::Type type, const QString language){
-  CTreeFolder *i = 0;
-  switch (type) {
-    case CItemBase::BookmarkFolder:
-      i = new CBookmarkFolder(this);
-      break;
-    case CItemBase::GlossaryModuleFolder:
-      i = new CGlossaryFolder(this, type, language, QString::null); //we have no second language
-      break;
-    default:
-      i = new CTreeFolder(this, type, language);
-      break;     
-  }
-  if (i) {
-    i->init();
-    if (i->childCount() == 0 && type != CItemBase::BookmarkFolder) {
-      delete i;
-    }
-  }
-}
-
-
-/** Initializes the view. */
-void CMainIndex::initView(){
- 	addColumn(QString::null);
- 	header()->hide();
-
- 	m_toolTip = new ToolTip(this);
-	setTooltipColumn(-1);
-	setShowToolTips(false);//to disable Qt's tooltips
-
-	setBackgroundMode(PaletteBase);
-	setFullWidth(true);
-
-	setAcceptDrops( true );
-	setDragEnabled( true );
-	setDropVisualizer( true );
- 	setDropHighlighter( true );
-  setAutoOpen(true);
-	viewport()->setAcceptDrops(true);
- 	setRootIsDecorated(false);
- 	setAllColumnsShowFocus(true);
-  setItemsMovable(false);
-  setSelectionModeExt(Extended);
-
-  //setup the popup menu
-  m_popup = new KPopupMenu(viewport());
-  m_popup->insertTitle(i18n("Main index"));
-
-  m_actions.newFolder = new KAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, SLOT(createNewFolder()), this);
-  m_actions.changeFolder = new KAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, SLOT(changeFolder()), this);
-
-  m_actions.changeBookmark = new KAction(i18n("Change this bookmark"),CResMgr::mainIndex::changeBookmark::icon, 0, this, SLOT(changeBookmark()), this);
-  m_actions.importBookmarks = new KAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, SLOT(importBookmarks()), this);
-  m_actions.exportBookmarks = new KAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, SLOT(exportBookmarks()), this);
-  m_actions.printBookmarks = new KAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, SLOT(printBookmarks()), this);
-
-  m_actions.deleteEntries = new KAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, SLOT(deleteEntries()), this);
-
-  m_actions.editModuleMenu = new KActionMenu(i18n("Edit this module"),CResMgr::mainIndex::editModuleMenu::icon, this);
-  m_actions.editModulePlain = new KAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, SLOT(editModulePlain()), this);
-  m_actions.editModuleHTML = new KAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, SLOT(editModuleHTML()), this);
-
-  m_actions.searchInModules = new KAction(i18n("Search in selected module(s)"),CResMgr::mainIndex::search::icon, 0, this, SLOT(searchInModules()), this);
-  m_actions.unlockModule = new KAction(i18n("Unlock this module"),CResMgr::mainIndex::unlockModule::icon, 0, this, SLOT(unlockModule()), this);
-  m_actions.aboutModule = new KAction(i18n("About this module"),CResMgr::mainIndex::aboutModule::icon, 0, this, SLOT(aboutModule()), this);
-
-
-  m_actions.newFolder->plug(m_popup);
-  m_actions.changeFolder->plug(m_popup);
-  (new KActionSeparator(this))->plug(m_popup);
-  m_actions.changeBookmark->plug(m_popup);
-  m_actions.importBookmarks->plug(m_popup);
-  m_actions.exportBookmarks->plug(m_popup);
-  m_actions.printBookmarks->plug(m_popup);
-  (new KActionSeparator(this))->plug(m_popup);
-  m_actions.deleteEntries->plug(m_popup);
-  (new KActionSeparator(this))->plug(m_popup);
-  m_actions.editModuleMenu->plug(m_popup);
-  m_actions.editModuleMenu->insert(m_actions.editModulePlain); //sub item of edit module menu
-  m_actions.editModuleMenu->insert(m_actions.editModuleHTML);  //sub item of edit module menu
-  
-  m_actions.searchInModules->plug(m_popup);
-  m_actions.unlockModule->plug(m_popup);
-  m_actions.aboutModule->plug(m_popup);
-}
-
-/** Initialize the SIGNAL<->SLOT connections */
-void CMainIndex::initConnections(){
-  connect(this, SIGNAL(executed(QListViewItem*)),
-    SLOT(slotExecuted(QListViewItem*)));
-  connect(this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)),
-    SLOT(dropped(QDropEvent*, QListViewItem*, QListViewItem*)));
-//  connect(this, SIGNAL(moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow)),
-//    SLOT(moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow)));
-  connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-    SLOT(contextMenu(KListView*, QListViewItem*, const QPoint&)));
-  connect(&m_autoOpenTimer, SIGNAL(timeout()),
-    this, SLOT(autoOpenTimeout()));
-}
-
-/** Is called when an item was clicked/double clicked. */
-void CMainIndex::slotExecuted( QListViewItem* i ){
-  CItemBase* ci = dynamic_cast<CItemBase*>(i);
-  if (!ci)
-    return;
-
-  if (ci->isFolder()) {
-    i->setOpen(!i->isOpen());
-  }
-  else if (CModuleItem* m = dynamic_cast<CModuleItem*>(i))  { //clicked on a module
-    CSwordModuleInfo* mod = m->module();
-    ListCSwordModuleInfo modules;
-    modules.append(mod);
-    emit createReadDisplayWindow(modules, QString::null);
-  }
-  else if (CBookmarkItem* b = dynamic_cast<CBookmarkItem*>(i) ) { //clicked on a bookmark
-    if (CSwordModuleInfo* mod = b->module()) {
-      ListCSwordModuleInfo modules;
-      modules.append(mod);
-      emit createReadDisplayWindow(modules, b->key());
-    }
-  }
-}
-
-/** Reimplementation. Returns the drag object for the current selection. */
-QDragObject* CMainIndex::dragObject() {
-  if (!m_itemsMovable) {
-    return false;
-  };
-  
-  CDragDropMgr::ItemList dndItems;
-  
-  QPtrList<QListViewItem> items = selectedItems();
-  for (items.first(); items.current(); items.next()) {
-    if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) {
-      //we can move this item!
-      if (!i->isMovable()) { //we can only drag items which allow us to do it, e.g. which are movable
-        continue;
-      };
-
-      if (CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>( items.current() )) {
-        //take care of bookmarks which have no valid module any more, e.g. if it was uninstalled
-        const QString moduleName = bookmark->module() ? bookmark->module()->name() : QString::null;
-        dndItems.append( CDragDropMgr::Item(moduleName, bookmark->key(), bookmark->description()) );
-      }
-    }
-  }
-
-  return CDragDropMgr::dragObject( dndItems, viewport() );
-}
-
-/** Reimplementation from KListView. Returns true if the drag is acceptable for the listview. */
-bool CMainIndex::acceptDrag( QDropEvent* event ) const {
-//  qWarning("CMainIndex::acceptDrag( QDropEvent* event )");
-
-  const QPoint pos = contentsToViewport(event->pos());
-  if (CItemBase* i = dynamic_cast<CItemBase*>(itemAt(pos))) {
-    return i->acceptDrop(event);
-  }
-  return false;
-}
-
-/** No descriptions */
-void CMainIndex::initTree(){
-  addGroup(CItemBase::BookmarkFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::BibleModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::BookModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::CommentaryModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::DevotionalModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::GlossaryModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::LexiconModuleFolder, QString::fromLatin1("*"));
-}
-
-/** No descriptions */
-void CMainIndex::dropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after){
-//  qWarning("CMainIndex::dropped");
-   Q_ASSERT(after);
-   Q_ASSERT(parent);
-
- 	if (after)
- 		qWarning("DROP AFTER %s", after->text(0).latin1());
- 	if (parent)
- 		qWarning("DROP parent %s", parent->text(0).latin1());
-
-  //the drop was started in this main index widget
-  if (m_itemsMovable && e->source() == viewport()) {
-    /*
-    * If the drag was started from the main index and should move items and if the destination is the bookmark
-    * folder or one of its subfolders
-    * we remove the current items because the new ones will be inserted soon.
-    */
-    if (dynamic_cast<CBookmarkFolder*>(parent) || dynamic_cast<Bookmarks::SubFolder*>(parent)) { //we drop onto the bookmark folder or one of it's subfolders
-      QPtrList<QListViewItem> items = selectedItems();
-      items.setAutoDelete(true);
-      items.clear(); //delete the selected items we dragged
-    };
-  };
-
-  //finally do the drop, either with external drop data or with the moved items' data
-	CItemBase* parentItem = dynamic_cast<CItemBase*>(parent);
-	CItemBase* afterItem = dynamic_cast<CItemBase*>(after);
-	if (afterItem && afterItem->isFolder()) {
-			afterItem->setOpen(true);
-			afterItem->dropped(e);
-	}
-	else if (afterItem && !afterItem->isFolder() && parentItem) {
-			parentItem->setOpen(true);
-			parentItem->dropped(e);
-	}
-	else if (parentItem) {
-			parentItem->setOpen(true);
-			parentItem->dropped(e);
-	}
-}
-
-/** No descriptions */
-void CMainIndex::emitModulesChosen( ListCSwordModuleInfo modules, QString key ){
-  emit createReadDisplayWindow(modules, key);
-}
-
-/** Returns the correct KAction object for the given type of action. */
-KAction* const CMainIndex::action( const CItemBase::MenuAction type ) const {
-  switch (type) {
-    case CItemBase::NewFolder:
-      return m_actions.newFolder;
-    case CItemBase::ChangeFolder:
-      return m_actions.changeFolder;
-
-    case CItemBase::ChangeBookmark:
-      return m_actions.changeBookmark;
-    case CItemBase::ImportBookmarks:
-      return m_actions.importBookmarks;
-    case CItemBase::ExportBookmarks:
-      return m_actions.exportBookmarks;
-    case CItemBase::PrintBookmarks:
-      return m_actions.printBookmarks;
-
-    case CItemBase::DeleteEntries:
-      return m_actions.deleteEntries;
-      
-    case CItemBase::EditModule:
-      return m_actions.editModuleMenu;
-    case CItemBase::SearchInModules:
-      return m_actions.searchInModules;
-    case CItemBase::UnlockModule:
-      return m_actions.unlockModule;
-    case CItemBase::AboutModule:
-      return m_actions.aboutModule;
-    default:
-      return 0;
-  };
-}
-
-/** Shows the context menu at the given position. */
-void CMainIndex::contextMenu(KListView* /*list*/, QListViewItem* i, const QPoint& p){
-  //setup menu entries depending on current selection
-  QPtrList<QListViewItem> items = selectedItems();
-
-  if (items.count() == 0) { //special handling for no selection
-
-  }
-  else if (items.count() == 1) { //special handling for one selected item
-    CItemBase* item = dynamic_cast<CItemBase*>(i);
-    CItemBase::MenuAction actionType;
-    for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
-      actionType = static_cast<CItemBase::MenuAction>(index);
-      if (KAction* a = action(actionType))
-        a->setEnabled( item->enableAction(actionType) );
-    }
-  }
-  else {
-    //first disable all actions
-    CItemBase::MenuAction actionType;
-    for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
-      actionType = static_cast<CItemBase::MenuAction>(index);
-      if (KAction* a = action(actionType))
-        a->setEnabled(false);
-    }
-
-    for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
-      actionType = static_cast<CItemBase::MenuAction>(index);
-      bool enableAction = isMultiAction(actionType);
-      for (items.first(); items.current(); items.next()) {
-        CItemBase* i = dynamic_cast<CItemBase*>(items.current());
-        enableAction = enableAction && i->enableAction(actionType);
-      }
-      if (enableAction) {
-        KAction* a = action(actionType) ;
-        if (i && a)
-          a->setEnabled(enableAction);
-      }
-    }
-  }
-  m_popup->exec(p);
-}
-
-/** Adds a new subfolder to the current item. */
-void CMainIndex::createNewFolder(){
-  if (CFolderBase* i = dynamic_cast<CFolderBase*>(currentItem()) ) {
-    i->newSubFolder();
-  }
-}
-
-/** Opens a dialog to change the current folder. */
-void CMainIndex::changeFolder(){
-  if (CFolderBase* i = dynamic_cast<CFolderBase*>(currentItem()) ) {
-    i->rename();
-  }
-}
-
-/** Changes the current bookmark. */
-void CMainIndex::changeBookmark(){
-  if (CBookmarkItem* i = dynamic_cast<CBookmarkItem*>(currentItem()) ) {
-    i->rename();
-  }
-}
-
-/** Exports the bookmarks being in the selected folder. */
-void CMainIndex::exportBookmarks(){
-  if (CBookmarkFolder* i = dynamic_cast<CBookmarkFolder*>(currentItem()) ) {
-    i->exportBookmarks();
-  }
-}
-
-/** Import bookmarks from a file and add them to the selected folder. */
-void CMainIndex::importBookmarks(){
-  if (CBookmarkFolder* i = dynamic_cast<CBookmarkFolder*>(currentItem()) ) {
-    i->importBookmarks();
-  }
-}
-
-/** Prints the selected bookmarks. */
-void CMainIndex::printBookmarks(){
-  QPtrList<QListViewItem> items = selectedItems();
-  for (items.first(); items.current(); items.next()) {
-    if (CBookmarkItem* i = dynamic_cast<CBookmarkItem*>(items.current())) {
-      i->print();
-    }
-  }
-}
-
-/** Deletes the selected entries. */
-void CMainIndex::deleteEntries() {
-  QPtrList<QListViewItem> items = selectedItems();
-	if (!items.count())
-		return;
-
-	if (KMessageBox::warningYesNo(this, i18n("Do you really want to delete the selected items and child-items?"), i18n("Delete Items")) != KMessageBox::Yes) {
-		return;
-	}
-
-// We have to go backwards because otherwise deleting folders would delete their childs => crash
-  for (items.last(); items.current(); items.prev()) {
-    if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) {
-      if (i->enableAction(CItemBase::DeleteEntries)) {
-        delete i;
-      }
-    }
-  }
-}
-
-/** Opens the searchdialog for the selected modules. */
-void CMainIndex::searchInModules(){
-  QPtrList<QListViewItem> items = selectedItems();
-  ListCSwordModuleInfo modules;
-  for (items.first(); items.current(); items.next()) {
-    if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) {
-      if (i->module())
-        modules.append(i->module());
-    }
-  }
-
-  if (modules.isEmpty()) { //get a list of useful default modules for the search if no modules were selected
-    CSwordModuleInfo* m = CPointers::backend()->findModuleByDescription( CBTConfig::get(CBTConfig::standardBible ));
-    if (m)
-      modules.append(m);
-  }
-
-  CSearchDialog::openDialog(modules, QString::null);
-}
-
-/** Unlocks the current module. */
-void CMainIndex::unlockModule(){
-  if (CModuleItem* i = dynamic_cast<CModuleItem*>(currentItem())) {
-  	bool ok;
-  	QString unlockKey = QInputDialog::getText(i18n("BibleTime - Unlock module"),i18n("Enter the unlock key for this module."),QLineEdit::Normal, i->module()->config(CSwordModuleInfo::CipherKey), &ok);
-  	if (ok) {
-  		/*const bool ret =*/ i->module()->unlock( unlockKey );
-//  		if ( !ret ) { // an error occured
-//
-//  		}
-  	}
-  }
-}
-
-/** Shows information about the current module. */
-void CMainIndex::aboutModule(){
-  if (CModuleItem* i = dynamic_cast<CModuleItem*>(currentItem())) {
-  	KMessageBox::about(this, i->aboutInfo(), i->module()->config(CSwordModuleInfo::Description), false);
-  }
-}
-
-/** Reimplementation. Takes care of movable items. */
-void CMainIndex::startDrag(){
-  QPtrList<QListViewItem> items = selectedItems();
-  m_itemsMovable = true;
-  for (items.first(); items.current() && m_itemsMovable; items.next()) {
-    if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) {
-      m_itemsMovable = m_itemsMovable && i->isMovable();
-    }
-    else {
-      m_itemsMovable = false;
-    }
-  }
-  KListView::startDrag();
-}
-
-/** Reimplementation to support the items dragEnter and dragLeave functions. */
-void CMainIndex::contentsDragMoveEvent( QDragMoveEvent* event ){
-//  qWarning("void CMainIndex:: drag move event ( QDragLeaveEvent* e )");
-  if ( CItemBase* i = dynamic_cast<CItemBase*>( itemAt( contentsToViewport(event->pos())) )) {
-  	if (i->allowAutoOpen(event) || (i->acceptDrop(event) && i->isFolder() && i->allowAutoOpen(event) && !i->isOpen() && autoOpen()) ) {
-//       qWarning("autoopen: %s", i->text(0).latin1());
-      if (m_autoOpenFolder != i)  {
-        m_autoOpenTimer.stop();
-      }
-      m_autoOpenFolder = i;
-      m_autoOpenTimer.start( 400, true );
-    }
-    else {
-      m_autoOpenFolder = 0;
-    }
-  }
-  else {
-    m_autoOpenFolder = 0;
-  }
-  
-  KListView::contentsDragMoveEvent(event);
-}
-
-void CMainIndex::autoOpenTimeout(){
-  m_autoOpenTimer.stop();
-  if (m_autoOpenFolder && !m_autoOpenFolder->isOpen() && m_autoOpenFolder->childCount()) {
-    m_autoOpenFolder->setOpen(true);
-  }
-}
-
-/** No descriptions */
-void CMainIndex::contentsDragLeaveEvent( QDragLeaveEvent* e ){
-//  qWarning("void CMainIndex::contentsDragLeaveEvent( QDragLeaveEvent* e )");
-  m_autoOpenTimer.stop();
-  KListView::contentsDragLeaveEvent(e);
-}
-
-/** Returns true if more than one netry is supported by this action type. Returns false for actions which support only one entry, e.g. about module etc. */
-const bool CMainIndex::isMultiAction( const CItemBase::MenuAction type ) const {
-  switch (type) {
-    case CItemBase::NewFolder:
-      return false;
-    case CItemBase::ChangeFolder:
-      return false;
-
-    case CItemBase::ChangeBookmark:
-      return false;
-    case CItemBase::ImportBookmarks:
-      return false;
-    case CItemBase::ExportBookmarks:
-      return false;
-    case CItemBase::PrintBookmarks:
-      return true;
-
-    case CItemBase::DeleteEntries:
-      return true;
-
-    case CItemBase::EditModule:
-      return false;
-    case CItemBase::SearchInModules:
-      return true;
-    case CItemBase::UnlockModule:
-      return false;
-    case CItemBase::AboutModule:
-      return false;
-  }
-  return false;
-}
-
-/** Is called when items should be moved. */
-void CMainIndex::moved( QPtrList<QListViewItem>& /*items*/, QPtrList<QListViewItem>& /*afterFirst*/, QPtrList<QListViewItem>& /*afterNow*/){
-}
-
-/** Opens an editor window to edit the modules content. */
-void CMainIndex::editModulePlain(){
-  QPtrList<QListViewItem> items = selectedItems();
-  ListCSwordModuleInfo modules;
-  for (items.first(); items.current(); items.next()) {
-    if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) {
-      modules.append(i->module());
-    }
-  }
-  if (modules.count() == 1) {
-    emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::PlainTextWindow);
-  };
-}
-
-/** Opens an editor window to edit the modules content. */
-void CMainIndex::editModuleHTML(){
-  QPtrList<QListViewItem> items = selectedItems();
-  ListCSwordModuleInfo modules;
-  for (items.first(); items.current(); items.next()) {
-    if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) {
-      modules.append(i->module());
-    }
-  }
-  if (modules.count() == 1) {
-    emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::HTMLWindow);
-  };
-}
-
-/** Reloads the main index's Sword dependend things like modules */
-void CMainIndex::reloadSword(){
-  //reload the modules
-//  saveBookmarks();
-  clear();
-  initTree();  
-}
-
-/** Saves the bookmarks to disk */
-void CMainIndex::saveBookmarks(){
-  //find the bookmark folder
-//  qWarning("void CMainIndex::saveBookmarks(){");
-  CItemBase* i = 0;
-  QListViewItemIterator it( this );
-  while ( it.current() != 0 ) {
-    i = dynamic_cast<CItemBase*>( it.current() );
-    if (i && i->type() == CItemBase::BookmarkFolder) { //found the bookmark folder
-      KStandardDirs stdDirs;
-    	const QString path = stdDirs.saveLocation("data", "bibletime/");
-      if (!path.isEmpty()) {
-        //save the bookmarks to the right file
-        if (CBookmarkFolder* f = dynamic_cast<CBookmarkFolder*>(i)) {
-          f->saveBookmarks( path + "bookmarks.xml" );
-        }
-      }
-      break;
-    }
-    ++it;
-  }
-}
diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h
deleted file mode 100644
index 7a337a7..0000000
--- a/bibletime/frontend/mainindex/cmainindex.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/***************************************************************************
-                          cmainindex.h  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMAININDEX_H
-#define CMAININDEX_H
-
-//BibleTime includes
-#include "cindexitem.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/ctooltip.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kaction.h>
-#include <klistview.h>
-
-/** The class which manages all bookmarks and modules. The modules are put into own, fixed subfolders sorted by language.
-  * @author The BibleTime team
-  */
-
-class CSearchDialog;
-
-class CMainIndex : public KListView {
-  Q_OBJECT
-	
-  class ToolTip : public CToolTip {
-	public:
-		ToolTip(QWidget* parent);
-		/**
-		* Displays a tooltip for position p using the getToolTip() function of CGroupManagerItem
-		*/		
-		virtual void maybeTip( const QPoint &pos);
-	};
-
-public:
-	CMainIndex(QWidget *parent);
-	virtual ~CMainIndex();
-  void initTree();
-  /**
-  * Opens the searchdialog using the given modules using the given search text.
-  */
-  void emitModulesChosen( ListCSwordModuleInfo modules, QString key );
-  /** Saves the bookmarks to disk */
-  void saveBookmarks();
-  /** Reloads the main index's Sword dependend things like modules */
-  void reloadSword();
-
-protected: // Protected methods
-  /**
-  * Reimplementation. Adds the given group to the tree.
-  */
-  virtual void addGroup( const CItemBase::Type type, const QString language);
-  /**
-  * Initialize the SIGNAL<->SLOT connections
-  */
-  void initConnections();
-  /**
-  * Reimplementation. Returns the drag object for the current selection.
-  */
-  virtual QDragObject* dragObject();
-  /**
-  * Reimplementation from KListView. Returns true if the drag is acceptable for the listview.
-  */
-  virtual bool acceptDrag( QDropEvent* event ) const;
-  /**
-  * Returns the correct KAction object for the given type of action.
-  */
-  KAction* const action( const CItemBase::MenuAction type ) const;
-  /**
-  * Reimplementation. Takes care of movable items.
-  */
-  virtual void startDrag();
-  /**
-  * Reimplementation to support the items dragEnter and dragLeave functions.
-  */
-  virtual void contentsDragMoveEvent( QDragMoveEvent* event );
-  virtual void contentsDragLeaveEvent( QDragLeaveEvent* e );
-
-public slots:
-  /**
-   * Opens the searchdialog for the selected modules.
-   */
-  void searchInModules();
-
-protected slots: // Protected slots
-  /**
-  * Is called when an item was clicked/double clicked.
-  */
-  void slotExecuted( QListViewItem* );
-  void dropped( QDropEvent*, QListViewItem*, QListViewItem*);
-  /**
-  * Shows the context menu at the given position.
-  */
-  void contextMenu(KListView*, QListViewItem*, const QPoint&);
-  /**
-  * Adds a new subfolder to the current item.
-  */
-  void createNewFolder();
-  /**
-  * Opens a dialog to change the current folder.
-  */
-  void changeFolder();
-  /**
-  * Exports the bookmarks being in the selected folder.
-  */
-  void exportBookmarks();
-  /**
-  * Changes the current bookmark.
-  */
-  void changeBookmark();
-  /**
-  * Import bookmarks from a file and add them to the selected folder.
-  */
-  void importBookmarks();  
-  /**
-  * Deletes the selected entries.
-  */
-  void deleteEntries();
-  /**
-  * Prints the selected bookmarks.
-  */
-  void printBookmarks();
-  /**
-  * Shows information about the current module.
-  */
-  void aboutModule();
-  /**
-  * Unlocks the current module.
-  */
-  void unlockModule();
-  void autoOpenTimeout();
-  /**
-  * Is called when items should be moved.
-  */
-  void moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow);
-  /**
-  * Opens a plain text editor window to edit the modules content.
-  */
-  void editModulePlain();
-  /**
-  * Opens an HTML editor window to edit the modules content.
-  */
-  void editModuleHTML();
-
-private: // Private methods
-  CSearchDialog* m_searchDialog;
-  ToolTip* m_toolTip;
-  bool m_itemsMovable;
-  QListViewItem* m_autoOpenFolder;
-  QTimer m_autoOpenTimer;
-
-  /**
-  * Initializes the view.
-  */
-  void initView();
-  /**
-  * Returns true if more than one netry is supported by this action type.
-  * Returns false for actions which support only one entry, e.g. about module etc.
-  */
-  const bool isMultiAction( const CItemBase::MenuAction type ) const;
-
-  struct Actions {
-    KAction* newFolder;
-    KAction* changeFolder;
-
-    KAction* changeBookmark;
-    KAction* importBookmarks;
-    KAction* exportBookmarks;
-    KAction* printBookmarks;
-
-    KAction* deleteEntries;
-
-    KActionMenu* editModuleMenu;
-    KAction* editModulePlain;
-    KAction* editModuleHTML;
-    
-    KAction* searchInModules;
-    KAction* unlockModule;
-    KAction* aboutModule;
-  } m_actions;
-  KPopupMenu* m_popup;
-
-signals: // Signals
-  /**
-  * Is emitted when a module should be opened,
-  */
-  void createReadDisplayWindow( ListCSwordModuleInfo, const QString& );
-  void createWriteDisplayWindow( CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType& );  
-};
-
-#endif
diff --git a/bibletime/frontend/searchdialog/Makefile.am b/bibletime/frontend/searchdialog/Makefile.am
deleted file mode 100644
index 24541be..0000000
--- a/bibletime/frontend/searchdialog/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES = $(all_includes)
-
-libsearchdialog_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libsearchdialog.a
-
-libsearchdialog_a_SOURCES = \
-csearchdialog.cpp \
-csearchdialogpages.cpp
-
-all_headers = \
-csearchdialog.h \
-csearchdialogpages.h
-
-EXTRA_DIST = $(libsearchdialog_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/searchdialog/Makefile.in b/bibletime/frontend/searchdialog/Makefile.in
deleted file mode 100644
index 0def193..0000000
--- a/bibletime/frontend/searchdialog/Makefile.in
+++ /dev/null
@@ -1,696 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libsearchdialog_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libsearchdialog.a
-
-libsearchdialog_a_SOURCES = \
-csearchdialog.cpp \
-csearchdialogpages.cpp
-
-
-all_headers = \
-csearchdialog.h \
-csearchdialogpages.h
-
-
-EXTRA_DIST = $(libsearchdialog_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/searchdialog
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libsearchdialog_a_AR = $(AR) cru
-libsearchdialog_a_LIBADD =
-am_libsearchdialog_a_OBJECTS = csearchdialog.$(OBJEXT) \
-	csearchdialogpages.$(OBJEXT)
-#>- libsearchdialog_a_OBJECTS = $(am_libsearchdialog_a_OBJECTS)
-#>+ 6
-libsearchdialog_a_final_OBJECTS = libsearchdialog_a.all_cpp.o 
-libsearchdialog_a_nofinal_OBJECTS = csearchdialog.$(OBJEXT) \
-	csearchdialogpages.$(OBJEXT)\
-csearchdialogpages.moc.o csearchdialog.moc.o 
-@KDE_USE_FINAL_FALSE@libsearchdialog_a_OBJECTS = $(libsearchdialog_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libsearchdialog_a_OBJECTS = $(libsearchdialog_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/csearchdialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/csearchdialogpages.Po
-#>+ 4
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/csearchdialogpages.moc.P $(DEPDIR)/csearchdialog.moc.P  $(DEPDIR)/libsearchdialog_a.all_cpp.P ./$(DEPDIR)/csearchdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/csearchdialogpages.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/csearchdialogpages.moc.P $(DEPDIR)/csearchdialog.moc.P ./$(DEPDIR)/csearchdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/csearchdialogpages.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libsearchdialog_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libsearchdialog_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/searchdialog/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/searchdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/searchdialog/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libsearchdialog.a: $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_DEPENDENCIES) 
-	-rm -f libsearchdialog.a
-	$(libsearchdialog_a_AR) libsearchdialog.a $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_LIBADD)
-	$(RANLIB) libsearchdialog.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchdialogpages.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-csearchdialogpages.moc.cpp: $(srcdir)/csearchdialogpages.h
-	$(MOC) $(srcdir)/csearchdialogpages.h -o csearchdialogpages.moc.cpp
-
-#>+ 2
-mocs: csearchdialogpages.moc.cpp
-
-#>+ 3
-csearchdialog.moc.cpp: $(srcdir)/csearchdialog.h
-	$(MOC) $(srcdir)/csearchdialog.h -o csearchdialog.moc.cpp
-
-#>+ 2
-mocs: csearchdialog.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  csearchdialogpages.moc.cpp csearchdialog.moc.cpp
-
-#>+ 2
-KDE_DIST=csearchdialog.h csearchdialogpages.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/searchdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/searchdialog/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libsearchdialog_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/csearchdialog.cpp $(srcdir)/csearchdialogpages.cpp csearchdialogpages.moc.cpp csearchdialog.moc.cpp 
-	@echo 'creating libsearchdialog_a.all_cpp.cpp ...'; \
-	rm -f libsearchdialog_a.all_cpp.files libsearchdialog_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libsearchdialog_a.all_cpp.final; \
-	for file in csearchdialog.cpp csearchdialogpages.cpp csearchdialogpages.moc.cpp csearchdialog.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libsearchdialog_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsearchdialog_a.all_cpp.final; \
-	done; \
-	cat libsearchdialog_a.all_cpp.final libsearchdialog_a.all_cpp.files > libsearchdialog_a.all_cpp.cpp; \
-	rm -f libsearchdialog_a.all_cpp.final libsearchdialog_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libsearchdialog_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp
deleted file mode 100644
index 7be6b1a..0000000
--- a/bibletime/frontend/searchdialog/csearchdialog.cpp
+++ /dev/null
@@ -1,1248 +0,0 @@
-/***************************************************************************
-                          csearchdialog.cpp  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "csearchdialog.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-
-//Qt includes
-#include <qhbox.h>
-#include <qptrlist.h>
-#include <qpainter.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qmap.h>
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qlabel.h>
-#include <qsizepolicy.h>
-#include <qpushbutton.h>
-#include <qheader.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <kiconloader.h>
-
-const int SPACE_BETWEEN_PARTS = 5;
-const int RIGHT_BORDER = 15;
-const int LEFT_BORDER = 15;
-const int LOWER_BORDER = 10;
-const int UPPER_BORDER = 10;
-
-const int ITEM_TEXT_SIZE = 8;
-const int LABEL_TEXT_SIZE = 6;
-
-//used for the shift between the bars
-const int BAR_DELTAX = 4;
-const int BAR_DELTAY = 2;
-const int BAR_WIDTH  = 2 + (2*BAR_DELTAX);  //should be equal or bigger than the label font size
-// Used for the text below the bars
-const int BAR_LOWER_BORDER = 100;
-
-const int LEGEND_INNER_BORDER = 5;
-const int LEGEND_DELTAY = 4;
-const int LEGEND_WIDTH = 85;
-
-static CSearchDialog* m_staticDialog = 0;
-
-void CSearchDialog::openDialog(const ListCSwordModuleInfo modules, const QString& searchText, QWidget* parentDialog) {
-  if (!m_staticDialog) {
-    m_staticDialog = new CSearchDialog(parentDialog);
-  };
-  m_staticDialog->reset();
-
-  if (modules.count()) {
-    m_staticDialog->setModules(modules);
-  } else {
-    m_staticDialog->showModulesSelector();
-  }
-
-  m_staticDialog->setSearchText(searchText);
-  if (m_staticDialog->isHidden()) {
-    m_staticDialog->show();
-  }
-  
-  m_staticDialog->raise();
-  if (modules.count() && !searchText.isEmpty()) {
-    m_staticDialog->startSearch();
-  }
-};
-
-CSearchDialog* const CSearchDialog::getSearchDialog() {
-  Q_ASSERT(m_staticDialog);
-  return m_staticDialog;
-};
-
-CSearchDialog::CSearchDialog(QWidget *parent)
-  : KDialogBase(Tabbed, i18n("Search dialog"), Close | User1 | User2, User1, parent, "CSearchDialog", false, true, i18n("Search"), i18n("Interrupt")) {
-
-	setIcon(CResMgr::searchdialog::icon);
-	m_searcher.connectPercentUpdate(this, SLOT(percentUpdate()));
-	m_searcher.connectFinished(this, SLOT(searchFinished()));
-
-  initView();
-  initConnections();
-}
-
-CSearchDialog::~CSearchDialog(){
-}
-
-/** Reimplemented to show the First time searchdialog page. */
-void CSearchDialog::show(){
-  KDialogBase::show();
-
-//  if (CBTConfig::get(CBTConfig::firstSearchDialog)) { //is this the first time we show the dialog?
-//    CHTMLDialog dlg(CResMgr::helpDialog::firstTimeSearchDialog);
-//    dlg.exec();
-//    CBTConfig::set(CBTConfig::firstSearchDialog, false);
-//  };  
-}
-
-/** Starts the search with the set modules and the set search text. */
-void CSearchDialog::startSearch(){
-  QString searchText(m_searchOptionsPage->searchText());
-
-  if (searchText.isEmpty()) return;
-
-  m_searchResultPage->reset();
-  enableButton(User1,false);
-  enableButton(User2,true);
-  m_interruptedSearch = false;
-
-  int searchFlags = m_searchOptionsPage->searchFlags();	
-  m_searchOptionsPage->prepareSearch();
-
-  const CSwordModuleSearch::scopeType scopeType = m_searchOptionsPage->scopeType();
-  if (scopeType == CSwordModuleSearch::Scope_LastSearch) {
-    searchFlags |= CSwordModuleSearch::useLastResult;
-  } else if ( (scopeType == CSwordModuleSearch::Scope_Bounds) && strlen(m_searchOptionsPage->searchScope().getRangeText()) ) {
-    //we need the scope flag and a valid scope!
-    searchFlags |= CSwordModuleSearch::useScope;
-    m_searcher.setSearchScope( m_searchOptionsPage->searchScope() );
-  }  
-  
-  m_searcher.setModules( modules() );
-  m_searcher.setSearchedText(searchText);
-  m_searcher.setSearchOptions(searchFlags);
-
-//  qWarning("start the search");
-  m_searcher.startSearchThread();
-}
-
-/** Starts the search with the given module list and given search text. */
-void CSearchDialog::startSearch( const ListCSwordModuleInfo modules, const QString& searchText){
-  m_searchResultPage->reset();
-  m_searchOptionsPage->reset();
-  setModules(modules);
-  setSearchText(searchText);
-
-  startSearch();
-}
-
-/** Returns the list of used modules. */
-const ListCSwordModuleInfo CSearchDialog::modules(){
-  return m_searchOptionsPage->modules();
-}
-
-/** Sets the list of modules for the search. */
-void CSearchDialog::setModules( const ListCSwordModuleInfo modules ){
-  m_searchOptionsPage->setModules(modules);
-  resize( sizeHint() );
-}
-
-/** Returns the search text which is set currently. */
-const QString CSearchDialog::searchText(){
-  return m_searchOptionsPage->searchText();
-}
-
-sword::ListKey CSearchDialog::searchScope(){
-  return m_searchOptionsPage->searchScope();
-};
-
-/** Returns true if the search used a scope, otherwise false. */
-const CSwordModuleSearch::scopeType CSearchDialog::searchScopeType() const {
-  return m_searchOptionsPage->scopeType();
-}
-
-/** Returns true if the search used a scope, otherwise false. */
-const int CSearchDialog::searchFlags() const {
-  return m_searchOptionsPage->searchFlags();
-}
-  
-/** Returns the search text which is used for the search. */
-void CSearchDialog::setSearchText( const QString searchText ){
-  m_searchOptionsPage->setSearchText(searchText);
-}
-
-/** Initializes this object. */
-void CSearchDialog::initView(){
-  setButtonTip(User1, CResMgr::searchdialog::searchButton::tooltip);
-  setButtonWhatsThis(User1, CResMgr::searchdialog::searchButton::whatsthis);
-
-  setButtonTip(User2, CResMgr::searchdialog::cancelSearchButton::tooltip);
-  setButtonWhatsThis(User2, CResMgr::searchdialog::cancelSearchButton::whatsthis);
-
-  QHBox* box = addHBoxPage(i18n("Search options"));
-  m_index.optionsPage = pageIndex(box);
-  m_searchOptionsPage = new CSearchOptionsPage(box);
-  
-  box = addHBoxPage(i18n("Search result"));
-  m_index.resultPage = pageIndex(box);
-  m_searchResultPage = new CSearchResultPage(box);
-}
-
-/** Updates the percentage bars. */
-void CSearchDialog::percentUpdate(){
-  updateProgress();
-}
-
-/** Updates the percentage bars. */
-void CSearchDialog::searchFinished(){
-//  qWarning("CSearchDialog::searchFinished()");
- 	m_searchOptionsPage->setOverallProgress(100);
- 	m_searchOptionsPage->setCurrentModuleProgress(100);
-
- 	if ( !m_interruptedSearch && m_searcher.foundItems() ){
- 		m_searchResultPage->setSearchResult(modules());
-    showPage(m_index.resultPage);
- 	}
- 	else
- 		m_searchResultPage->reset();
-
- 	enableButton(User2,false);
- 	enableButton(User1,true); 	
-}
-
-void CSearchDialog::showModulesSelector() {
-  m_searchOptionsPage->chooseModules();
-}
-
-/** Initializes the signal slot connections */
-void CSearchDialog::initConnections(){
-  connect(this, SIGNAL(user1Clicked()), SLOT(startSearch()));
-  connect(this, SIGNAL(user2Clicked()), SLOT(interruptSearch()));
-  connect(this, SIGNAL(closeClicked()), SLOT(slotDelayedDestruct()));  
-  connect(this, SIGNAL(aboutToShowPage(QWidget*)), SLOT(slotShowPage(QWidget*)));
-}
-
-/** Updates the progress. */
-void CSearchDialog::updateProgress(){
-  KApplication::kApplication()->processEvents();
-  m_searchOptionsPage->setOverallProgress(m_searcher.getPercent(CSwordModuleSearch::allModules));
-  m_searchOptionsPage->setCurrentModuleProgress(m_searcher.getPercent(CSwordModuleSearch::currentModule));
-}
-
-/** Interrupts the search. */
-void CSearchDialog::interruptSearch(){
-  m_interruptedSearch = true;
-  m_searcher.interruptSearch();
-  m_searchOptionsPage->prepareSearch();
-}
-
-/** Resets the parts to the default. */
-void CSearchDialog::reset(){
-  m_searchOptionsPage->reset();
-  m_searchResultPage->reset();
-  showPage(m_index.optionsPage);
-}
-
-/** Is the slot which is called when a page will be shown. */
-void CSearchDialog::slotShowPage(QWidget* page){
-  if (pageIndex(page) == m_index.optionsPage) {
-    m_searchOptionsPage->aboutToShow();
-  };
-}
-
-/** Reimplementation. */
-void CSearchDialog::slotClose(){
-  //try to stop the search before we close the dialog which destroys the search object
-  m_interruptedSearch = true;
-  m_searcher.interruptSearch();
-
-  delayedDestruct();
-  m_staticDialog = 0;
-}
-
-/****************************/
-/****************************/
-/****************************/
-
-CModuleChooser::ModuleCheckBoxItem::ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module) : QCheckListItem(item, QString::null, QCheckListItem::CheckBox) {
-  m_module = module;
-  setText(0,m_module->name());
-};
-
-CModuleChooser::ModuleCheckBoxItem::~ModuleCheckBoxItem() {
-
-};
-
-/** Returns the used module. */
-CSwordModuleInfo* const CModuleChooser::ModuleCheckBoxItem::module() const{
-  return m_module;
-}
-
-
-/****************************/
-/****************************/
-/****************************/
-
-CModuleChooser::CModuleChooser(QWidget* parent) : KListView(parent) {
-  initView();
-  initTree();
-};
-
-CModuleChooser::~CModuleChooser() {
-
-};
-
-void CModuleChooser::show() {
-  KListView::show();
-
-  //open module items
-  QListViewItemIterator it( this );
-  for ( ; it.current(); ++it ) {
-    if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
-      if (i->isOn()) {
-        ensureItemVisible(i);
-      };
-    }
-  }
-};
-
-/** Initializes this widget and the childs of it. */
-void CModuleChooser::initView(){
-  addColumn("Module Name");
-  setRootIsDecorated(true);
-//  header()->hide();
-  setFullWidth(true);
-}
-
-/** Initializes the tree of this widget. */
-void CModuleChooser::initTree(){
-  ListCSwordModuleInfo mods = backend()->moduleList();
-  /**
-  * The next steps:
-  * 1. Sort by type
-  * 2. Sort the modules of this type by their language
-  * 3. Create the subfolders for this
-  */
-
-  QMap<CSwordModuleInfo::ModuleType, QString> typenameMap;
-  typenameMap.insert(CSwordModuleInfo::Bible, i18n("Bibles"));
-  typenameMap.insert(CSwordModuleInfo::Commentary, i18n("Commentaries"));
-  typenameMap.insert(CSwordModuleInfo::Lexicon, i18n("Lexicons"));
-  typenameMap.insert(CSwordModuleInfo::GenericBook, i18n("Books"));
-
-  int type = CSwordModuleInfo::Bible;
-  bool ok = true;
-  bool addedDevotionals = false;
-  bool addedGlossaries = false;
-  bool addedLexs = false;
-  bool incType = false;
-
-  while (ok) {
-    ListCSwordModuleInfo modsForType;
-    QString typeFolderCaption = QString::null;
-    incType = false;  
-    if (static_cast<CSwordModuleInfo::ModuleType>(type) == CSwordModuleInfo::Lexicon) {
-      if (!addedLexs) {
-        for (mods.first(); mods.current(); mods.next()) {
-          if (mods.current()->type() == CSwordModuleInfo::Lexicon && (mods.current()->category() != CSwordModuleInfo::DailyDevotional) && (mods.current()->category() != CSwordModuleInfo::Glossary)) {
-            modsForType.append(mods.current());
-          };
-        };
-        addedLexs = true;
-        typeFolderCaption = QString::null;
-      }
-      else if (!addedDevotionals) {
-        for (mods.first(); mods.current(); mods.next()) {
-          if (mods.current()->category() == CSwordModuleInfo::DailyDevotional) {
-            modsForType.append(mods.current());
-          };
-        };
-        addedDevotionals = true;
-        typeFolderCaption = i18n("Daily Devotionals");
-      }
-      else if (!addedGlossaries) {
-        for (mods.first(); mods.current(); mods.next()) {
-          if (mods.current()->category() == CSwordModuleInfo::Glossary) {
-            modsForType.append(mods.current());
-          };
-        };
-        addedGlossaries = true;
-        typeFolderCaption = i18n("Glossaries");        
-      };
-
-      if (addedLexs && addedDevotionals && addedGlossaries)
-        incType = true;
-    }
-    else if (type == CSwordModuleInfo::Bible || type == CSwordModuleInfo::Commentary || type == CSwordModuleInfo::GenericBook){
-      for (mods.first(); mods.current(); mods.next()) {
-        if (mods.current()->type() == type) {
-          modsForType.append(mods.current());
-        };
-      };
-      incType = true;
-    }
-    else
-      ok = false;
-
-    if (typeFolderCaption.isEmpty()) {
-      typeFolderCaption = typenameMap[static_cast<CSwordModuleInfo::ModuleType>(type)];
-    }
-
-    //get the available languages of the selected modules
-    QStringList langs;
-    for (modsForType.first(); modsForType.current(); modsForType.next()) {
-      if ( !langs.contains(QString::fromLatin1( modsForType.current()->module()->Lang() ))) {
-        langs.append(QString::fromLatin1( modsForType.current()->module()->Lang() ));
-      }
-    };
-    langs.sort();
-
-    //go through the list of languages and create subfolders for each language and the modules of the language
-    QListViewItem* typeFolder = 0;
-    if (modsForType.count()) {
-      typeFolder = new QListViewItem(this, typeFolder, typeFolderCaption);
-    }
-    else {
-      if (incType) {
-        type++;
-      }
-      continue;
-    };
-
-    
-    QString language = QString::null;
-    CLanguageMgr* langMgr = languageMgr();
-    for ( QStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
-      language = langMgr->languageForAbbrev(*it).translatedName();
-      if (language.isEmpty()) {
-        language = (*it);
-      }
-      
-      QListViewItem* langFolder = new QListViewItem(typeFolder,language);
-      langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-      //create the module items of this lang folder
-      for (modsForType.first(); modsForType.current(); modsForType.next()) {
-        if (QString::fromLatin1( modsForType.current()->module()->Lang() ) == (*it) ) { //found correct language
-          ModuleCheckBoxItem* i = new ModuleCheckBoxItem(langFolder, modsForType.current());
-          i->setPixmap(0, CToolClass::getIconForModule(modsForType.current()));
-        };
-      };
-    };
-    typeFolder->setPixmap(0,SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-    if (incType) {
-      ++type;
-    }
-  };
-}
-
-/** Returns a list of selected modules. */
-ListCSwordModuleInfo CModuleChooser::modules(){
-  ListCSwordModuleInfo mods;
-  QListViewItemIterator it( this );
-  for ( ; it.current(); ++it ) {
-    if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
-      //add the module if the box is checked
-      if (i->isOn()) {
-        mods.append(i->module());
-      };
-    };
-  };
-
-  return mods;
-}
-
-/** Sets the list of modules and updates the state of the checkbox items. */
-void CModuleChooser::setModules( ListCSwordModuleInfo modules ){
-//  qWarning("CModuleChooser::setModules( ListCSwordModuleInfo modules )");
-  QListViewItemIterator it( this );
-  for ( ; it.current(); ++it ) {
-    if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
-      i->setOn(modules.contains(i->module())); //set the status for the module checkbox item
-//      if (i->isOn()) { //if it's checked, show the item
-//        qWarning("show item!");
-//        ensureItemVisible(i);
-//      }
-    }
-  };
-}
-
-/****************************/
-
-CModuleChooserDialog::CModuleChooserDialog( QWidget* parentDialog, ListCSwordModuleInfo modules ) : KDialogBase(Plain, i18n("Choose modules"), Ok, Ok, parentDialog, "CModuleChooser", false, true) {
-  initView();
-  initConnections();
-
-  m_moduleChooser->setModules(modules);
-};
-
-CModuleChooserDialog::~CModuleChooserDialog() {
-
-};
-
-/** Initializes the view of this dialog */
-void CModuleChooserDialog::initView(){
-  setButtonOKText(i18n("Use chosen modules"));
-
-  QFrame* page = plainPage();
-  QHBoxLayout* layout = new QHBoxLayout(page);
-  m_moduleChooser = new CModuleChooser(page);
-  m_moduleChooser->setMinimumSize(320,400);
-  layout->addWidget(m_moduleChooser);
-}
-
-/** Initializes the connections of this dialog. */
-void CModuleChooserDialog::initConnections(){
-
-}
-
-/** Reimplementation to handle the modules. */
-void CModuleChooserDialog::slotOk(){
-  emit modulesChanged( m_moduleChooser->modules() );
-
-  KDialogBase::slotOk();
-}
-
-/****************************/
-CRangeChooserDialog::RangeItem::RangeItem(QListView* view, QListViewItem* afterThis, const QString caption, const QString range) : KListViewItem(view, afterThis) {
-  setCaption(caption);
-  setRange(range);
-};
-
-CRangeChooserDialog::RangeItem::~RangeItem() {
-
-};
-
-const QString& CRangeChooserDialog::RangeItem::range() {
-//  qWarning("ange is %s", (const char*)m_range.utf8());
-  return m_range;
-};
-
-void CRangeChooserDialog::RangeItem::setRange(QString newRange) {
-  m_range = newRange;
-};
-
-const QString CRangeChooserDialog::RangeItem::caption() {
-  return text(0);
-};
-
-void CRangeChooserDialog::RangeItem::setCaption(const QString newCaption) {
-  setText(0, newCaption);
-};
-
-
-/**************************/
-CRangeChooserDialog::CRangeChooserDialog( QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search range editor"), Default | Ok | Cancel, Ok, parentDialog, "CRangeChooserDialog", false, true) {
-  initView();
-  initConnections();
-  
-  //add the existing scopes
-  CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-  CBTConfig::StringMap::Iterator it;
-  for (it = map.begin(); it != map.end(); ++it) {
-    new RangeItem(m_rangeList, 0, it.key(), it.data());
-  };
-
-  editRange(0);
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())){
-    nameChanged(i->caption());
-  }
-};
-
-CRangeChooserDialog::~CRangeChooserDialog() {
-};
-
-/** Initializes the view of this object. */
-void CRangeChooserDialog::initView(){
-//  setButtonOKText(i18n(""));
-  
-  QGridLayout* grid = new QGridLayout(plainPage(),6,5,0,3);
-
-  m_rangeList = new KListView(plainPage());
-  m_rangeList->addColumn(i18n("Search range"));
-  m_rangeList->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
-  m_rangeList->setFullWidth(true);
-  m_rangeList->setSorting(0, true);
-  m_rangeList->header()->setClickEnabled(false);
-  m_rangeList->header()->setMovingEnabled(false);
-  grid->addMultiCellWidget(m_rangeList,0,4,0,1);
-
-  m_newRangeButton = new QPushButton(i18n("Add new range"),plainPage());
-  connect(m_newRangeButton, SIGNAL(clicked()), this, SLOT(addNewRange()));
-  grid->addWidget(m_newRangeButton,5,0);
-
-  m_deleteRangeButton = new QPushButton(i18n("Delete current range"),plainPage());
-  connect(m_deleteRangeButton, SIGNAL(clicked()), this, SLOT(deleteCurrentRange()));
-  grid->addWidget(m_deleteRangeButton,5,1);
-    
-  grid->addColSpacing(2, 5);
-  
-  QLabel* label = new QLabel(i18n("Name:"), plainPage());
-  m_nameEdit = new QLineEdit(plainPage());
-  grid->addWidget(label,0,3);
-  grid->addWidget(m_nameEdit,0,4);
-
-  label = new QLabel(i18n("Edit current search range:"), plainPage());
-  label->setFixedSize(label->sizeHint());
-  m_rangeEdit = new QTextEdit(plainPage());
-  m_rangeEdit->setTextFormat(Qt::PlainText);
-  grid->addMultiCellWidget(label,1,1,3,4);
-  grid->addMultiCellWidget(m_rangeEdit,2,2,3,4);
-
-  grid->addRowSpacing(3, 10);
-  
-  m_resultList = new KListView(plainPage());
-  m_resultList->addColumn(i18n("Parsed search range:"));
-  m_resultList->setFullWidth(true);
-  m_resultList->setSorting(-1);
-  m_resultList->setShowSortIndicator(false);  
-  m_resultList->header()->setClickEnabled(false);
-  m_resultList->header()->setMovingEnabled(false);
-  m_resultList->setSelectionModeExt(KListView::NoSelection);
-  
-  grid->addMultiCellWidget(m_resultList, 4,5,3,4);
-
-  grid->setRowStretch(4,5);
-}
-
-/** Initializes the connections of this widget. */
-void CRangeChooserDialog::initConnections(){
-  connect(m_rangeList, SIGNAL(selectionChanged(QListViewItem*)),
-    this, SLOT(editRange(QListViewItem*)));
-
-  connect(m_rangeEdit, SIGNAL(textChanged()),
-    this, SLOT(parseRange()));
-  connect(m_rangeEdit, SIGNAL(textChanged()),
-    this, SLOT(rangeChanged()));
-
-  connect(m_nameEdit, SIGNAL(textChanged(const QString&)),
-    this, SLOT(nameChanged(const QString&)));
-}
-
-/** Adds a new range to the list. */
-void CRangeChooserDialog::addNewRange(){
-  RangeItem* i = new RangeItem(m_rangeList, m_rangeList->lastItem(), i18n("New range"));
-  m_rangeList->setSelected(i, true);
-  m_rangeList->setCurrentItem(i);  
-  editRange(i);
-
-  m_nameEdit->setFocus();
-}
-
-/** No descriptions */
-void CRangeChooserDialog::editRange(QListViewItem* item){
-  RangeItem* const range = dynamic_cast<RangeItem*>(item);
-  
-  m_nameEdit->setEnabled( range ); //only if an item is selected enable the edit part
-  m_rangeEdit->setEnabled( range );
-  m_resultList->setEnabled( range );
-  m_deleteRangeButton->setEnabled( range );
-  
-  if (range) {
-    m_nameEdit->setText(range->caption());
-//    qWarning("setting new range %s", (const char*)range->range().utf8());
-    m_rangeEdit->setText(range->range());
-//    qWarning("after setting new range is %s", (const char*)m_rangeEdit->text().utf8());
-  }
-}
-
-/** Parses the entered text and prints out the result in the list box below the edit area. */
-void CRangeChooserDialog::parseRange(){
-  m_resultList->clear();
-
-  //hack: repair range to  work with Sword 1.5.6
-  QString range( m_rangeEdit->text() );
-  range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" );
-  
-  sword::VerseKey key;
-  sword::ListKey verses = key.ParseVerseList((const char*)range.local8Bit(), "Genesis 1:1", true);
-	for (int i = 0; i < verses.Count(); ++i) {
-    new KListViewItem(m_resultList, QString::fromLocal8Bit(verses.GetElement(i)->getRangeText()));
-//    qWarning("range=%s, text=%s",verses.GetElement(i)->getRangeText(), verses.GetElement(i)->getText() );
-	}
-
-}
-
-/** No descriptions */
-void CRangeChooserDialog::rangeChanged(){
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    QString range( m_rangeEdit->text() );
-    //hack: repair range to work with Sword 1.5.6
-    range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" );
-    i->setRange(range);
-  };
-}
-
-/** No descriptions */
-void CRangeChooserDialog::nameChanged(const QString& newCaption){
-  m_rangeEdit->setEnabled(!newCaption.isEmpty());
-  m_resultList->setEnabled(!newCaption.isEmpty());
-  m_resultList->header()->setEnabled(!newCaption.isEmpty());  
-
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    if (!newCaption.isEmpty()) {
-        m_newRangeButton->setEnabled(true);
-        i->setCaption(newCaption);        
-        m_rangeList->sort();
-    }
-    else { //invalid name
-      i->setCaption(i18n("<invalid name of search range>"));
-      m_newRangeButton->setEnabled(false);
-    };
-  };
-}
-
-/** Deletes the selected range. */
-void CRangeChooserDialog::deleteCurrentRange(){
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    if (QListViewItem* selection = i->itemBelow() ? i->itemBelow() : i->itemAbove()) {
-      m_rangeList->setSelected(selection, true);
-      m_rangeList->setCurrentItem(selection);
-    }
-    else {
-      m_rangeList->setSelected(m_rangeList->firstChild(), true);
-      m_rangeList->setCurrentItem(m_rangeList->firstChild());      
-    }
-    delete i;
-  }
-  editRange(m_rangeList->currentItem()); 
-}
-
-void CRangeChooserDialog::slotOk(){
-  //save the new map of search scopes
-  CBTConfig::StringMap map;
-  QListViewItemIterator it( m_rangeList );
-  for (;it.current(); ++it) {
-    if ( RangeItem* i = dynamic_cast<RangeItem*>(it.current()) ){
-      map[i->caption()] = i->range();
-    };
-  };
-  CBTConfig::set(CBTConfig::searchScopes, map);
-
-  KDialogBase::slotOk();
-}
-  
-void CRangeChooserDialog::slotDefault(){
-  m_rangeList->clear();
-  CBTConfig::StringMap map = CBTConfig::getDefault(CBTConfig::searchScopes);
-  CBTConfig::StringMap::Iterator it;
-  for (it = map.begin(); it != map.end(); ++it) {
-    new RangeItem(m_rangeList, 0, it.key(), it.data());
-  };
-  m_rangeList->setSelected(m_rangeList->selectedItem(), false);
-  m_rangeList->setCurrentItem(0);  
-  
-  editRange(0);
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    nameChanged(i->caption());
-  }
-
-  KDialogBase::slotDefault();  
-}
-
-/****************************/
-
-CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true){
-  initView();
-  initConnections();
-  m_analysis->reset();
-  m_analysis->analyse(modules);
-  showMaximized();  
-};
-
-CSearchAnalysisDialog::~CSearchAnalysisDialog() {
-
-};
-
-/** Initializes this dialog. */
-void CSearchAnalysisDialog::initView(){
-  QVBoxLayout* layout = new QVBoxLayout(plainPage(),0);
-
-  QPushButton* button = new QPushButton(plainPage(), "button");
-  button->setIconSet(SmallIconSet("filesave"));
-  button->setText(i18n("Save search analysis as HTML"));
-  button->setFixedSize(button->sizeHint());
-  layout->addWidget(button);
-  layout->addSpacing(10);
-
-  m_analysis = new CSearchAnalysis(plainPage());
-  m_analysisView = new CSearchAnalysisView(m_analysis, plainPage());
-  m_analysisView->show();
-  layout->addWidget(m_analysisView);
-
-  connect(button, SIGNAL(clicked()), m_analysis, SLOT(saveAsHTML()));  
-}
-
-/** Initializes the widgets SIGNAL and SLOT connections,. */
-void CSearchAnalysisDialog::initConnections(){
-}
-
-/****************************/
-/*  CSearchAnalysis         */
-/****************************/
-
-CSearchAnalysis::CSearchAnalysis(QObject *parent, const char *name )
-	: QCanvas(parent,name) {
-
-  m_scaleFactor = 0.0;
-  m_legend = 0;
-  setBackgroundColor(Qt::white);	
-  m_canvasItemList.resize(67);
-  m_canvasItemList.setAutoDelete(true);
-  resize(1,1);
-  connect(this, SIGNAL(resized()), SLOT(slotResized()));
-}
-
-CSearchAnalysis::~CSearchAnalysis(){
-}
-
-QDict<CSearchAnalysisItem>* CSearchAnalysis::getSearchAnalysisItemList(){
-  // Returns pointer to the search analysis items
-  return &m_canvasItemList;
-}
-
-/** Starts the analysis of the search result. This should be called only once because QCanvas handles the updates automatically. */
-void CSearchAnalysis::analyse(ListCSwordModuleInfo modules){
-  /**
-	* Steps of analysing our search result;
-	*	-Create the items for all available books ("Genesis" - "Revelation")
-	* -Iterate through all modules we analyse
-	*		-Go through all books of this module
-	*			-Find out how many times we found the book
-	*			-Set the count to the items which belongs to the book
-	*/
-  setModules(modules);
-
-	m_lastPosList.clear();		
-	const int numberOfModules = m_moduleList.count();
-	if (!numberOfModules)
-		return;	
-	m_legend = new CSearchAnalysisLegendItem(this, &m_moduleList);	
-	m_legend->setX(LEFT_BORDER);
-	m_legend->setY(UPPER_BORDER);
-	m_legend->setSize(LEGEND_WIDTH,
-	           LEGEND_INNER_BORDER*2 + ITEM_TEXT_SIZE*numberOfModules + LEGEND_DELTAY*(numberOfModules-1));
-  m_legend->show();	
-
-  int xPos = LEFT_BORDER + m_legend->width() + SPACE_BETWEEN_PARTS;			
-	int moduleIndex = 0;	
-	m_maxCount = 0;	
-	int count = 0;
-	CSwordVerseKey key(0);	
-	key.key("Genesis 1:1");	
-	
-	CSearchAnalysisItem* analysisItem = m_canvasItemList[key.book()];
-	bool ok = true;
-	while (ok && analysisItem) {
-		for (moduleIndex = 0,m_moduleList.first(); m_moduleList.current(); m_moduleList.next(),++moduleIndex) {
-			KApplication::kApplication()->processEvents(10);
-			if (!m_lastPosList.contains(m_moduleList.current()))
-				m_lastPosList.insert(m_moduleList.current(),0);
-			analysisItem->setCountForModule(moduleIndex, (count = getCount(key.book(),m_moduleList.current())));
-			m_maxCount = (count > m_maxCount) ? count : m_maxCount;
-		}
-		analysisItem->setX(xPos);
-		analysisItem->setY(UPPER_BORDER);
-		analysisItem->show();
-		
-		xPos += (int)analysisItem->width() + SPACE_BETWEEN_PARTS;
-		ok = key.next(CSwordVerseKey::UseBook);		
-   	analysisItem = m_canvasItemList[key.book()];
-	}
-	resize(xPos+BAR_WIDTH+(m_moduleList.count()-1)*BAR_DELTAX+RIGHT_BORDER, height() );	
-	slotResized();
-}
-
-/** Sets te module list used for the analysis. */
-void CSearchAnalysis::setModules(ListCSwordModuleInfo modules){
-	m_moduleList.clear();
-	for (modules.first(); modules.current(); modules.next()) {
-		if ( (modules.current()->type() == CSwordModuleInfo::Bible) || (modules.current()->type() == CSwordModuleInfo::Commentary) ) { //a Bible or an commentary
-			m_moduleList.append(modules.current());
-    }
-  }
-
-	m_canvasItemList.clear();
-	CSearchAnalysisItem* analysisItem = 0;	
-	CSwordVerseKey key(0);	
-	key.key("Genesis 1:1");
-	do {
-   	analysisItem = new CSearchAnalysisItem(this, m_moduleList.count(), key.book(), &m_scaleFactor, &m_moduleList);
-   	analysisItem->hide();
-		m_canvasItemList.insert(key.book(), analysisItem);
-	} while (key.next(CSwordVerseKey::UseBook));
-	update();
-}
-
-/** Sets back the items and deletes things to cleanup */
-void CSearchAnalysis::reset(){
-	m_scaleFactor = 0.0;
-  QDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); // iterator for items
-	while ( it.current() ) {
-		it.current()->hide();
-		++it;
-	}	
-	m_lastPosList.clear();	
-	
-	if (m_legend)
-		m_legend->hide();
-	delete m_legend;
-	m_legend = 0;	
-	update();
-}
-
-/** No descriptions */
-void CSearchAnalysis::slotResized(){
-	m_scaleFactor = (double)( (double)(height()-UPPER_BORDER-LOWER_BORDER-BAR_LOWER_BORDER-(m_moduleList.count()-1)*BAR_DELTAY)
-	                                    /(double)m_maxCount);	
-	QDictIterator<CSearchAnalysisItem> it( m_canvasItemList );
-	while ( it.current() ) {
-		it.current()->setSize(BAR_WIDTH + (m_moduleList.count()-1)*BAR_DELTAX, height()-UPPER_BORDER-LOWER_BORDER);
-		it.current()->setY(UPPER_BORDER);
-  	++it;
-	}
-	update();
-}
-
-/** This function returns a color for each module */
-QColor CSearchAnalysis::getColor(int index){
-  switch (index){
-    case  0: return Qt::red;
-    case 	1: return Qt::darkGreen;
-    case  2: return Qt::blue;
-    case  3: return Qt::cyan;
-    case  4: return Qt::magenta;
-    case  5: return Qt::darkRed;
-    case  6: return Qt::darkGray;
-    case  7: return Qt::black;
-    case  8: return Qt::darkCyan;
-    case  9: return Qt::darkMagenta;
-    default: return Qt::red;
-  }
-}
-
-/** Returns the count of the book in the module */
-const unsigned int CSearchAnalysis::getCount( const QString book, CSwordModuleInfo* module ){
-	sword::ListKey& result = module->searchResult();
-	const int length = book.length();	
-	unsigned int i = m_lastPosList[module];
-	unsigned int count = 0;
-	const unsigned int resultCount = result.Count();
-	while (i < resultCount) {
-		if ( strncmp(book.local8Bit(), (const char*)*result.GetElement(i), length) )		
-			break;
-		i++;
-		++count;		
-	}
-	m_lastPosList.contains(module) ? m_lastPosList.replace(module,i) : m_lastPosList.insert(module,i);
-
-  return count;
-}
-
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchAnalysisItem::CSearchAnalysisItem(QCanvas *parent, const int moduleCount, const QString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules)
-	: QCanvasRectangle(parent),
-	m_moduleList( modules ),
-	m_scaleFactor(scaleFactor),
-	m_bookName(bookname),
-	m_moduleCount(moduleCount), 	
-	m_bufferPixmap(0)
-{	
- 	m_resultCountArray.resize(m_moduleCount);
- 	int index = 0;
- 	for (index = 0; index < m_moduleCount; ++index)
- 		m_resultCountArray[index] = 0;
-}
-
-CSearchAnalysisItem::~CSearchAnalysisItem() {
-  delete m_bufferPixmap;
-}
-
-/** Sets the resultcount of this item for the given module */
-void CSearchAnalysisItem::setCountForModule( const int moduleIndex, const int count) {
-	m_resultCountArray[moduleIndex] = count;
-}
-
-/** Returns the resultcount of this item for the given module */
-int CSearchAnalysisItem::getCountForModule( const int moduleIndex) {
-	return m_resultCountArray[moduleIndex];
-}
-
-/** Reimplementation. Draws the content of this item. */
-void CSearchAnalysisItem::draw(QPainter& painter) {
-	QFont f = painter.font();
-	f.setPointSize(ITEM_TEXT_SIZE);
-	painter.setFont(f);
-	
-	setPen(QPen(black,1));
-	setBrush(Qt::red);
-  /**	
-	* We have to paint so many bars as we have modules available (we use m_moduleCount)
-	* We paint inside the area which is given by height and width of this rectangle item
-	*/	
-	int index = 0;	
-	int drawn = 0;
-	int Value = 0;
-	
-	//find out the biggest value
-	for (index=0;index < m_moduleCount; index++) {
-	  if (m_resultCountArray[index] > Value) {
-	    Value = m_resultCountArray[index];
-    } 
-  };
-	
-	while (drawn < m_moduleCount) {
-    for (index = 0; index < m_moduleCount; index++) {
-      if (m_resultCountArray[index] == Value) {
-    		QPoint p1((int)x() + (m_moduleCount-drawn-1)*BAR_DELTAX,
-    		          (int)height() + (int)y() - BAR_LOWER_BORDER - (m_moduleCount-drawn)*BAR_DELTAY);
-    		QPoint p2(p1.x() + BAR_WIDTH,
-    		          p1.y() - (int)( !m_resultCountArray[index] ? 0 : ((m_resultCountArray[index])*(*m_scaleFactor))) );
-    		QRect r(p1, p2);
-    		painter.fillRect(r, QBrush(CSearchAnalysis::getColor(index)) );
-    		painter.drawRect(r);
-    		drawn++;
-      }
-    }
-    //finds the next smaller value
- 	  int newValue = 0;
- 		for (index=0;index < m_moduleCount; index++)
-   	  if (m_resultCountArray[index] < Value && m_resultCountArray[index] >= newValue)
-   	    newValue = m_resultCountArray[index];
-   	Value = newValue;
-	}		
-	if (!m_bufferPixmap) {
-		m_bufferPixmap = new QPixmap();
-		m_bufferPixmap->resize(width(),BAR_LOWER_BORDER);
-		m_bufferPixmap->fill();		
-		QPainter p(m_bufferPixmap);				
-		f = p.font();
-		f.setPointSize(ITEM_TEXT_SIZE);
-		p.setFont(f);		
-		p.rotate(90);
-		p.drawText(QPoint(5,0), m_bookName);
-	}
-	painter.drawPixmap(QPoint(int(x()),int(height()+y()-BAR_LOWER_BORDER)), *m_bufferPixmap);
-}
-
-/** Returns the width of this item. */
-int CSearchAnalysisItem::width(){
-	return m_moduleCount*(m_moduleCount>1 ? BAR_DELTAX : 0) + BAR_WIDTH;	
-}
-
-/** Returns the tooltip for this item. */
-const QString CSearchAnalysisItem::getToolTip(){
-	QString ret = QString::fromLatin1("<CENTER><B>%1</B></CENTER><HR>").arg(m_bookName);
-	ret += "<TABLE CELLSPACING=\"0\" CELLPADDING=\"3\" WIDTH=\"100%\" HEIGHT=\"100%\" ALIGN=\"center\">";
-	for (int i = 0; i < m_moduleCount; ++i) {
-		CSwordModuleInfo* info = m_moduleList->at(i);
-		const QColor c = CSearchAnalysis::getColor(i);
-		ret.append(
-			QString::fromLatin1("<TR BGCOLOR=\"white\"><TD><B><FONT COLOR=\"#%1\">%2</FONT></B></TD><TD>%3 (%4%)</TD></TR>")
-				.arg(QString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
-				.arg(info ? info->name() : QString::null)
-				.arg(m_resultCountArray[i])
-        .arg((info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2)
-		);
-	}
-	ret += "</TABLE>";
-	return ret;
-}
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchAnalysisView::CSearchAnalysisView(QCanvas* canvas, QWidget* parent)
-	: QCanvasView(canvas, parent) {
-//	QWhatsThis::add(this, WT_SD_ANALYSIS_VIEW);
-	setFocusPolicy(QWidget::WheelFocus);
-	m_toolTip = new ToolTip(this);	
-	resize(sizeHint());
-
-}
-
-/** Returns the sizeHint for this view */
-QSize CSearchAnalysisView::sizeHint(){
-	if ( parentWidget() )
-		return parentWidget()->sizeHint();
-	return QCanvasView::sizeHint();
-}
-
-/** No descriptions */
-void CSearchAnalysisView::resizeEvent( QResizeEvent* e){
-	QCanvasView::resizeEvent(e);
-	canvas()->resize( canvas()->width(), viewport()->height() );
-}
-
-CSearchAnalysisView::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {
-}
-
-void CSearchAnalysisView::ToolTip::maybeTip(const QPoint& p) {
-	CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(parentWidget());
-	if (!view)
-		return;
-	QPoint point(p);
-	point = view->viewport()->mapFrom(view, point);
-	CSearchAnalysisItem* i = view->itemAt( view->viewportToContents(point) );
-	if (!i)
-		return;
-				
-	//get type of item and display correct text
-	QString text = i->getToolTip();
-	if (text.isEmpty())
-		return;
-	
-	QPoint p1 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().topLeft()));
-	p1.setY(0);	
-	QPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight()));
-	p2.setY(view->height());	
-	QRect r = QRect( p1, p2 );	
-	if (r.contains(p))
-		tip(r, text);
-}
-
-
-/** Returns the item at position p. If there no item at that point return 0. */
-CSearchAnalysisItem* CSearchAnalysisView::itemAt( const QPoint& p ){
-	QCanvasItemList l = canvas()->collisions(p);
-	if (!l.count())
-		return 0;
-	return dynamic_cast<CSearchAnalysisItem*>(l.first());	
-}
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(QCanvas *parent, ListCSwordModuleInfo *list )
-	: QCanvasRectangle(parent) {
-	m_moduleList = list;
-}
-
-/** Reimplementation. Draws the content of this item. */
-void CSearchAnalysisLegendItem::draw (QPainter& painter) {	
- 	painter.save();
- 		
-	setPen( QPen(black,2) );
-	setBrush( Qt::white );
-  //the outer rectangle
-  QPoint p1( (int)x(), (int)y() );
-  QPoint p2( (int)x()+width(), (int)y() + height() );
-  QRect r(p1, p2);
-  r.normalize();
- 	painter.drawRect(r);
- 	
-  QFont f = painter.font();
-  f.setPointSize(ITEM_TEXT_SIZE);
-  painter.setFont(f);
- 	
- 	for (unsigned int index=0; index < m_moduleList->count(); index++){
- 	  // the module color indicators
- 	  QPoint p1( (int)x() + LEGEND_INNER_BORDER, (int)y() + LEGEND_INNER_BORDER + index*(LEGEND_DELTAY + ITEM_TEXT_SIZE) );
- 	  QPoint p2(p1.x() + ITEM_TEXT_SIZE, p1.y() + ITEM_TEXT_SIZE);
- 	  QRect r(p1,p2);
- 		painter.fillRect(r, QBrush(CSearchAnalysis::getColor(index)) );
- 		r.normalize();
- 		painter.drawRect(r);
- 		
- 		QPoint p3( p2.x() + LEGEND_INNER_BORDER, p2.y() );
-  	painter.drawText(p3, m_moduleList->at(index)->name() );
- 	}
-  painter.restore();
-}
-
-/** No descriptions */
-void CSearchAnalysis::saveAsHTML(){
- 	const QString file = KFileDialog::getSaveFileName(QString::null, QString::fromLatin1("*.html | %1").arg(i18n("HTML files")), 0, i18n("Save Search Analysis"));
-	if (file.isNull()) {
-    return;
-  }
-
- 	int moduleIndex = 0;
- 	int count = 0;
- 	QString countStr = "";
- 	QString m_searchAnalysisHTML = "";
- 	QString tableTitle = "";
-  QString tableTotals = "";
- 	QString VerseRange = "";
- 	const QString txtCSS = QString::fromLatin1("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n");
-	const QString metaEncoding = QString::fromLatin1("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">");
- 	CSwordVerseKey key(0);
- 	sword::ListKey searchResult;
-
- 	key.key("Genesis 1:1");
-
- 	if (CSearchDialog::getSearchDialog()->searchScopeType() != CSwordModuleSearch::Scope_NoScope) { //a search scope was used
- 		sword::ListKey verses = CSearchDialog::getSearchDialog()->searchScope();
- 		for (int i = 0; i < verses.Count(); ++i) {
-      VerseRange += QString::fromLocal8Bit(verses.GetElement(i)->getRangeText()) + "<BR>";
- 		}
- 	}
-
- 	CSearchAnalysisItem* analysisItem = m_canvasItemList.find( key.book() );
-
-  QString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n";
- 	text += "<table>\n<tr><th>" + i18n("Search text :") + "</th><th>" + CSearchDialog::getSearchDialog()->searchText() + "</th></tr>\n";
- 	text += QString::fromLatin1("<tr><th>") + i18n("Search type :") + QString::fromLatin1("</th><th>") + /*m_searchText->getSearchTypeString() +*/ "</th></tr>\n";
- 	text += QString::fromLatin1("<tr><th>") + i18n("Search scope:") + "</th><th>" + ((CSearchDialog::getSearchDialog()->searchScopeType() !=  CSwordModuleSearch::Scope_NoScope) ? VerseRange : i18n("No search scope")) + "</th></tr>\n</table>\n<br>\n";
-
-
-  tableTitle = "<tr><th align=\"left\">" + i18n("Book") + "</th>";
- 	tableTotals = "<tr><td align=\"left\">" + i18n("Total hits") + "</td>";
- 	for (moduleIndex = 0,m_moduleList.first(); m_moduleList.current(); m_moduleList.next(),++moduleIndex) {
- 			tableTitle += QString::fromLatin1("<th align=\"left\">") + m_moduleList.current()->name() + QString::fromLatin1("</th>");
- 			searchResult = m_moduleList.current()->searchResult();
- 			countStr.setNum(searchResult.Count());
-      tableTotals += QString::fromLatin1("<td align=\"right\">") + countStr + QString::fromLatin1("</td>");
- 	}
- 	tableTitle += QString::fromLatin1("</tr>\n");
- 	tableTotals += QString::fromLatin1("</tr>\n");
-
- 	m_searchAnalysisHTML = "";
- 	bool ok = true;
- 	while (ok) {
- 		m_searchAnalysisHTML += QString::fromLatin1("<tr><td>") + key.book() + QString::fromLatin1("</td>");
- 		analysisItem = m_canvasItemList.find( key.book() );
- 		for (moduleIndex = 0, m_moduleList.first(); m_moduleList.current(); m_moduleList.next(), ++moduleIndex) {
- 			count = analysisItem->getCountForModule(moduleIndex);
- 			countStr.setNum(count);
- 			m_searchAnalysisHTML += QString::fromLatin1("<td align=\"right\">") + countStr + QString::fromLatin1("</td>");
- 		}
- 		m_searchAnalysisHTML += QString::fromLatin1("</tr>\n");
- 		ok = key.next(CSwordVerseKey::UseBook);
- 	}
- 	text += QString::fromLatin1("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + QString::fromLatin1("</table>\n");
- 	text += QString::fromLatin1("<center>") + i18n("Created by") + QString::fromLatin1(" <a href=\"http://www.bibletime.info/\">BibleTime</a></center>");
- 	text += QString::fromLatin1("</body></html>");
-
-	CToolClass::savePlainFile(file, text, false, QTextStream::UnicodeUTF8);
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialog.h b/bibletime/frontend/searchdialog/csearchdialog.h
deleted file mode 100644
index c54dae6..0000000
--- a/bibletime/frontend/searchdialog/csearchdialog.h
+++ /dev/null
@@ -1,460 +0,0 @@
-/***************************************************************************
-                          csearchdialog.h  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSEARCHDIALOG_H
-#define CSEARCHDIALOG_H
-
-//BibleTime includes
-#include "csearchdialogpages.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-#include "backend/cswordmodulesearch.h"
-
-#include "util/cpointers.h"
-
-//Sword includes
-
-
-//Qt includes
-#include <qwidget.h>
-#include <qstring.h>
-#include <qcanvas.h>
-#include <qdict.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <kdialog.h>
-#include <kdialogbase.h>
-
-//forward declarations
-class CSearchAnalysisItem;
-class CSearchAnalysisLegendItem;
-class CSearchAnalysis;
-class CSearchAnalysisView;
-
-class QLineEdit;
-class QTextEdit;
-
-/**
-  *@author The BibleTime team
-  */
-
-class CSearchDialog : public KDialogBase  {
-  Q_OBJECT
-
-public:
-  static void openDialog(const ListCSwordModuleInfo modules, const QString& searchText = QString::null, QWidget* parentDialog = 0);
-
-public slots: // Public slots
-  /**
-  * Reimplemented to show the First time searchdialog page.
-  */
-  virtual void show();
-  
-protected:
-  friend class CSearchAnalysis;
-  friend class CSearchResultPage;  
-  /**
-  * Only interesting for the class members! Useful to get the searched text etc.
-  */
-  static CSearchDialog* const getSearchDialog();
-
-  /**
-  * The cinstructor of the dialog. It's protected because you should use the static public function openDialog.
-  * The dialog destroys itself if it was closed.
-  */
-	CSearchDialog(QWidget *parent);
-	virtual ~CSearchDialog();
-  /**
-  * Initializes this object.
-  */
-  void initView();
-  /**
-  * Starts the search with the given module list and given search text.
-  * Doesn't wait for the start button press, starts immediatly
-  */
-  void startSearch( const ListCSwordModuleInfo modules, const QString& searchText);
-  /**
-  * Sets the list of modules for the search.
-  */
-  void setModules( const ListCSwordModuleInfo modules );
-  /**
-  * Returns the list of used modules.
-  */
-  const ListCSwordModuleInfo modules();
-  /**
-  * Returns the search text which is used for the search.
-  */
-  void setSearchText( const QString searchText );
-  /**
-  * Returns the search text which is set currently.
-  */
-  const QString searchText();
-  /**
-  * Returns the used search scope as a list key
-  */
-  sword::ListKey searchScope();
-  /**
-  * Returns true if the search used a scope, otherwise false.
-  */
-  const CSwordModuleSearch::scopeType searchScopeType() const;  
-  /**
-  * Returns they type of search which is set
-  */
-  const int searchFlags() const;
-  /**
-  * Resets the parts to the default.
-  */
-  void reset();
- 
-protected slots:
-  /**
-  * Updates the percentage bars.
-  */
-  void percentUpdate();
-  /**
-  * Starts the search with the set modules and the set search text.
-  */
-  void startSearch();
-  void searchFinished();
-  void showModulesSelector();
-  /**
-  * Initializes the signal slot connections
-  */
-  void initConnections();
-  /**
-  * Updates the progress.
-  */
-  void updateProgress();
-  /**
-  * Interrupts the search.
-  */
-  void interruptSearch();
-  /**
-  * Is the slot which is called when a page will be shown.
-  */
-  void slotShowPage(QWidget* page);
-  /** Reimplementation. */
-  virtual void slotClose();
-
-private:
-  CSearchResultPage* m_searchResultPage;
-  CSearchOptionsPage* m_searchOptionsPage;
-	CSwordModuleSearch m_searcher;
-  struct {
-    int optionsPage;
-    int resultPage;
-  } m_index;
-  bool m_interruptedSearch;
-};
-
-class CModuleChooser : public KListView, public CPointers {
-  Q_OBJECT
-public:
-  class ModuleCheckBoxItem : virtual public QCheckListItem {
-  public:
-    ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module);
-    ~ModuleCheckBoxItem();
-    /**
-    * Returns the used module.
-    */
-    CSwordModuleInfo* const module() const;
-  private:
-    CSwordModuleInfo* m_module;
-  };
-
-  CModuleChooser(QWidget* parent);
-  ~CModuleChooser();
-  /**
-  * Sets the list of modules and updates the state of the checkbox items.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-  /**
-  * Returns a list of selected modules.
-  */
-  ListCSwordModuleInfo modules();
-
-public slots:
-  /**
-  * Reimplemented to open the folders which contain checked module items
-  */
-  virtual void show();
-
-  
-protected: // Protected methods
-  /**
-  * Initializes this widget and the childs of it.
-  */
-  void initView();
-  /**
-  * Initializes the tree of this widget.
-  */
-  void initTree();
-};
-
-class CModuleChooserDialog : public KDialogBase  {
-  Q_OBJECT
-public:
-  CModuleChooserDialog(QWidget* parentDialog, ListCSwordModuleInfo modules);
-  ~CModuleChooserDialog();
-
-signals:
-  void modulesChanged(ListCSwordModuleInfo modules);
-
-protected: // Protected methods
-  /**
-  * Initializes the view of this dialog
-  */
-  void initView();
-  /**
-  * Initializes the connections of this dialog.
-  */
-  void initConnections();
-
-protected slots: // Protected slots
-  /**
-  * Reimplementation to handle the modules.
-  */
-  virtual void slotOk();
-
-private:
-  CModuleChooser* m_moduleChooser;
-};
-
-class CSearchAnalysisDialog : public KDialogBase  {
-  Q_OBJECT
-public:
-  CSearchAnalysisDialog(ListCSwordModuleInfo modules, QWidget* parentDialog);
-  ~CSearchAnalysisDialog();
-
-protected: // Protected methods
-  /**
-  * Initializes the widgets SIGNAL and SLOT connections,.
-  */
-  void initConnections();
-  /**
-  * Initializes this dialog.
-  */
-  void initView();
-
-private:
-  CSearchAnalysis* m_analysis;
-  CSearchAnalysisView* m_analysisView;
-};
-
-class CRangeChooserDialog : public KDialogBase {
-  Q_OBJECT
-public:
-  CRangeChooserDialog(QWidget* parentDialog);
-  ~CRangeChooserDialog();
-
-protected: // Protected methods
-  class RangeItem : public KListViewItem {
-  public:
-    RangeItem(QListView*, QListViewItem* afterThis = 0, const QString caption = QString::null, const QString range = QString::null);
-    ~RangeItem();
-    const QString& range();
-    const QString caption();
-    void setRange(QString range);
-    void setCaption(const QString);
-  private:
-    QString m_range;
-  };
-
-  /**
-  * Initializes the connections of this widget.
-  */
-  void initConnections();
-  /**
-  * Initializes the view of this object.
-  */
-  void initView();
-
-protected slots: // Protected slots
-  /**
-  * Adds a new range to the list.
-  */
-  void addNewRange();
-  void editRange(QListViewItem*);
-  /**
-  * Parses the entered text and prints out the result in the list box below the edit area.
-  */
-  void parseRange();
-  void nameChanged(const QString&);
-  void rangeChanged();
-  /**
-  * Deletes the selected range.
-  */
-  void deleteCurrentRange();
-  virtual void slotDefault();
-  virtual void slotOk();  
-
-private:
-  KListView* m_rangeList;
-  KListView* m_resultList;
-  QLineEdit* m_nameEdit;
-  QTextEdit* m_rangeEdit;
-  QPushButton* m_newRangeButton;
-  QPushButton* m_deleteRangeButton;
-};
-
-/**
-	* CSearchDialogAnaylsis shows the graphical analysis of the search result.
-  * @author The BibleTime Team
-  */
-class CSearchAnalysis : public QCanvas {
-   Q_OBJECT
-public:	
-	CSearchAnalysis(QObject *parent=0, const char *name=0);
-  virtual ~CSearchAnalysis();
-  /**
-  * Starts the analysis of the search result.
-	* This should be called only once because
-	*	QCanvas handles the updates automatically.
-	*/
-  void analyse(ListCSwordModuleInfo modules);
-  /**
-  * This function returns a color for each module
-  * @return The color at position index in the list
-  */
-  static QColor getColor(int index);
- 	/*
- 	* This function returns a pointer to the list of AnalysisItems
- 	*/
- 	QDict<CSearchAnalysisItem>* getSearchAnalysisItemList();
-  void reset();
-
-protected slots: // Protected slots
-  /**
-  * No descriptions
-  */
-  void slotResized();
-
-protected:
-  void setModules(ListCSwordModuleInfo modules);
-
-private:
-  /**
-  * Returns the count of the book in the module
-  */
-  const unsigned int getCount( const QString book, CSwordModuleInfo* module );
-	
-	ListCSwordModuleInfo m_moduleList;
- 	QDict<CSearchAnalysisItem> m_canvasItemList;
- 	QMap<CSwordModuleInfo*,unsigned int> m_lastPosList; 	
-  int m_maxCount;
-  double m_scaleFactor;
-  CSearchAnalysisLegendItem* m_legend;
-
-public slots: // Public slots
-  void saveAsHTML();
-};
-
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-
-/** Paints the bars for one book for one or more modules
-	*
-	*/
-class CSearchAnalysisItem : public QCanvasRectangle  {
-public:	
-	/**
-	* Standard constructor.
-	*/
-	CSearchAnalysisItem(QCanvas* parent, const int moduleCount, const QString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules);
-	virtual ~CSearchAnalysisItem();	
-  /**
-  * Sets the resultcount of this item
-  */
-  void setCountForModule( const int moduleIndex, const int count);
-
-  /**
-  * Returns the resultcount of this item
-  */
-	int getCountForModule( const int moduleIndex);
-  /**
-  * Returns the width of this item.
-  */
-  virtual int width();
-  /**
-  * Returns the tooltip for this item.
-  */
-  const QString getToolTip();
-  	
-private:
-  virtual void draw (QPainter & painter);	
-	
-	ListCSwordModuleInfo* m_moduleList;	
-	double *m_scaleFactor;
-	QString m_bookName;
- 	int m_moduleCount;
- 	QMemArray<int> m_resultCountArray;
- 	QPixmap* m_bufferPixmap;
-};
-
-class CSearchAnalysisLegendItem : public QCanvasRectangle  {
-
-public:	
-	CSearchAnalysisLegendItem(QCanvas* parent, ListCSwordModuleInfo* list );
-
-private:
-  virtual void draw (QPainter & painter);
-  ListCSwordModuleInfo* m_moduleList;
-};
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-class CSearchAnalysisView : public QCanvasView  {
-   Q_OBJECT
-public:
-	/**
-	* Standard constructor
-	*/
-	CSearchAnalysisView(QCanvas* canvas, QWidget* parent);
-  /**
-  * Returns the sizeHint for this view
-  * We give back the size of the parent widgetas default.
-  * This is a reimplementation from QCanvasView::sizeHint().
-  */
-  virtual QSize sizeHint();	
-  /**
-  * Returns the item at position p.
-	* If there no item at that point return 0.
-	*/
-  CSearchAnalysisItem* itemAt( const QPoint& p );
-
-protected:
-  /**
-  * Reimplementation.
-  */
-  virtual void resizeEvent(QResizeEvent* e);
-
-private:
-	class ToolTip : public QToolTip {
-	public:
-		ToolTip(QWidget* parent);
-		/**
-		* Displays a tooltip for position p
-		*/		
-		virtual void maybeTip(const QPoint &pos);
-	};
-	ToolTip* m_toolTip;	
-};
-
-#endif
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
deleted file mode 100644
index ac4eb3c..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-/***************************************************************************
-                          csearchdialogpages.cpp  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "csearchdialogpages.h"
-
-#include "csearchdialog.h"
-
-#include "backend/centrydisplay.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/cdragdropmgr.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-
-#include "util/cresmgr.h"
-#include "util/cpointers.h"
-#include "util/ctoolclass.h"
-
-//Qt includes
-#include <qlayout.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qsplitter.h>
-#include <qtooltip.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qheader.h>
-#include <qgroupbox.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kaction.h>
-#include <klistview.h>
-#include <kcombobox.h>
-#include <kprogress.h>
-#include <kpopupmenu.h>
-#include <ksqueezedtextlabel.h>
-
-/********************************************
-************  ModuleResultList **************
-********************************************/
-
-CSearchResultView::CSearchResultView(QWidget* parent) : KListView(parent), m_module(0) {
-  initView();
-  initConnections();
-};
-
-CSearchResultView::~CSearchResultView() {
-};
-
-/** Initializes the view of this widget. */
-void CSearchResultView::initView(){
-  addColumn(i18n("Found items"));
-  setFullWidth(true);
-  setSorting(-1);
-  setDragEnabled(true);  
-  setSelectionModeExt(KListView::Extended);
-
-  //setup the popup menu
-  m_popup = new KPopupMenu(this);
-//	m_popup->insertTitle(i18n("Bible window"));
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon);
- 	m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyItems()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.result);
- 	m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyItemsWithText()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.resultWithText);
- 	m_actions.copyMenu->plug(m_popup);
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon);
- 	m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveItems()), this);
- 	m_actions.saveMenu->insert(m_actions.save.result);
- 	m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveItemsWithText()), this);
- 	m_actions.saveMenu->insert(m_actions.save.resultWithText);
- 	m_actions.saveMenu->plug(m_popup);
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon);
- 	m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printItems()), this);
- 	m_actions.printMenu->insert(m_actions.print.result);
-  m_actions.printMenu->plug(m_popup);  
-}
-
-/** No descriptions */
-void CSearchResultView::initConnections(){
-//  connect(this, SIGNAL(executed(QListViewItem*)),
-//	  this, SLOT(executed(QListViewItem*)));
-  connect(this, SIGNAL(currentChanged(QListViewItem*)),
-	  this, SLOT(executed(QListViewItem*)));
-    
-  connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-    this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&)));    
-}
-
-/** Setups the list with the given module. */
-void CSearchResultView::setupTree(CSwordModuleInfo* m){
-  clear();
-  if (!m)
-    return;
-  m_module = m;
-
-  sword::ListKey result = m->searchResult();
-	const int count = result.Count();
-  if (!count)
-    return;
-
-  setUpdatesEnabled(false);
-
-  QListViewItem* oldItem = 0;
-  KListViewItem* item = 0;
-  for (int index = 0; index < count; index++) {
-    item = new KListViewItem(this, oldItem);
-    item->setText(0,QString::fromLocal8Bit((const char*)*result.GetElement(index)));
-    oldItem = item;
-  }
-
-  setUpdatesEnabled(true);
-
-  setSelected(firstChild(), true);
-  executed(currentItem());
-}
-
-/** Is connected to the signal executed, which is emitted when a mew item was chosen. */
-void CSearchResultView::executed(QListViewItem* item){
-//  Q_ASSERT(item);
-//  qWarning("executed");
-  emit keySelected(item->text(0));
-}
-
-/** Reimplementation to show the popup menu. */
-void CSearchResultView::showPopup(KListView*, QListViewItem*, const QPoint& point){
-  m_popup->exec(point);
-}
-
-/** No descriptions */
-void CSearchResultView::printItems(){
-  QPtrList<QListViewItem> items = selectedItems();
-  CExportManager mgr(i18n("Print search result..."), true, i18n("Printing search result"));
-
-  PrintItemList list;
-  for (QListViewItem* k = items.first(); k; k = items.next()) {
-    list.append( QStringPair(k->text(0), QString::null) );
-  };
-  mgr.printKeyList( list, module() );
-}
-
-/** No descriptions */
-void CSearchResultView::saveItems(){
-  CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;  
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.saveKeyList( keys, CExportManager::Text, false);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created
-}
-
-/** No descriptions */
-void CSearchResultView::saveItemsWithText(){
-  CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.saveKeyList( keys, CExportManager::Text, true);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created
-}
-
-/** No descriptions */
-void CSearchResultView::copyItems(){
-  CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.copyKeyList( keys, CExportManager::Text, false);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created
-
-}
-
-/** No descriptions */
-void CSearchResultView::copyItemsWithText(){
-  CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.copyKeyList( keys, CExportManager::Text, true);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created  
-}
-
-/** Returns the module which is currently used. */
-CSwordModuleInfo* const CSearchResultView::module(){
-  return m_module;
-}
-
-QDragObject* CSearchResultView::dragObject() {
-  //return a valid DragObject to make DnD possible!
-
-  /*  
-  * First get all selected items and fill with them the dndItems list. The return the QDragObject we got from CDRagDropMgr
-  */
-  CDragDropMgr::ItemList dndItems;
-
-  QPtrList<QListViewItem> items = selectedItems();
-  for (items.first(); items.current(); items.next()) {
-    dndItems.append( CDragDropMgr::Item(m_module->name(), items.current()->text(0), QString::null) ); //no description
-  };
-      
-  return CDragDropMgr::dragObject(dndItems, viewport());
-};
-
-/********************************************
-************  ModuleResultList **************
-********************************************/
-
-CModuleResultView::CModuleResultView(QWidget* parent) : KListView(parent) {
-  initView();
-  initConnections();
-};
-
-CModuleResultView::~CModuleResultView() {
-
-};
-
-/** Initializes this widget. */
-void CModuleResultView::initView(){
-  addColumn(i18n("Module"));
-  addColumn(i18n("Found items"));
-  
-//  setFullWidth(true);
-  setSorting(0, true);
-  setSorting(1, true);
-  setAllColumnsShowFocus(true);
-
-
-  //setup the popup menu
-  m_popup = new KPopupMenu(this);
-//	m_popup->insertTitle(i18n("Bible window"));
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon);
- 	m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyResult()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.result);
- 	m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyResultWithText()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.resultWithText);
- 	m_actions.copyMenu->plug(m_popup);
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::searchdialog::result::moduleList::saveMenu::icon);
- 	m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveResult()), this);
- 	m_actions.saveMenu->insert(m_actions.save.result);
- 	m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveResultWithText()), this);
- 	m_actions.saveMenu->insert(m_actions.save.resultWithText);
- 	m_actions.saveMenu->plug(m_popup);
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::searchdialog::result::moduleList::printMenu::icon);
- 	m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printResult()), this);
- 	m_actions.printMenu->insert(m_actions.print.result);
-
-
-  m_actions.printMenu->plug(m_popup);  
-}
-
-/** Initializes the connections of this widget, */
-void CModuleResultView::initConnections(){
-  connect(this, SIGNAL(executed(QListViewItem*)),
-    SLOT(executed(QListViewItem*)));
-  connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-    this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&)));
-}
-
-/** Setups the tree using the given list of modules. */
-void CModuleResultView::setupTree( ListCSwordModuleInfo modules ){
-  clear();
-  QListViewItem* item = 0;
-  QListViewItem* oldItem = 0;
-  sword::ListKey result;
-  for (modules.first(); modules.current(); modules.next()) {
-		result = modules.current()->searchResult();
-		item = new KListViewItem(this, modules.current()->name(), QString::number(result.Count()) );
-		item->setPixmap(0,CToolClass::getIconForModule(modules.current()) );
-    oldItem = item;
-  };
-
-  setSelected(currentItem(), true);
-  executed(currentItem());
-}
-
-
-/** Is executed when an item was selected in the list. */
-void CModuleResultView::executed( QListViewItem* i ){
-  if (CSwordModuleInfo* m = CPointers::backend()->findModuleByName(i->text(0))) {
-    emit moduleChanged();
-    emit moduleSelected(m);
-  }
-}
-
-/** Returns the currently active module. */
-CSwordModuleInfo* const CModuleResultView::activeModule(){
-  Q_ASSERT(currentItem());
-  if (currentItem())
-    return CPointers::backend()->findModuleByName(currentItem()->text(0));
-  return 0;
-}
-
-/** No descriptions */
-void CModuleResultView::showPopup(KListView*, QListViewItem*, const QPoint& point){
-  //make sure that all entries have the correct status
-  m_popup->exec(point);
-}
-
-/** Copies the whole search result into the clipboard. */
-void CModuleResultView::copyResult(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-    mgr.copyKeyList(&result,m,CExportManager::Text,false);
-  };  
-}
-
-/** Copies the whole search result with the text into the clipboard. */
-void CModuleResultView::copyResultWithText(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-    mgr.copyKeyList(&result,m,CExportManager::Text,true);
-  };
-}
-
-/** Saves the search result keys. */
-void CModuleResultView::saveResult(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-    mgr.saveKeyList(&result,m,CExportManager::Text,false);
-  };  
-}
-
-/** Saves the search result with it's text. */
-void CModuleResultView::saveResultWithText(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-    mgr.saveKeyList(&result,m,CExportManager::Text,true);
-  };
-}
-
-/** Appends the whole search result to the printer queue. */
-void CModuleResultView::printResult(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Print search result..."), true, i18n("Printing search result"));
-    mgr.printKeyList(&result,m);
-  };
-}
-
-/********************************************
-**********  CSearchDialogResultPage *********
-********************************************/
-
-CSearchResultPage::CSearchResultPage(QWidget *parent, const char *name ) : QWidget(parent,name) {
-  initView();
-  initConnections();
-}
-
-CSearchResultPage::~CSearchResultPage(){
-
-}
-
-/** Initializes the view of this widget. */
-void CSearchResultPage::initView(){
-  QVBoxLayout* mainLayout = new QVBoxLayout(this);
-
-  QSplitter* splitter = new QSplitter(Vertical, this);
-  mainLayout->addWidget(splitter);
-
-//  QHBox* layoutBox = new QHBox(splitter);
-//  layoutBox->setSpacing(3);
-  QSplitter* hSplitter = new QSplitter(Horizontal, splitter);
-  m_moduleListBox = new CModuleResultView(hSplitter);
-//  m_moduleListBox->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
-//  layoutBox->setStretchFactor(m_moduleListBox, 0);
-  m_resultListBox = new CSearchResultView(hSplitter);
-  hSplitter->setResizeMode(m_moduleListBox, QSplitter::FollowSizeHint);
-  hSplitter->setResizeMode(m_resultListBox, QSplitter::Stretch);
-
-//  layoutBox->setStretchFactor(m_resultListBox, 5);  
-
-  m_previewDisplay = CDisplay::createReadInstance(0, splitter);  
-
-  m_moduleListBox->resize(m_moduleListBox->sizeHint());
-  splitter->setResizeMode(hSplitter, QSplitter::KeepSize);
-  splitter->setResizeMode(m_previewDisplay->view(), QSplitter::Stretch);
-  
-  m_analyseButton = new QPushButton(i18n("Show search analysis"), this);
-  connect(m_analyseButton, SIGNAL(clicked()),
-    this, SLOT(showAnalysis()));
-  mainLayout->addSpacing(5);
-  mainLayout->addWidget(m_analyseButton);
-}
-
-/** Sets the modules which contain the result of each. */
-void CSearchResultPage::setSearchResult(ListCSwordModuleInfo modules){
-  reset(); //clear current modules
-  
-  m_modules = modules;
-  m_moduleListBox->setupTree(modules);
-  m_moduleListBox->setMinimumWidth(m_moduleListBox->sizeHint().width());
-  m_moduleListBox->adjustSize();
-//  m_moduleListBox->parentWidget()->adjustSize();
-
-  
-  //have a Bible or commentary in the modules?
-  bool enable = false;
-  for (modules.first(); !enable && modules.current(); modules.next()) {
-    if (modules.current()->type() == CSwordModuleInfo::Bible ) {
-      enable = true;
-    };
-  };
-  m_analyseButton->setEnabled(enable);
-}
-
-
-/** Resets the current list of modules and the displayed list of found entries. */
-void CSearchResultPage::reset(){
-  m_moduleListBox->clear();
-  m_resultListBox->clear();
-  m_previewDisplay->setText(QString::null);
-  m_analyseButton->setEnabled(false);
-  m_modules.setAutoDelete(false); //make sure we don't delete modules accidentally
-  m_modules.clear();
-}
-
-
-/** Update the preview of the selected key. */
-void CSearchResultPage::updatePreview(const QString& key){
-  if ( CSwordModuleInfo* module = m_moduleListBox->activeModule() ) {
-  	if (CEntryDisplay* display = module->getDisplay()) {	//do we have a display object?
-      ListCSwordModuleInfo moduleList;
-      moduleList.append(module);
-
-      //mark the searched text part
-      const QString searchedText = CSearchDialog::getSearchDialog()->searchText();
-      const int searchFlags = CSearchDialog::getSearchDialog()->searchFlags();            
-      const QString content = display->text( moduleList, key, CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() );
-
-      const QString text = highlightSearchedText(content, searchedText, searchFlags);
-      
-   		m_previewDisplay->setText( text );
-      m_previewDisplay->moveToAnchor( key );      
-  	}	
-    else
-      m_previewDisplay->setText(QString::null);
-  }
-}
-
-const QString CSearchResultPage::highlightSearchedText(const QString& content, const QString& searchedText, const int searchFlags) {
-  QString ret = content;
-  const bool cs = (searchFlags & CSwordModuleSearch::caseSensitive);
-
-  int index = 0;
-  int length = searchedText.length();
-
-  const QString rep1 = QString::fromLatin1("<B STYLE=\"background-color:#FFFF66;\">");
-  const QString rep2 = QString::fromLatin1("</B>");
-  const unsigned int repLength = rep1.length() + rep1.length();
-
-  
-  if (searchFlags & CSwordModuleSearch::exactPhrase) { //exact phrase matching      
-    while ( (index = ret.find(searchedText, index, cs)) != -1 ) {
-      if (!CToolClass::inHTMLTag(index, ret)) {
-        ret = ret.insert( index+length, rep2 );
-        ret = ret.insert( index, rep1 );
-        index += repLength;
-      }
-      index += repLength;
-    };
-  }
-  else if (searchFlags & CSwordModuleSearch::multipleWords) { //multiple words
-    QStringList words = QStringList::split(" ", searchedText);
-    for ( int wi = 0; (unsigned int)wi < words.count(); ++wi ) { //search for every word in the list
-      QString word = words[ wi ];
-      length = word.length();
-      index = 0; //for every word start at the beginning
-      while ( (index = ret.find(word, index, cs)) != -1 ) { //while we found the word
-        if (!CToolClass::inHTMLTag(index, ret)) {
-          ret = ret.insert( index+length, rep2 );
-          ret = ret.insert( index, rep1 );
-          index += repLength;
-        }
-        index += length;
-      }
-    }
-  }
-  else { //multiple words or regular expression
-    //use re as regular expression and replace any occurences
-    QRegExp regExp( searchedText, cs );
-    regExp.setMinimal( true );
-
-    while ( (index = regExp.search(ret, index)) != -1 ) {
-      if (!CToolClass::inHTMLTag(index, ret)) {
-        ret = ret.insert( index + regExp.matchedLength(), rep2 );
-        ret = ret.insert( index, rep1 );
-        index += regExp.matchedLength() + repLength;          
-      }
-      index += length;
-    }
-  }
-
-  return ret; //not implemented yet
-};
-
-/** Initializes the signal slot conections of the child widgets, */
-void CSearchResultPage::initConnections(){
-  connect(m_resultListBox, SIGNAL(keySelected(const QString&)),
-    this, SLOT(updatePreview(const QString&)));
-  connect(m_moduleListBox, SIGNAL(moduleSelected(CSwordModuleInfo*)),
-    m_resultListBox, SLOT(setupTree(CSwordModuleInfo*)));
-  connect(m_moduleListBox, SIGNAL(moduleChanged()),
-    m_previewDisplay->connectionsProxy(), SLOT(clear()));
-}
-
-/** Shows a dialog with the search analysis of the current search. */
-void CSearchResultPage::showAnalysis(){
-  CSearchAnalysisDialog dlg(m_modules, this);
-  dlg.exec();
-}
-
-/*************************/
-
-CSearchOptionsPage::CSearchOptionsPage(QWidget *parent, const char *name ) : QWidget(parent,name) {
-  initView();
-  readSettings();
-}
-
-CSearchOptionsPage::~CSearchOptionsPage() {
-  saveSettings();
-}
-
-/** Returns the search text set in this page. */
-const QString CSearchOptionsPage::searchText() {
-  // we emulate OR by RegExp
-  if (m_multipleWordsORRadio->isChecked()) {
-    QString regexp(m_searchTextCombo->currentText());
-    regexp = regexp.simplifyWhiteSpace();
-    regexp.replace( QRegExp("\\s+"), "|" ); //replace one or more white spaces with regexp's OR marker
-    return regexp;
-  }
-  return m_searchTextCombo->currentText();
-}
-
-/** Sets the search text used in the page. */
-void CSearchOptionsPage::setSearchText(const QString& text) {
-  bool found = false;
-  int i = 0;
-	for (i = 0; !found && i < m_searchTextCombo->count(); ++i) {
-		if (m_searchTextCombo->text(i) == text) {
-			found = true;
-    }
-	}
-
-	if (!found) {
-    i = 0;
-		m_searchTextCombo->insertItem( text,0 );
-	}
-
-  m_searchTextCombo->setCurrentItem(i);
-  m_searchTextCombo->reset();
-	m_searchTextCombo->setFocus();	
-}
-
-/** Initializes this page. */
-void CSearchOptionsPage::initView(){
-  QGridLayout* grid = new QGridLayout(this,11,3);
-  grid->setSpacing(3);
-
-	QGroupBox* box1 = new QGroupBox(2, Qt::Horizontal , i18n("Main search parameters"), this);
-  grid->addMultiCellWidget(box1, 0,1,0,2);
-
-  m_modulesLabel = new QLabel(box1);
-  m_modulesLabel->setTextFormat(Qt::RichText);
-  m_modulesLabel->setAlignment( AlignLeft | WordBreak );
-
-  m_chooseModulesButton = new QPushButton(i18n("Choose modules"), box1);
-  connect(m_chooseModulesButton, SIGNAL(clicked()),
-	  this, SLOT(chooseModules()));
-  QToolTip::add(m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::tooltip);
-  QWhatsThis::add(m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::whatsthis);
-
-  QLabel* label = new QLabel(box1);
-  label->setText(i18n("Search text:"));
-  m_searchTextCombo = new KHistoryCombo(box1);
-  label->setAutoResize(true);
-
-  m_searchTextCombo->setInsertionPolicy( QComboBox::AtBottom );
-  m_searchTextCombo->setMaxCount(25);
-  m_searchTextCombo->setDuplicatesEnabled(false);
-  m_searchTextCombo->setFocusPolicy(QWidget::WheelFocus);
-  connect( m_searchTextCombo, SIGNAL(activated( const QString& )),
-    m_searchTextCombo, SLOT( addToHistory( const QString& ))
-  );
-  connect( m_searchTextCombo, SIGNAL(returnPressed ( const QString& )),
-    m_searchTextCombo, SLOT(addToHistory(const QString&))
-  );
-
-  QToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip);
-  QWhatsThis::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::whatsthis);
-  
-  QButtonGroup* group  = new QButtonGroup(4, Vertical,i18n("Search type"), this);
-    
-  m_multipleWordsRadio = new QRadioButton(i18n("Multiple words (AND)"), group);
-  m_multipleWordsRadio->setChecked( true );
-  QToolTip::add(m_multipleWordsRadio, CResMgr::searchdialog::options::searchType::multipleWords_and::tooltip);
-  QWhatsThis::add(m_multipleWordsRadio, CResMgr::searchdialog::options::searchType::multipleWords_and::whatsthis);
-
-  
-  m_multipleWordsORRadio =  new QRadioButton(i18n("Multiple words (OR)"), group);
-  QToolTip::add(m_multipleWordsORRadio, CResMgr::searchdialog::options::searchType::multipleWords_or::tooltip);
-  QWhatsThis::add(m_multipleWordsORRadio, CResMgr::searchdialog::options::searchType::multipleWords_or::whatsthis);
-  
-  m_exactTextRadio = new QRadioButton(i18n("Exact"), group);
-  QToolTip::add(m_exactTextRadio, CResMgr::searchdialog::options::searchType::exactMatch::tooltip);
-  QWhatsThis::add(m_exactTextRadio, CResMgr::searchdialog::options::searchType::exactMatch::whatsthis);
-  
-  m_regexpRadio = new QRadioButton(i18n("Regular expression"), group);
-  QToolTip::add(m_regexpRadio, CResMgr::searchdialog::options::searchType::regExp::tooltip);
-  QWhatsThis::add(m_regexpRadio, CResMgr::searchdialog::options::searchType::regExp::whatsthis);
-
-  grid->addWidget(group, 4,0);
-
-  group = new QButtonGroup(1,Vertical,i18n("Search options"), this);
-  m_caseSensitiveBox = new QCheckBox(i18n("Case sensitive search"), group);
-  QToolTip::add(m_caseSensitiveBox, CResMgr::searchdialog::options::searchOptions::caseSensitive::tooltip);
-  QWhatsThis::add(m_caseSensitiveBox, CResMgr::searchdialog::options::searchOptions::caseSensitive::whatsthis);
-
-  grid->addWidget(group, 4,2);
-
-	QGroupBox* box2 = new QGroupBox(2, Qt::Horizontal , i18n("Search scope"), this);
-  grid->addMultiCellWidget(box2, 6,7,0,2);
-
-  m_rangeChooserCombo = new KComboBox(box2);
-  QToolTip::add(m_rangeChooserCombo, CResMgr::searchdialog::options::chooseScope::tooltip);
-  QWhatsThis::add(m_rangeChooserCombo, CResMgr::searchdialog::options::chooseScope::whatsthis);
-
-  refreshRanges();  
-  m_chooseRangeButton = new QPushButton(i18n("Setup custom ranges"), box2);
-  connect(m_chooseRangeButton, SIGNAL(clicked()),
-    this, SLOT(setupRanges()));
-  
-  grid->setRowStretch(8,5);
-
-	QGroupBox* box3 = new QGroupBox(2, Qt::Horizontal , i18n("Search progress"), this);
-  grid->addMultiCellWidget(box3, 9,10,0,2);
-
-
-  label = new QLabel(i18n("Current module:"), box3);
-	m_currentProgressBar = new KProgress(box3);
-
-  label = new QLabel(i18n("All modules:"), box3);
-	m_overallProgressBar = new KProgress(box3);
-
-  //set the initial focus
-  m_searchTextCombo->setFocus();
-}
-
-/** Sets the modules used by the search. */
-void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) {
-  QString t = i18n("Searching in: ");
-
-  m_modules.clear(); //remove old modules
-  // We make sure that a module is only one time in the list, e.g. if two display windows of the same module are opened
-  CSwordModuleInfo* current = modules.first();
-  while (current) {
-    if ( !m_modules.containsRef(current) ) {
-      m_modules.append( current );                     
-                         
-      t += current->name();
-      if (current != modules.getLast()) {
-        t += QString::fromLatin1(", ");
-      }
-    }
-    current = modules.next(); //next modules
-  };
-
-  m_modulesLabel->setText(t);
-}
-
-/** Opens the modules chooser dialog. */
-void CSearchOptionsPage::chooseModules(){
-  CModuleChooserDialog* dlg = new CModuleChooserDialog(this, modules());
-  connect(dlg, SIGNAL(modulesChanged(ListCSwordModuleInfo)),
-    this, SLOT(setModules(ListCSwordModuleInfo)));
-  dlg->exec();
-}
-
-/** Returns the list of used modules. */
-const ListCSwordModuleInfo CSearchOptionsPage::modules(){
-  return m_modules;
-}
-
-/** Prepares the stuff which is required for a search, e.g. setting back the percentage bars. */
-void CSearchOptionsPage::prepareSearch(){
-	m_overallProgressBar->setProgress(0);
-	m_currentProgressBar->setProgress(0);
-}
-
-/** Sets the value for the "curret module" progress bar. */
-void CSearchOptionsPage::setCurrentModuleProgress( const int progress ){
-	m_currentProgressBar->setProgress(progress);
-}
-
-/** Sets the progress for the "all modules" bar. */
-void CSearchOptionsPage::setOverallProgress( const int progress ){
-	m_overallProgressBar->setProgress(progress);
-}
-
-/** Return the selected search type,. */
-const int CSearchOptionsPage::searchFlags() {
-	int ret = CSwordModuleSearch::multipleWords;	//"multiple words" is standard
-	if (m_exactTextRadio->isChecked()) {
-		ret = CSwordModuleSearch::exactPhrase;
-	}
-	else if (m_regexpRadio->isChecked() || m_multipleWordsORRadio->isChecked()) {
-		ret = CSwordModuleSearch::regExp;
-	}
-	if (m_caseSensitiveBox->isChecked())
-	  ret |= CSwordModuleSearch::caseSensitive;
-	return ret;
-}
-
-/** Sets all options back to the default. */
-void CSearchOptionsPage::reset(){
-  m_multipleWordsRadio->setChecked(true);
-  m_rangeChooserCombo->setCurrentItem(0); //no scope
-  m_searchTextCombo->clearEdit();
-}
-
-/** Reads the settings for the searchdialog from disk. */
-void CSearchOptionsPage::saveSettings(){
-	CBTConfig::set(CBTConfig::searchCompletionTexts, m_searchTextCombo->completionObject()->items());
-	CBTConfig::set(CBTConfig::searchTexts, m_searchTextCombo->historyItems());	
-}
-
-/** Reads the settings of the last searchdialog session. */
-void CSearchOptionsPage::readSettings(){
-	m_searchTextCombo->completionObject()->setItems( CBTConfig::get(CBTConfig::searchCompletionTexts) );
-	m_searchTextCombo->setHistoryItems( CBTConfig::get(CBTConfig::searchTexts) );
-}
-
-void CSearchOptionsPage::aboutToShow(){
-  m_searchTextCombo->setFocus();
-}
-
-/** No descriptions */
-void CSearchOptionsPage::setupRanges(){
-  CRangeChooserDialog* chooser = new CRangeChooserDialog(this);
-  chooser->exec();
-
-  refreshRanges();
-}
-
-/** refreshes the listof ranges and the range combobox. */
-void CSearchOptionsPage::refreshRanges(){
-  //the first two options are fixed, the others can be edited using the "Setup ranges" button.
-  m_rangeChooserCombo->clear();
-  m_rangeChooserCombo->insertItem(i18n("No search scope"));
-  m_rangeChooserCombo->insertItem(i18n("Last search result"));
-
-  //insert the user-defined ranges
-  CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-  CBTConfig::StringMap::Iterator it;
-  for (it = map.begin(); it != map.end(); ++it) {
-    m_rangeChooserCombo->insertItem(it.key());
-  };
-}
-
-/** Returns the selected search scope if a search scope was selected. */
-sword::ListKey CSearchOptionsPage::searchScope(){
-  if (m_rangeChooserCombo->currentItem() > 1) { //neither "No Scope" nor "Last search result"
-    CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-    QString scope = map[ m_rangeChooserCombo->currentText() ];
-    if (!scope.isEmpty())
-      return sword::VerseKey().ParseVerseList( scope.local8Bit(), "Genesis 1:1", true);
-  };
-  return sword::ListKey();
-}
-
-/** Returns the selected scope type. */
-const CSwordModuleSearch::scopeType CSearchOptionsPage::scopeType(){
-  if (m_rangeChooserCombo->currentItem() == 0) {
-    return CSwordModuleSearch::Scope_NoScope;
-  }
-  else if (m_rangeChooserCombo->currentItem() == 1) {
-    return CSwordModuleSearch::Scope_LastSearch;
-  }
-  else {
-    return CSwordModuleSearch::Scope_Bounds;
-  };
-  return CSwordModuleSearch::Scope_NoScope;
-}
-
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.h b/bibletime/frontend/searchdialog/csearchdialogpages.h
deleted file mode 100644
index 8dd9fb2..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogpages.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/***************************************************************************
-                          csearchdialogpages.h  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSEARCHDIALOGPAGES_H
-#define CSEARCHDIALOGPAGES_H
-
-//BibleTime includes
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-#include "backend/cswordmodulesearch.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <klistview.h>
-
-//forward declarations
-class QLabel;
-class QCheckBox;
-class QPushButton;
-class QRadioButton;
-
-class KComboBox;
-class KActionMenu;
-class KAction;
-class KHistoryCombo;
-class KProgress;
-class KPopupMenu;
-
-class CReadDisplay;
-
-class CModuleResultView : public KListView {
-  Q_OBJECT
-public:
-  CModuleResultView(QWidget* parent);
-  ~CModuleResultView();
-  /**
-  * Setups the tree using the given list of modules.
-  */
-  void setupTree( ListCSwordModuleInfo modules );
-  /**
-  * Returns the currently active module.
-  */
-  CSwordModuleInfo* const activeModule();
-
-protected: // Protected methods
-  /**
-  * Initializes this widget.
-  */
-  void initView();
-  /**
-  * Initializes the connections of this widget
-  */
-  void initConnections();
-
-protected slots: // Protected slots
-  /**
-  * Is executed when an item was selected in the list.
-  */
-  void executed( QListViewItem* );
-  /**
-  * Copies the whole search result with the text into the clipboard.
-  */
-  void copyResultWithText();
-  /**
-  * Copies the whole search result into the clipboard.
-  */
-  void copyResult();
-  /**
-  * This slot opens the popup menu at the given position
-  */
-  void showPopup(KListView*, QListViewItem*, const QPoint&);
-  /**
-  * Appends the whole search result to the printer queue.
-  */
-  void printResult();
-  /**
-  * Saves the search result with it's text.
-  */
-  void saveResultWithText();
-  /**
-  * Saves the search result keys.
-  */
-  void saveResult();
-
-signals:
-  void moduleSelected(CSwordModuleInfo*);
-  void moduleChanged();
-
-private:
-  struct {
-    KActionMenu* saveMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } save;
-    
-    KActionMenu* printMenu;
-    struct {
-      KAction* result;
-    } print;
-    
-    KActionMenu* copyMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } copy;
-    
-  } m_actions;
-  KPopupMenu* m_popup;
-};
-
-class CSearchResultView  : public KListView {
-  Q_OBJECT
-public:
-  CSearchResultView(QWidget* parent);
-  virtual ~CSearchResultView();
-  /** Returns the module which is currently used. */
-  CSwordModuleInfo* const module();
-
-protected: // Protected methods
-  /**
-  * Initializes the view of this widget.
-  */
-  void initView();
-  void initConnections();
-  virtual QDragObject* dragObject();
-  
-public slots: // Public slots
-  void saveItems();
-  /**
-  * Setups the list with the given module.
-  */
-  void setupTree(CSwordModuleInfo*);
-  void copyItemsWithText();
-  void copyItems();
-  void saveItemsWithText();
-  /**
-  * Reimplementation to show the popup menu.
-  */
-  virtual void showPopup(KListView*, QListViewItem* i, const QPoint& point);
-
-protected slots: // Protected slots
-  void printItems();
-  /**
-  * Is connected to the signal executed, which is emitted when a mew item was chosen.
-  */
-  void executed(QListViewItem*);
-
-private:
-  struct {
-    KActionMenu* saveMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } save;
-
-    KActionMenu* printMenu;
-    struct {
-      KAction* result;
-    } print;
-
-    KActionMenu* copyMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } copy;
-  } m_actions;
-  KPopupMenu* m_popup;  
-  CSwordModuleInfo* m_module;
-  
-signals: // Signals
-  void keySelected(const QString&);  
-};
-
-
-/** The page of the search dialog which contains the search result part.
-  * @author The BibleTime team
-  */
-class CSearchResultPage : public QWidget  {
-   Q_OBJECT
-public:
-	CSearchResultPage(QWidget *parent=0, const char *name=0);
-	~CSearchResultPage();
-  /**
-  * Sets the modules which contain the result of each.
-  */
-  void setSearchResult(ListCSwordModuleInfo modules);
-
-public slots: // Public slots
-  /**
-  * Resets the current l�ist of modules and the displayed list of found entries.
-  */
-  void reset();
-
-protected: // Protected methods
-  /**
-  * Initializes the view of this widget.
-  */
-  void initView();
-  /**
-  * Initializes the signal slot conections of the child widgets
-  */
-  void initConnections();
-  /**
-  * This function highlights the searched text in the content using the search type given by search flags
-  */
-  const QString highlightSearchedText(const QString& content, const QString& searchedText, const int searchFlags);
-
-private:
-  CModuleResultView* m_moduleListBox;
-  CSearchResultView* m_resultListBox;
-  CReadDisplay* m_previewDisplay;
-  ListCSwordModuleInfo m_modules;
-  QPushButton* m_analyseButton;
-
-protected slots: // Protected slots
-  /**
-  * Update the preview of the selected key.
-  */
-  void updatePreview(const QString& key);
-  /**
-  * Shows a dialog with the search analysis of the current search.
-  */
-  void showAnalysis();
-};
-
-class CSearchOptionsPage : public QWidget  {
-   Q_OBJECT
-public:
-	CSearchOptionsPage(QWidget *parent=0, const char *name=0);
-	~CSearchOptionsPage();
-  /**
-  * Sets the search text used in the page.
-  */
-  void setSearchText(const QString& text);
-  /**
-  * Returns the search text set in this page.
-  */
-  const QString searchText();
-  /**
-  * Returns the list of used modules.
-  */
-  const ListCSwordModuleInfo modules();
-  /**
-  * Prepares the stuff which is required for a search, e.g. setting back the percentage bars.
-  */
-  void prepareSearch();
-  /**
-  * Return the selected search type,.
-  */
-  const int searchFlags();
-  /**
-  * Sets all options back to the default.
-  */
-  void reset();
-  /**
-  * Returns the selected search scope if a search scope was selected.
-  */
-  sword::ListKey searchScope();
-  /**
-  * Returns the selected scope type.
-  */
-  const CSwordModuleSearch::scopeType scopeType();
-
-private:
-  QLabel* m_modulesLabel;
-  KHistoryCombo* m_searchTextCombo;
-  QPushButton* m_chooseModulesButton;
-  ListCSwordModuleInfo m_modules;
-
-  KComboBox* m_rangeChooserCombo;
-  QPushButton* m_chooseRangeButton;
-  QRadioButton* m_multipleWordsRadio;
-  QRadioButton* m_exactTextRadio;
-  QRadioButton* m_regexpRadio;
-  QRadioButton* m_multipleWordsORRadio;
-  QCheckBox* m_caseSensitiveBox;
-  KProgress* m_currentProgressBar;
-  KProgress* m_overallProgressBar;
-
-protected: // Protected methods
-  /**
-  * Initializes this page.
-  */
-  void initView();
-  /**
-  * Reads the settings of the last searchdialog session.
-  */
-  void readSettings();
-  /**
-  * Reads the settings for the searchdialog from disk.
-  */
-  void saveSettings();
-
-public slots: // Public slots
-  /**
-  * Sets the modules used by the search.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-  /**
-  * Sets the progress for the "all modules" bar.
-  */
-  void setOverallProgress( const int );
-  /**
-  * Sets the value for the "curret module" progress bar.
-  */
-  void setCurrentModuleProgress( const int );
-  void aboutToShow();
-  /** refreshes the listof ranges and the range combobox. */
-  void refreshRanges();
-  /**
-   * Opens the modules chooser dialog.
-   */
-  void chooseModules();
-  
-protected slots: // Protected slots  
-  void setupRanges();
-};
-
-#endif
diff --git a/bibletime/main.cpp b/bibletime/main.cpp
deleted file mode 100644
index e3a13f5..0000000
--- a/bibletime/main.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/***************************************************************************
-                          main.cpp  -  The file containing main ;-)
-                             -------------------
-    begin                : Mit Jan 19 12:57:15 CET 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
-	
-/* $Header: /cvsroot/bibletime/bibletime/bibletime/main.cpp,v 1.103 2004/01/05 12:43:55 joachim Exp $ */
-/* $Revision: 1.103 $ */
-
-//standard includes
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-
-//own includes
-#include "bibletimeapp.h"
-#include "bibletime.h"
-#include "config.h"
-
-//util includes
-#include "util/scoped_resource.h"
-#include "util/cresmgr.h"
-
-//frontend includes
-#include "frontend/kstartuplogo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qdir.h>
-
-//KDE includes
-#include <kcmdlineargs.h>
-#include <kcrash.h>
-#include <kglobal.h>
-#include <kapplication.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-#include <klocale.h>
-
-#include <kmessagebox.h>
-
-bool showDebugMessages = false;
-BibleTime* bibletime_ptr = 0;
-
-void myMessageOutput( QtMsgType type, const char *msg ) {	
-	//we use this messagehandler to switch debugging off in final releases
-	switch ( type ) {
-		case QtDebugMsg:
-			if (showDebugMessages)	//only show messages if they are enabled!
-				fprintf( stderr,"(BibleTime %s) Debug: %s\n",VERSION, msg );
-			break;
-		case QtWarningMsg:
-			//if (showDebugMessages) //comment out for releases so users don't get our debug warnings
-				fprintf( stderr,"(BibleTime %s) WARNING: %s\n",VERSION, msg );
-			break;
-		case QtFatalMsg:
-			fprintf( stderr,"(BibleTime %s) _FATAL_: %s\nPlease contact info@bibletime.de and report this bug!",VERSION, msg );
-			abort();	// dump core on purpose
-	}
-}
-
-extern "C" {
-	static void setSignalHandler(void (*handler)(int));
-
-	// Crash recovery signal handler
-	static void signalHandler(int sigId) {
-		setSignalHandler(SIG_DFL);
-		fprintf(stderr, "*** BibleTime got signal %d (Exiting)\n", sigId);
-		// try to cleanup all windows
-    if (CBTConfig::get(CBTConfig::crashedLastTime)) {
-      //crashed this time and the execution before this one, probably a bug which occurs every time
-      CBTConfig::set(CBTConfig::crashedTwoTimes, true);
-    }
-    else {
-      //try to restore next time.
-      CBTConfig::set(CBTConfig::crashedLastTime, true);
-    }
-    if (bibletime_ptr) {
-      bibletime_ptr->saveSettings();
-			fprintf(stderr, "*** Saving seemed to be succesful. If restoring does not work on next startup \
-please use the option --ignore-session\n");
-		}
-		::exit(-1); //exit BibleTime
-	}
-
-	// Crash recovery signal handler
-	static void crashHandler(int sigId) {
-		setSignalHandler(SIG_DFL);
-		fprintf(stderr, "*** BibleTime got signal %d (Crashing). Trying to save settings.\n", sigId);
-    if (CBTConfig::get(CBTConfig::crashedLastTime)) {
-      //crashed this time and the execution before this one, probably a bug which occurs every time
-      CBTConfig::set(CBTConfig::crashedTwoTimes, true);
-    }
-    else {
-      //try to restore next time.
-      CBTConfig::set(CBTConfig::crashedLastTime, true);
-    }
-    if (bibletime_ptr) {
-			bibletime_ptr->saveSettings();
-			fprintf(stderr, "*** Saving seemed to be succesful. If restoring does not work on next startup \
-please use the option --ignore-session\n");
-		}
-		// Return to DrKonqi.
-	}
-
-	static void setSignalHandler(void (*handler)(int)) {
-		signal(SIGKILL, handler);
-		signal(SIGTERM, handler);
-		signal(SIGHUP,  handler);
-		KCrash::setEmergencySaveFunction(crashHandler);
-	}
-}
-
-int main(int argc, char* argv[]) {
-	qInstallMsgHandler( myMessageOutput );
-
-	//create about data for this application
-	static KCmdLineOptions options[] =
-	{
-		{"debug", I18N_NOOP("Enable debug messages"),0},
-		{"ignore-session", I18N_NOOP("Ignore the startup session that was saved when BibleTime was closed the last time."),0},
-		{"open-default-bible <key>", I18N_NOOP("Open the default bible with the given key. Use <random> to open at a random position."),0},
-		//{"install-local <path>", I18N_NOOP("Open the SwordSetup dialog to install modules from <path>"),0},
-		{0,0,0}
-	};
-
-	KAboutData aboutData(
-		PACKAGE,
-		"BibleTime",
-		VERSION,
-		I18N_NOOP("Bible study tool for KDE"),
-		KAboutData::License_GPL_V2,
-		I18N_NOOP("(c)1999-2003, The BibleTime Team"),
-		I18N_NOOP("BibleTime is an easy to use but powerful Bible study tool for KDE.\n\n\
-We are looking for developers and translators.\n\
-If you'd like to join our team, please send an email to info@bibletime.info."),
-		"http://www.bibletime.info/",
-		"info@bibletime.info"
-	);
-
-  /***********************************************
-  *    Active developers (sorted by last name)   *
-  ************************************************/
-  // Project coordination
-	aboutData.addAuthor("Joachim Ansorg", I18N_NOOP("Project coordinator"),"junkmail@joachim.ansorgs.de","joachim.ansorgs.de");
-  // Second main developer
-	aboutData.addAuthor("Martin Gruner", I18N_NOOP("Frontend, backend"), "mg.pub@gmx.net", "");
-  // and / or search for multiple words, other fixes and improvements
-  aboutData.addAuthor("Nikolay Igotti", I18N_NOOP("Frontend"), "olonho@hotmail.com", "");
-  // comitted search in default bible, opened modules, other smaller things
-  aboutData.addAuthor("Gary Sims", I18N_NOOP("Frontend"), "gary@garysims.co.uk", "");
-	// artwork
-	aboutData.addAuthor("Timothy R. Butler", I18N_NOOP("Icons, startlogo, webpage"), "tbutler@uninetsolutions.com", "www.uninetsolutions.com");
-	aboutData.addAuthor("James Ots", I18N_NOOP("Crystal icons, crystal startlogo, webpage"), "me@jamesots.com", "www.jamesots.com");
-  // documentation
-	aboutData.addAuthor("Fred Saalbach", I18N_NOOP("Documentation"), "saalbach@sybercom.net", "");
-
-  //inactiv
-//	aboutData.addAuthor("Mark Lybarger", 	I18N_NOOP("Searchdialog"), 				"mlybarge@insight.rr.com","");
-//	aboutData.addAuthor("Chris Kujawa", 	I18N_NOOP("Frontend"),"christopher.kujawa@verizon.net", "");
-//	aboutData.addAuthor("Luke Mauldin", 	I18N_NOOP("Frontend"),"lukeskyfly@txk.net", "");
-//	aboutData.addAuthor("Tim Brodie", 	  I18N_NOOP("Installation manager"),"tbrodie@displayworksinc.com", "");
-
-  /***********************************************
-  *        Credits (sorted by last name)         *
-  ************************************************/
-  //Sponsored many years the www.bibletime.de domain!
-  aboutData.addCredit("Thomas Hagedorn",   I18N_NOOP("Sponsored our internet domain for many years"), "tom@theta-consulting.de", "");
-  //He provided us with the Bible Study HowTo
-  aboutData.addCredit("Bob Harman",        I18N_NOOP("Bible Study HowTo"), "ncc@ncchampton.org", "");
-  // Language codes iso639-1, iso639-2 and SIL language codes
-  aboutData.addCredit("SIL International", I18N_NOOP("Language codes and names"), "", "http://www.ethnologue.com/iso639");
-
-//special message so the translator get his credits in the about box, don't remove this!
-  QString dummy = I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"); //translator's name
-  dummy = I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"); //translators eMail
-
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	BibleTimeApp app;
-	KGlobal::dirs()->addResourceType("BT_pic", "share/apps/bibletime/pics/");
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-	// A binary option (on / off)
-	if (args->isSet("debug")) {
-		showDebugMessages = true;
-  }
-
-  //since we don't support session management at the moment we disable this. Only leads to troubles.
-/*
-  if (kapp->isRestored()){
-		for(int n = 1; KMainWindow::canBeRestored(n); n++) {
-			(new BibleTime)->restore(n);
-    }
-
-    RESTORE( BibleTime )
-  }
-	else {
-*/
-		const bool showIt = CBTConfig::get(CBTConfig::logo);
-
-		if(showIt) {
-			KStartupLogo::createSplash();
-			KStartupLogo::showSplash();
-			KStartupLogo::setStatusMessage( i18n("Starting BibleTime") + QString::fromLatin1("...") );
-		}
-
-    setSignalHandler(signalHandler);
-
-    //compatibility stuff for 1.3, needs to be moved to better place later
-		if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) {
-      KStandardDirs stdDirs;
-      QDir dir(stdDirs.saveLocation("data", "bibletime/"));
-      if (!dir.exists("sessions/") && dir.exists("profiles/")) { //only old dir exists
-        dir.rename("profiles", "sessions");
-      }
-    }
-
-		util::scoped_ptr<BibleTime> bibletime( new BibleTime() );
-		bibletime_ptr = bibletime.get();
-
-		// a new BibleTime version was installed (maybe a completely new installation)
-		if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) {
-      KStartupLogo::hideSplash();
-
-      CBTConfig::set(CBTConfig::bibletimeVersion, VERSION);
-			bibletime->slotSettingsOptions();
-		}
-
-		//The tip of the day
-		if (CBTConfig::get(CBTConfig::tips)) {
-      KStartupLogo::hideSplash();
-			bibletime->slotHelpTipOfDay();
-    }
-
-    // restore the workspace and process command line options
-    app.setMainWidget(bibletime);
-    bibletime->show();
-    bibletime->processCommandline(); //must be done after the bibletime window is visible
-
-    if (showIt) {
-			KStartupLogo::hideSplash();
-			KStartupLogo::deleteSplash();
-		}
-
-    return app.exec();
-//	}
-}
-
diff --git a/bibletime/pics/16x16/Makefile.am b/bibletime/pics/16x16/Makefile.am
deleted file mode 100644
index 59dce74..0000000
--- a/bibletime/pics/16x16/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi16-action-bt_book.png hi16-action-bt_bible.png hi16-action-bt_book_add.png hi16-action-bt_cascade_auto.png hi16-action-bt_cascade.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_commentary.png hi16-action-bt_displaytranslit.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_lexicon.png hi16-action-bt_swordconfig.png hi16-action-bt_sync.png hi16-action-bt_tile_auto.png hi16-action-bt_tile.png hi16-app-bibletime.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book_locked.png
-
-KDE_ICON = bt_book bt_bible bt_book_add bt_cascade_auto bt_cascade bt_commentary_add bt_commentary_locked bt_displayconfig bt_commentary bt_displaytranslit bt_lexicon_add bt_lexicon_locked bt_startconfig bt_lexicon bt_swordconfig bt_sync bt_tile_auto bt_tile bibletime bt_bible_add bt_bible_locked bt_book_locked
-\ No newline at end of file
diff --git a/bibletime/pics/16x16/Makefile.in b/bibletime/pics/16x16/Makefile.in
deleted file mode 100644
index 4bd05a2..0000000
--- a/bibletime/pics/16x16/Makefile.in
+++ /dev/null
@@ -1,550 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi16-action-bt_book.png hi16-action-bt_bible.png hi16-action-bt_book_add.png hi16-action-bt_cascade_auto.png hi16-action-bt_cascade.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_commentary.png hi16-action-bt_displaytranslit.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_lexicon.png hi16-action-bt_swordconfig.png hi16-action-bt_sync.png hi16-action-bt_tile_auto.png hi16-action-bt_tile.png hi16-app-bibletime.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book_locked.png
-
-KDE_ICON = bt_book bt_bible bt_book_add bt_cascade_auto bt_cascade bt_commentary_add bt_commentary_locked bt_displayconfig bt_commentary bt_displaytranslit bt_lexicon_add bt_lexicon_locked bt_startconfig bt_lexicon bt_swordconfig bt_sync bt_tile_auto bt_tile bibletime bt_bible_add bt_bible_locked bt_book_locked
-subdir = bibletime/pics/16x16
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/16x16/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/16x16/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 50
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/hi16-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/16x16/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible.png b/bibletime/pics/16x16/hi16-action-bt_bible.png
deleted file mode 100644
index 59e09c2..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_add.png b/bibletime/pics/16x16/hi16-action-bt_bible_add.png
deleted file mode 100644
index a90a655..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_locked.png b/bibletime/pics/16x16/hi16-action-bt_bible_locked.png
deleted file mode 100644
index 060626f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_book.png b/bibletime/pics/16x16/hi16-action-bt_book.png
deleted file mode 100644
index 0ec5e3b..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_book_add.png b/bibletime/pics/16x16/hi16-action-bt_book_add.png
deleted file mode 100644
index ac5fb3f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_book_locked.png b/bibletime/pics/16x16/hi16-action-bt_book_locked.png
deleted file mode 100644
index 83784a8..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade.png b/bibletime/pics/16x16/hi16-action-bt_cascade.png
deleted file mode 100644
index d2d4002..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png b/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png
deleted file mode 100644
index a16ad9a..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary.png b/bibletime/pics/16x16/hi16-action-bt_commentary.png
deleted file mode 100644
index b9f198e..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_add.png b/bibletime/pics/16x16/hi16-action-bt_commentary_add.png
deleted file mode 100644
index af1e044..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png b/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png
deleted file mode 100644
index 9b019dc..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_displayconfig.png b/bibletime/pics/16x16/hi16-action-bt_displayconfig.png
deleted file mode 100755
index 735af2f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png b/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png
deleted file mode 100644
index 85c7e98..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon.png b/bibletime/pics/16x16/hi16-action-bt_lexicon.png
deleted file mode 100644
index 4a0fe15..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png
deleted file mode 100644
index 78a0ba2..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png
deleted file mode 100644
index ff7d87f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_startconfig.png b/bibletime/pics/16x16/hi16-action-bt_startconfig.png
deleted file mode 100644
index 21e4865..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_swordconfig.png b/bibletime/pics/16x16/hi16-action-bt_swordconfig.png
deleted file mode 100644
index 3c33de6..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_sync.png b/bibletime/pics/16x16/hi16-action-bt_sync.png
deleted file mode 100644
index 6820542..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_tile.png b/bibletime/pics/16x16/hi16-action-bt_tile.png
deleted file mode 100644
index 10854d8..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_tile_auto.png b/bibletime/pics/16x16/hi16-action-bt_tile_auto.png
deleted file mode 100644
index f4ab245..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-app-bibletime.png b/bibletime/pics/16x16/hi16-app-bibletime.png
deleted file mode 100644
index 1fe6a4d..0000000
--- a/bibletime/pics/16x16/hi16-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/Makefile.am b/bibletime/pics/22x22/Makefile.am
deleted file mode 100644
index 7b920ef..0000000
--- a/bibletime/pics/22x22/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi22-action-bt_bible.png hi22-action-bt_bible_add.png hi22-action-bt_bible_locked.png hi22-action-bt_book.png hi22-action-bt_book_add.png hi22-action-bt_book_locked.png hi22-action-bt_cascade.png hi22-action-bt_cascade_auto.png hi22-action-bt_commentary.png hi22-action-bt_commentary_add.png hi22-action-bt_commentary_locked.png hi22-action-bt_displayconfig.png hi22-action-bt_displaytranslit.png hi22-action-bt_lexicon.png hi22-action-bt_lexicon_add.png hi22-action-bt_lexicon_locked.png hi22-action-bt_parallel.png hi22-action-bt_startconfig.png hi22-action-bt_swordconfig.png hi22-action-bt_sync.png hi22-action-bt_tile.png hi22-action-bt_tile_auto.png hi22-app-bibletime.png
-
-KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_parallel bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime
-\ No newline at end of file
diff --git a/bibletime/pics/22x22/Makefile.in b/bibletime/pics/22x22/Makefile.in
deleted file mode 100644
index 62502d2..0000000
--- a/bibletime/pics/22x22/Makefile.in
+++ /dev/null
@@ -1,552 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi22-action-bt_bible.png hi22-action-bt_bible_add.png hi22-action-bt_bible_locked.png hi22-action-bt_book.png hi22-action-bt_book_add.png hi22-action-bt_book_locked.png hi22-action-bt_cascade.png hi22-action-bt_cascade_auto.png hi22-action-bt_commentary.png hi22-action-bt_commentary_add.png hi22-action-bt_commentary_locked.png hi22-action-bt_displayconfig.png hi22-action-bt_displaytranslit.png hi22-action-bt_lexicon.png hi22-action-bt_lexicon_add.png hi22-action-bt_lexicon_locked.png hi22-action-bt_parallel.png hi22-action-bt_startconfig.png hi22-action-bt_swordconfig.png hi22-action-bt_sync.png hi22-action-bt_tile.png hi22-action-bt_tile_auto.png hi22-app-bibletime.png
-
-KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_parallel bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime
-subdir = bibletime/pics/22x22
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/22x22/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/22x22/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 52
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_parallel.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_parallel.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-	$(INSTALL_DATA) $(srcdir)/hi22-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/bibletime.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_parallel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/bibletime.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/22x22/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible.png b/bibletime/pics/22x22/hi22-action-bt_bible.png
deleted file mode 100644
index 20c9785..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_add.png b/bibletime/pics/22x22/hi22-action-bt_bible_add.png
deleted file mode 100644
index 7684364..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_locked.png b/bibletime/pics/22x22/hi22-action-bt_bible_locked.png
deleted file mode 100644
index c88f9f7..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_book.png b/bibletime/pics/22x22/hi22-action-bt_book.png
deleted file mode 100644
index 7d50365..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_book_add.png b/bibletime/pics/22x22/hi22-action-bt_book_add.png
deleted file mode 100644
index 60d345f..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_book_locked.png b/bibletime/pics/22x22/hi22-action-bt_book_locked.png
deleted file mode 100644
index 8c0861a..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade.png b/bibletime/pics/22x22/hi22-action-bt_cascade.png
deleted file mode 100644
index 07068c6..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png b/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png
deleted file mode 100644
index 8b3a0a8..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary.png b/bibletime/pics/22x22/hi22-action-bt_commentary.png
deleted file mode 100644
index 4711ca2..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_add.png b/bibletime/pics/22x22/hi22-action-bt_commentary_add.png
deleted file mode 100644
index d58bb17..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png b/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png
deleted file mode 100644
index b9b3615..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_displayconfig.png b/bibletime/pics/22x22/hi22-action-bt_displayconfig.png
deleted file mode 100755
index eaa67d1..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png b/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png
deleted file mode 100644
index 5eada70..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon.png b/bibletime/pics/22x22/hi22-action-bt_lexicon.png
deleted file mode 100644
index 437cb50..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png
deleted file mode 100644
index 924ea64..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png
deleted file mode 100644
index 0b3fa30..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_parallel.png b/bibletime/pics/22x22/hi22-action-bt_parallel.png
deleted file mode 100644
index b1d3ea1..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_parallel.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_startconfig.png b/bibletime/pics/22x22/hi22-action-bt_startconfig.png
deleted file mode 100644
index 6f4b900..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_swordconfig.png b/bibletime/pics/22x22/hi22-action-bt_swordconfig.png
deleted file mode 100644
index 4c87bb5..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_sync.png b/bibletime/pics/22x22/hi22-action-bt_sync.png
deleted file mode 100644
index 71f6df7..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_tile.png b/bibletime/pics/22x22/hi22-action-bt_tile.png
deleted file mode 100644
index 01d406d..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_tile_auto.png b/bibletime/pics/22x22/hi22-action-bt_tile_auto.png
deleted file mode 100644
index e826540..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-app-bibletime.png b/bibletime/pics/22x22/hi22-app-bibletime.png
deleted file mode 100644
index acf2585..0000000
--- a/bibletime/pics/22x22/hi22-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/Makefile.am b/bibletime/pics/32x32/Makefile.am
deleted file mode 100644
index 1de62e7..0000000
--- a/bibletime/pics/32x32/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi32-action-bt_book_locked.png hi32-action-bt_commentary_locked.png hi32-action-bt_lexicon_locked.png hi32-action-bt_bible.png hi32-action-bt_bible_add.png hi32-action-bt_book.png hi32-action-bt_book_add.png hi32-action-bt_cascade.png hi32-action-bt_cascade_auto.png hi32-action-bt_commentary.png hi32-action-bt_commentary_add.png hi32-action-bt_displayconfig.png hi32-action-bt_displaytranslit.png hi32-action-bt_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png hi32-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
-\ No newline at end of file
diff --git a/bibletime/pics/32x32/Makefile.in b/bibletime/pics/32x32/Makefile.in
deleted file mode 100644
index 5cf523e..0000000
--- a/bibletime/pics/32x32/Makefile.in
+++ /dev/null
@@ -1,550 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi32-action-bt_book_locked.png hi32-action-bt_commentary_locked.png hi32-action-bt_lexicon_locked.png hi32-action-bt_bible.png hi32-action-bt_bible_add.png hi32-action-bt_book.png hi32-action-bt_book_add.png hi32-action-bt_cascade.png hi32-action-bt_cascade_auto.png hi32-action-bt_commentary.png hi32-action-bt_commentary_add.png hi32-action-bt_displayconfig.png hi32-action-bt_displaytranslit.png hi32-action-bt_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png hi32-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
-subdir = bibletime/pics/32x32
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/32x32/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/32x32/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 50
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/hi32-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/bibletime.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_locked.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/bibletime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_locked.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/32x32/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible.png b/bibletime/pics/32x32/hi32-action-bt_bible.png
deleted file mode 100644
index b949de7..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_add.png b/bibletime/pics/32x32/hi32-action-bt_bible_add.png
deleted file mode 100644
index 48c63e8..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_locked.png b/bibletime/pics/32x32/hi32-action-bt_bible_locked.png
deleted file mode 100644
index 259e08f..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_book.png b/bibletime/pics/32x32/hi32-action-bt_book.png
deleted file mode 100644
index 84887db..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_book_add.png b/bibletime/pics/32x32/hi32-action-bt_book_add.png
deleted file mode 100644
index 8d35be9..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_book_locked.png b/bibletime/pics/32x32/hi32-action-bt_book_locked.png
deleted file mode 100644
index ce746b8..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade.png b/bibletime/pics/32x32/hi32-action-bt_cascade.png
deleted file mode 100644
index 070f5d1..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png b/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png
deleted file mode 100644
index 4171ffc..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary.png b/bibletime/pics/32x32/hi32-action-bt_commentary.png
deleted file mode 100644
index fa29810..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_add.png b/bibletime/pics/32x32/hi32-action-bt_commentary_add.png
deleted file mode 100644
index 18b31a8..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png b/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png
deleted file mode 100644
index f615a88..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_displayconfig.png b/bibletime/pics/32x32/hi32-action-bt_displayconfig.png
deleted file mode 100755
index 2478bf9..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png b/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png
deleted file mode 100644
index 91f97a2..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon.png b/bibletime/pics/32x32/hi32-action-bt_lexicon.png
deleted file mode 100644
index 0357308..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png
deleted file mode 100644
index 9c8ad16..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png
deleted file mode 100644
index e239f7f..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_startconfig.png b/bibletime/pics/32x32/hi32-action-bt_startconfig.png
deleted file mode 100644
index c64200d..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_swordconfig.png b/bibletime/pics/32x32/hi32-action-bt_swordconfig.png
deleted file mode 100644
index b8f3d30..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_sync.png b/bibletime/pics/32x32/hi32-action-bt_sync.png
deleted file mode 100644
index 25fdb0f..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_tile.png b/bibletime/pics/32x32/hi32-action-bt_tile.png
deleted file mode 100644
index 3cab67e..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_tile_auto.png b/bibletime/pics/32x32/hi32-action-bt_tile_auto.png
deleted file mode 100644
index e92e26d..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-app-bibletime.png b/bibletime/pics/32x32/hi32-app-bibletime.png
deleted file mode 100644
index 7dcbc90..0000000
--- a/bibletime/pics/32x32/hi32-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/Makefile.am b/bibletime/pics/48x48/Makefile.am
deleted file mode 100644
index fc06707..0000000
--- a/bibletime/pics/48x48/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi48-action-bt_book_locked.png hi48-action-bt_commentary_locked.png hi48-action-bt_lexicon_locked.png hi48-action-bt_bible.png hi48-action-bt_bible_add.png hi48-action-bt_book.png hi48-action-bt_book_add.png hi48-action-bt_cascade.png hi48-action-bt_cascade_auto.png hi48-action-bt_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_displayconfig.png hi48-action-bt_displaytranslit.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-action-bt_sync.png hi48-action-bt_tile.png hi48-action-bt_tile_auto.png hi48-app-bibletime.png hi48-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
-\ No newline at end of file
diff --git a/bibletime/pics/48x48/Makefile.in b/bibletime/pics/48x48/Makefile.in
deleted file mode 100644
index ee72a31..0000000
--- a/bibletime/pics/48x48/Makefile.in
+++ /dev/null
@@ -1,550 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi48-action-bt_book_locked.png hi48-action-bt_commentary_locked.png hi48-action-bt_lexicon_locked.png hi48-action-bt_bible.png hi48-action-bt_bible_add.png hi48-action-bt_book.png hi48-action-bt_book_add.png hi48-action-bt_cascade.png hi48-action-bt_cascade_auto.png hi48-action-bt_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_displayconfig.png hi48-action-bt_displaytranslit.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-action-bt_sync.png hi48-action-bt_tile.png hi48-action-bt_tile_auto.png hi48-app-bibletime.png hi48-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
-subdir = bibletime/pics/48x48
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/48x48/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/48x48/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/48x48/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 50
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/bibletime.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_locked.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/bibletime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_locked.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/48x48/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/48x48/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible.png b/bibletime/pics/48x48/hi48-action-bt_bible.png
deleted file mode 100644
index d813bd7..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_add.png b/bibletime/pics/48x48/hi48-action-bt_bible_add.png
deleted file mode 100644
index c16456b..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_locked.png b/bibletime/pics/48x48/hi48-action-bt_bible_locked.png
deleted file mode 100644
index 1333584..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_book.png b/bibletime/pics/48x48/hi48-action-bt_book.png
deleted file mode 100644
index b3f5fb0..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_book_add.png b/bibletime/pics/48x48/hi48-action-bt_book_add.png
deleted file mode 100644
index 4fe4cd4..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_book_locked.png b/bibletime/pics/48x48/hi48-action-bt_book_locked.png
deleted file mode 100644
index c76f2a0..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade.png b/bibletime/pics/48x48/hi48-action-bt_cascade.png
deleted file mode 100644
index 0ea1fe8..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png b/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png
deleted file mode 100644
index 6dfc9f5..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary.png b/bibletime/pics/48x48/hi48-action-bt_commentary.png
deleted file mode 100644
index 966b0c6..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_add.png b/bibletime/pics/48x48/hi48-action-bt_commentary_add.png
deleted file mode 100644
index 3fb2cdd..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png b/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png
deleted file mode 100644
index 8dd23fb..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_displayconfig.png b/bibletime/pics/48x48/hi48-action-bt_displayconfig.png
deleted file mode 100644
index adb2706..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png b/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png
deleted file mode 100644
index 30384fd..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon.png b/bibletime/pics/48x48/hi48-action-bt_lexicon.png
deleted file mode 100644
index 623c564..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png
deleted file mode 100644
index 9d2cfaf..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png
deleted file mode 100644
index dbdafbe..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_startconfig.png b/bibletime/pics/48x48/hi48-action-bt_startconfig.png
deleted file mode 100644
index 805bf8b..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_swordconfig.png b/bibletime/pics/48x48/hi48-action-bt_swordconfig.png
deleted file mode 100644
index fb518ed..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_sync.png b/bibletime/pics/48x48/hi48-action-bt_sync.png
deleted file mode 100644
index 3dcf17a..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_tile.png b/bibletime/pics/48x48/hi48-action-bt_tile.png
deleted file mode 100644
index f49a7b4..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_tile_auto.png b/bibletime/pics/48x48/hi48-action-bt_tile_auto.png
deleted file mode 100644
index 02436d9..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-app-bibletime.png b/bibletime/pics/48x48/hi48-app-bibletime.png
deleted file mode 100644
index 768f3b9..0000000
--- a/bibletime/pics/48x48/hi48-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/64x64/Makefile.am b/bibletime/pics/64x64/Makefile.am
deleted file mode 100644
index 02a3ff1..0000000
--- a/bibletime/pics/64x64/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi64-app-bibletime.png
-
-KDE_ICON = bibletime
-\ No newline at end of file
diff --git a/bibletime/pics/64x64/Makefile.in b/bibletime/pics/64x64/Makefile.in
deleted file mode 100644
index 2f84515..0000000
--- a/bibletime/pics/64x64/Makefile.in
+++ /dev/null
@@ -1,507 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi64-app-bibletime.png
-
-KDE_ICON = bibletime
-subdir = bibletime/pics/64x64
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/64x64/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/64x64/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/64x64/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 7
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-	$(INSTALL_DATA) $(srcdir)/hi64-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/bibletime.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/bibletime.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/64x64/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/64x64/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/64x64/hi64-app-bibletime.png b/bibletime/pics/64x64/hi64-app-bibletime.png
deleted file mode 100644
index 05b859d..0000000
--- a/bibletime/pics/64x64/hi64-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/Makefile.am b/bibletime/pics/Makefile.am
deleted file mode 100644
index 670547f..0000000
--- a/bibletime/pics/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-SUBDIRS = \
-16x16 \
-22x22 \
-32x32 \
-48x48 \
-64x64 \
-.
-
-BIBLETIME_PICS = \
-startuplogo.png
-
-EXTRA_DIST = $(BIBLETIME_PICS)
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/bibletime/pics/
-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime/pics/;
-	@for file in $(BIBLETIME_PICS); do \
-		echo Installing $$file; \
-		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
-
-uninstall-local:
-	@for file in $(BIBLETIME_PICS); do \
-		echo Removing $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		rm -f $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
diff --git a/bibletime/pics/Makefile.in b/bibletime/pics/Makefile.in
deleted file mode 100644
index 6ea267e..0000000
--- a/bibletime/pics/Makefile.in
+++ /dev/null
@@ -1,677 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-SUBDIRS = \
-16x16 \
-22x22 \
-32x32 \
-48x48 \
-64x64 \
-.
-
-
-BIBLETIME_PICS = \
-startuplogo.png
-
-
-EXTRA_DIST = $(BIBLETIME_PICS)
-subdir = bibletime/pics
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-local \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-local uninstall-recursive
-
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/bibletime/pics/
-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime/pics/;
-	@for file in $(BIBLETIME_PICS); do \
-		echo Installing $$file; \
-		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
-
-uninstall-local:
-	@for file in $(BIBLETIME_PICS); do \
-		echo Removing $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		rm -f $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-KDE_DIST=startuplogo.png gen_am_pics.pl startuplogo.xcf.bz2 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/gen_am_pics.pl b/bibletime/pics/gen_am_pics.pl
deleted file mode 100644
index f36a474..0000000
--- a/bibletime/pics/gen_am_pics.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-my $header = << "EOT";
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-EOT
-
-my @sizes = ("16x16", "22x22", "32x32", "48x48", "64x64");
-
-foreach my $dirname (@sizes) {
-	print "Creating $dirname/Makefile.am ...\n";
-
-	opendir(DIR, "$dirname");
-	my @icons = grep { /^(lo)|(hi)|(cr)/ && -f "$dirname/$_" } readdir(DIR);
-	closedir(DIR);
-
-	open(OUT, ">", "$dirname/Makefile.am");
-	print OUT $header;
-
-	#Add EXTRA_DIST stuff
-	print OUT "\n\nEXTRA_DIST =";
-	foreach my $icon (@icons) {
-		print OUT " $icon";
-	}
-
-
-	# Add KDE_ICON stuff
-	print OUT "\n\nKDE_ICON =";
-	my %inserted_icons;
-	foreach my $icon (@icons) {
-		$icon =~ s/^(?:hi|lo|cr)\d+-(?:action|app|mime|filesys)-(.+?)\.png/$1/;
-		print OUT " $icon" unless (exists $inserted_icons{$icon});
-		$inserted_icons{$icon} = 1;
-	}
-
-	close(OUT);
-}
diff --git a/bibletime/pics/startuplogo.png b/bibletime/pics/startuplogo.png
deleted file mode 100644
index ff7db20..0000000
--- a/bibletime/pics/startuplogo.png
+++ /dev/null
diff --git a/bibletime/pics/startuplogo.xcf.bz2 b/bibletime/pics/startuplogo.xcf.bz2
deleted file mode 100644
index d1e2518..0000000
--- a/bibletime/pics/startuplogo.xcf.bz2
+++ /dev/null
diff --git a/bibletime/printing/Makefile.am b/bibletime/printing/Makefile.am
deleted file mode 100644
index 76e33d5..0000000
--- a/bibletime/printing/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-INCLUDES = $(all_includes)
-
-libprinting_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libprinting.a
-
-libprinting_a_SOURCES = \
-cstylelist.cpp \
-cprintitemlist.cpp \
-cprintitem.cpp \
-cstyle.cpp \
-cstyleeditordialog.cpp \
-cprinter.cpp \
-cprintdialogpages.cpp
-
-
-all_headers =  \
-cstylelist.h \
-cprintitemlist.h \
-cprintitem.h \
-cstyle.h \
-cstyleeditordialog.h \
-cprinter.h \
-cprintdialogpages.h
-
-
-EXTRA_DIST = $(libprinting_a_SOURCES) $(all_headers)
diff --git a/bibletime/printing/Makefile.in b/bibletime/printing/Makefile.in
deleted file mode 100644
index 0806ddb..0000000
--- a/bibletime/printing/Makefile.in
+++ /dev/null
@@ -1,745 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libprinting_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libprinting.a
-
-libprinting_a_SOURCES = \
-cstylelist.cpp \
-cprintitemlist.cpp \
-cprintitem.cpp \
-cstyle.cpp \
-cstyleeditordialog.cpp \
-cprinter.cpp \
-cprintdialogpages.cpp
-
-
-all_headers = \
-cstylelist.h \
-cprintitemlist.h \
-cprintitem.h \
-cstyle.h \
-cstyleeditordialog.h \
-cprinter.h \
-cprintdialogpages.h
-
-
-EXTRA_DIST = $(libprinting_a_SOURCES) $(all_headers)
-subdir = bibletime/printing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libprinting_a_AR = $(AR) cru
-libprinting_a_LIBADD =
-am_libprinting_a_OBJECTS = cstylelist.$(OBJEXT) cprintitemlist.$(OBJEXT) \
-	cprintitem.$(OBJEXT) cstyle.$(OBJEXT) \
-	cstyleeditordialog.$(OBJEXT) cprinter.$(OBJEXT) \
-	cprintdialogpages.$(OBJEXT)
-#>- libprinting_a_OBJECTS = $(am_libprinting_a_OBJECTS)
-#>+ 8
-libprinting_a_final_OBJECTS = libprinting_a.all_cpp.o 
-libprinting_a_nofinal_OBJECTS = cstylelist.$(OBJEXT) cprintitemlist.$(OBJEXT) \
-	cprintitem.$(OBJEXT) cstyle.$(OBJEXT) \
-	cstyleeditordialog.$(OBJEXT) cprinter.$(OBJEXT) \
-	cprintdialogpages.$(OBJEXT)\
-cstylelist.moc.o cprintitemlist.moc.o cstyleeditordialog.moc.o cprinter.moc.o cprintdialogpages.moc.o 
-@KDE_USE_FINAL_FALSE@libprinting_a_OBJECTS = $(libprinting_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libprinting_a_OBJECTS = $(libprinting_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cprintdialogpages.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprinter.Po ./$(DEPDIR)/cprintitem.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprintitemlist.Po ./$(DEPDIR)/cstyle.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cstyleeditordialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cstylelist.Po
-#>+ 10
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cstylelist.moc.P $(DEPDIR)/cprintitemlist.moc.P $(DEPDIR)/cstyleeditordialog.moc.P $(DEPDIR)/cprinter.moc.P $(DEPDIR)/cprintdialogpages.moc.P  $(DEPDIR)/libprinting_a.all_cpp.P ./$(DEPDIR)/cprintdialogpages.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprinter.Po ./$(DEPDIR)/cprintitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprintitemlist.Po ./$(DEPDIR)/cstyle.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cstyleeditordialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cstylelist.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cstylelist.moc.P $(DEPDIR)/cprintitemlist.moc.P $(DEPDIR)/cstyleeditordialog.moc.P $(DEPDIR)/cprinter.moc.P $(DEPDIR)/cprintdialogpages.moc.P ./$(DEPDIR)/cprintdialogpages.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprinter.Po ./$(DEPDIR)/cprintitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprintitemlist.Po ./$(DEPDIR)/cstyle.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cstyleeditordialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cstylelist.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libprinting_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libprinting_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/printing/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/printing/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/printing/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libprinting.a: $(libprinting_a_OBJECTS) $(libprinting_a_DEPENDENCIES) 
-	-rm -f libprinting.a
-	$(libprinting_a_AR) libprinting.a $(libprinting_a_OBJECTS) $(libprinting_a_LIBADD)
-	$(RANLIB) libprinting.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprintdialogpages.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprinter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprintitem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprintitemlist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cstyle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cstyleeditordialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cstylelist.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 3
-cstylelist.moc.cpp: $(srcdir)/cstylelist.h
-	$(MOC) $(srcdir)/cstylelist.h -o cstylelist.moc.cpp
-
-#>+ 2
-mocs: cstylelist.moc.cpp
-
-#>+ 3
-cprintitemlist.moc.cpp: $(srcdir)/cprintitemlist.h
-	$(MOC) $(srcdir)/cprintitemlist.h -o cprintitemlist.moc.cpp
-
-#>+ 2
-mocs: cprintitemlist.moc.cpp
-
-#>+ 3
-cstyleeditordialog.moc.cpp: $(srcdir)/cstyleeditordialog.h
-	$(MOC) $(srcdir)/cstyleeditordialog.h -o cstyleeditordialog.moc.cpp
-
-#>+ 2
-mocs: cstyleeditordialog.moc.cpp
-
-#>+ 3
-cprinter.moc.cpp: $(srcdir)/cprinter.h
-	$(MOC) $(srcdir)/cprinter.h -o cprinter.moc.cpp
-
-#>+ 2
-mocs: cprinter.moc.cpp
-
-#>+ 3
-cprintdialogpages.moc.cpp: $(srcdir)/cprintdialogpages.h
-	$(MOC) $(srcdir)/cprintdialogpages.h -o cprintdialogpages.moc.cpp
-
-#>+ 2
-mocs: cprintdialogpages.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cstylelist.moc.cpp cprintitemlist.moc.cpp cstyleeditordialog.moc.cpp cprinter.moc.cpp cprintdialogpages.moc.cpp
-
-#>+ 2
-KDE_DIST=cprintdialogpages.h cstylelist.h cprintitem.h cprintitemlist.h cstyle.h cstyleeditordialog.h cprinter.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/printing/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/printing/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libprinting_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cstylelist.cpp $(srcdir)/cprintitemlist.cpp $(srcdir)/cprintitem.cpp $(srcdir)/cstyle.cpp $(srcdir)/cstyleeditordialog.cpp $(srcdir)/cprinter.cpp $(srcdir)/cprintdialogpages.cpp cprintitemlist.moc.cpp cstylelist.moc.cpp cprinter.moc.cpp cstyleeditordialog.moc.cpp cprintdialogpages.moc.cpp 
-	@echo 'creating libprinting_a.all_cpp.cpp ...'; \
-	rm -f libprinting_a.all_cpp.files libprinting_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libprinting_a.all_cpp.final; \
-	for file in cstylelist.cpp cprintitemlist.cpp cprintitem.cpp cstyle.cpp cstyleeditordialog.cpp cprinter.cpp cprintdialogpages.cpp cprintitemlist.moc.cpp cstylelist.moc.cpp cprinter.moc.cpp cstyleeditordialog.moc.cpp cprintdialogpages.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libprinting_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libprinting_a.all_cpp.final; \
-	done; \
-	cat libprinting_a.all_cpp.final libprinting_a.all_cpp.files > libprinting_a.all_cpp.cpp; \
-	rm -f libprinting_a.all_cpp.final libprinting_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libprinting_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/printing/cprintdialogpages.cpp b/bibletime/printing/cprintdialogpages.cpp
deleted file mode 100644
index 3602169..0000000
--- a/bibletime/printing/cprintdialogpages.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/***************************************************************************
-                          cstylelistpage.cpp  -  description
-                             -------------------
-    begin                : Fri Feb 8 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cprinter.h"
-#include "cprintdialogpages.h"
-#include "cprintitemlist.h"
-#include "cprintitem.h"
-
-#include "util/cresmgr.h"
-
-//QT includes
-#include <qbuttongroup.h>
-#include <qcombobox.h>
-#include <qtoolbutton.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qspinbox.h>
-#include <qlistview.h>
-#include <qiconset.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kiconloader.h>
-
-CStyleListPage::CStyleListPage(CPrinter* printer, QWidget *parent, const char *name )
-	: KPrintDialogPage(parent,name), m_printer(printer) {
-	setTitle(i18n("Styles"));
-
-//  QFrame *page = addPage( i18n("Layout"), i18n("Layout specific settings") );
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 5, 5 );
-  	
-  QButtonGroup *group = new QButtonGroup( i18n("Margins (mm)"), this );
-  QWhatsThis::add(group, CResMgr::printing::printerSettings::margins::whatsthis);
-  topLayout->addWidget( group, 0 );
-
-  QGridLayout *gbox = new QGridLayout( group, 4, 2, 5, 5 );
-  gbox->addRowSpacing( 0, group->fontMetrics().height()-5 );
-
-  const QString designation[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") };
-  for( int i=0; i<4; i++ ) {
-    m_marginSpin[i] = new QSpinBox( group );
-    m_marginSpin[i]->setFixedHeight( m_marginSpin[i]->sizeHint().height() );
-    m_marginSpin[i]->setMinimumWidth( m_marginSpin[i]->fontMetrics().width("M")*10 );
-    m_marginSpin[i]->setSuffix(" mm");
-
-    QLabel *label = new QLabel( m_marginSpin[i], designation[i], group );
-    label->setFixedHeight( m_marginSpin[i]->sizeHint().height() );
-    label->setFixedWidth( label->sizeHint().width() );
-
-    if( i < 2 )
-    {
-      gbox->addWidget( label, i+1, 0, AlignLeft );
-      gbox->addWidget( m_marginSpin[i], i+1, 1, AlignLeft );
-    }
-    else
-    {
-      gbox->addWidget( label, i-1, 3, AlignLeft );
-      gbox->addWidget( m_marginSpin[i], i-1, 4, AlignLeft );
-    }
-  }
-  QToolTip::add(m_marginSpin[0], CResMgr::printing::printerSettings::margins::upper::tooltip);
-  QToolTip::add(m_marginSpin[1], CResMgr::printing::printerSettings::margins::lower::tooltip);
-  QToolTip::add(m_marginSpin[2], CResMgr::printing::printerSettings::margins::left::tooltip);
-  QToolTip::add(m_marginSpin[3], CResMgr::printing::printerSettings::margins::right::tooltip);
-
-  QWhatsThis::add(m_marginSpin[0], CResMgr::printing::printerSettings::margins::upper::whatsthis);
-  QWhatsThis::add(m_marginSpin[1], CResMgr::printing::printerSettings::margins::lower::whatsthis);
-  QWhatsThis::add(m_marginSpin[2], CResMgr::printing::printerSettings::margins::left::whatsthis);
-  QWhatsThis::add(m_marginSpin[3], CResMgr::printing::printerSettings::margins::right::whatsthis);
-
-
-  gbox->activate();
-  group->setFixedHeight( group->sizeHint().height() );
-  //set minimum borders
-  m_marginSpin[0]->setRange(0, 100);	//upper margin
-  m_marginSpin[1]->setRange(0, 100);	//lower margin
-  m_marginSpin[2]->setRange(0, 100);	//left margin
-  m_marginSpin[3]->setRange(0, 100);	//right margin
-
-  QHBoxLayout *entryLayout = new QHBoxLayout( 0, 5, 5 );
-  QVBoxLayout *styleLayout = new QVBoxLayout( 0, 5, 5 );
-  QVBoxLayout *buttonLayout = new QVBoxLayout( 0, 5, 5 );
-
-  m_styleList = new CStyleList( &(m_printer->styleList()), this, "CStyleList1");
-	connect(m_styleList, SIGNAL(currentChanged(QListViewItem*)), SLOT(currentStyleChanged(QListViewItem*)));
-//	QToolTip::add(m_styleList, TT_PD_LAYOUT_STYLE_LIST);
-//	QWhatsThis::add(m_styleList, WT_PD_LAYOUT_STYLE_LIST);
-
-  QLabel* label = new QLabel(m_styleList, i18n("Available styles:"), this);
-  styleLayout->addWidget(label,0);
-	styleLayout->addWidget( m_styleList, 3);
-
-	m_newStyleButton = new QToolButton( this, "newStyle Button");
-	m_newStyleButton->setIconSet( SmallIcon( CResMgr::printing::styleList::newStyle::icon ) );
-	QToolTip::add(m_newStyleButton, CResMgr::printing::styleList::newStyle::tooltip);
-	QWhatsThis::add(m_newStyleButton, CResMgr::printing::styleList::newStyle::whatsthis);
-	connect( m_newStyleButton, SIGNAL(clicked()), m_styleList, SLOT(createNewStyle()));
-
-	m_deleteStyleButton = new QToolButton( this, "deleteStyle Button");
-	m_deleteStyleButton->setIconSet( SmallIcon(CResMgr::printing::styleList::deleteStyle::icon));
-	QToolTip::add(m_deleteStyleButton, CResMgr::printing::styleList::deleteStyle::tooltip);
-	QWhatsThis::add(m_deleteStyleButton, CResMgr::printing::styleList::deleteStyle::whatsthis);
-	connect( m_deleteStyleButton, SIGNAL(clicked()), m_styleList, SLOT(deleteCurrentStyle()));
-
-	m_editStyleButton = new QToolButton( this, "editStyle");
-	m_editStyleButton->setIconSet( SmallIcon(CResMgr::printing::styleList::editStyle::icon));
-	QToolTip::add(m_editStyleButton, CResMgr::printing::styleList::editStyle::tooltip);
-	QWhatsThis::add(m_editStyleButton, CResMgr::printing::styleList::editStyle::whatsthis);
-	connect( m_editStyleButton, SIGNAL(clicked()), m_styleList, SLOT(editCurrentStyle()));
-		
-	buttonLayout->addWidget( m_newStyleButton );
-	buttonLayout->addWidget( m_editStyleButton );
-	buttonLayout->addWidget( m_deleteStyleButton );
-	buttonLayout->addStretch(3);
-		
-	entryLayout->addLayout( styleLayout );
-	entryLayout->addLayout( buttonLayout );
-	
-	topLayout->addLayout(entryLayout);
-}
-
-CStyleListPage::~CStyleListPage() {
-
-}
-
-void  CStyleListPage::getOptions (QMap<QString, QString>& opts, bool /*incldef*/) {
-//	qWarning("CStyleListPage::getOptions (const QMap<QString,QString>& opts, bool)");
-
-	const QString leading = "kde-bibletime-";
-	opts[ leading+"upper_margin" ] = QString::number(m_marginSpin[0]->value());
-//	qWarning(opts[leading+"upper_margin"].latin1());
-	opts[ leading+"lower_margin" ] = QString::number(m_marginSpin[1]->value());
-	opts[ leading+"left_margin"  ] = QString::number(m_marginSpin[2]->value());
-	opts[ leading+"right_margin" ] = QString::number(m_marginSpin[3]->value());
-}
-
-void  CStyleListPage::setOptions (const QMap<QString,QString>& opts) {
-	qWarning("CStyleListPage::setOptions (const QMap<QString,QString>& opts)");
-
-	const QString leading = "kde-bibletime-";
-	QString option = opts[ leading+"upper_margin" ];
-	m_marginSpin[0]->setValue( option.toInt() );
-	option = opts[ leading+"lower_margin" ];
-	m_marginSpin[1]->setValue( option.toInt() );
-	option = opts[ leading+"left_margin" ];
-	m_marginSpin[2]->setValue( option.toInt() );
-	option = opts[ leading+"right_margin" ];
-	m_marginSpin[3]->setValue( option.toInt() );
-}
-
-bool  CStyleListPage::isValid(QString& /*errorMessage*/) {
-	return true;
-}
-
-/** No descriptions */
-void CStyleListPage::currentStyleChanged( QListViewItem* item ){
-	if (item) {
-		m_deleteStyleButton->setEnabled( item->text(0) != i18n("Standard") );
-		m_editStyleButton->setEnabled( true );	
-	}
-	else {
-		m_deleteStyleButton->setEnabled( false );
-		m_editStyleButton->setEnabled( false );	
-	}
-}
-
-
-
-// ------------------
-
-CPrintItemListPage::CPrintItemListPage(CPrinter* printer, QWidget *parent, const char *name )
-	: KPrintDialogPage(parent,name), m_printer( printer )
-{
-	setTitle(i18n("Print queue"));
-
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 5, 5 );
-  QVBoxLayout *entryLayout = new QVBoxLayout( 0, 5, 5 );
-  QLabel*	label = 0;
-
-  m_styleComboBox = new QComboBox( this, "styleComboBox" );
-	QToolTip::add(m_styleComboBox, CResMgr::printing::itemPage::styleChooser::tooltip);
-	QWhatsThis::add(m_styleComboBox, CResMgr::printing::itemPage::styleChooser::whatsthis);
-  connect(m_styleComboBox, SIGNAL(activated(const QString&)), SLOT(slotListApplyStyle(const QString&)));
-
-  label = new QLabel( m_styleComboBox, i18n("Use style:"), this);
-  QHBoxLayout*	hboxLayout = new QHBoxLayout( 0, 5, 5 );
-  hboxLayout->addWidget( label );
-  hboxLayout->addWidget( m_styleComboBox );
-  topLayout->addLayout( hboxLayout );
-
-  hboxLayout = new QHBoxLayout( 0, 5, 5 );
-
-  m_printItemList = new CPrintItemList( &(m_printer->queue()), this, "CPrintItemList1");
-	QToolTip::add(m_printItemList, CResMgr::printing::itemPage::itemList::tooltip);
-	QWhatsThis::add(m_printItemList, CResMgr::printing::itemPage::itemList::whatsthis);
-
-  label = new QLabel(m_printItemList, i18n("Entries to print:"), this);
-  entryLayout->addWidget(label);
-  entryLayout->addWidget( m_printItemList );
-  hboxLayout->addLayout(entryLayout);
-
-  QVBoxLayout *buttonLayout = new QVBoxLayout( 0, 5, 5 );
-  m_moveUpButton = new QToolButton(this);
- 	m_moveUpButton->setIconSet( SmallIcon(CResMgr::printing::itemPage::itemUp::icon));
-	QToolTip::add(m_moveUpButton, CResMgr::printing::itemPage::itemUp::tooltip);
-	QWhatsThis::add(m_moveUpButton, CResMgr::printing::itemPage::itemUp::whatsthis);	
-	connect(m_moveUpButton, SIGNAL(clicked()),m_printItemList, SLOT(moveUp()));
-	
-  m_moveDownButton = new QToolButton(this);
- 	m_moveDownButton->setIconSet( SmallIcon(CResMgr::printing::itemPage::itemDown::icon));
-	QToolTip::add(m_moveDownButton, CResMgr::printing::itemPage::itemDown::tooltip);
-	QWhatsThis::add(m_moveDownButton, CResMgr::printing::itemPage::itemDown::whatsthis);
-	connect( m_moveDownButton, SIGNAL(clicked()),m_printItemList, SLOT(moveDown()));
-	
-  m_deleteButton = new QToolButton(this);
-	m_deleteButton->setIconSet( SmallIcon(CResMgr::printing::itemPage::itemDelete::icon));
-	QToolTip::add(m_deleteButton, CResMgr::printing::itemPage::itemDelete::tooltip);
-	QWhatsThis::add(m_deleteButton, CResMgr::printing::itemPage::itemDelete::whatsthis);		
-	connect( m_deleteButton, SIGNAL(clicked()),m_printItemList, SLOT(deleteSelectedItems()));
-
-  buttonLayout->addWidget(m_moveUpButton);
-  buttonLayout->addWidget(m_moveDownButton);
-  buttonLayout->addWidget(m_deleteButton);
- 	buttonLayout->addStretch(3);
-
-  hboxLayout->addLayout( buttonLayout );
-  topLayout->addLayout( hboxLayout );
-
-	connect(m_printer, SIGNAL(sigStylesChanged()), this, SLOT(stylesChanged()));
-	stylesChanged(); //fill the box for the first time
-}
-
-CPrintItemListPage::~CPrintItemListPage() {
-
-}
-
-void CPrintItemListPage::getOptions (QMap<QString, QString>& /*opts*/, bool /*incldef*/) {
-
-}
-
-void CPrintItemListPage::setOptions (const QMap<QString,QString>& /*opts*/) {
-
-}
-
-bool CPrintItemListPage::isValid(QString& /*errorMessage*/) {
-	return true;
-}
-
-/** Applies the given styles to the print item list. */
-void CPrintItemListPage::slotListApplyStyle(const QString& styleName ){
-	StyleItemList& styleList = m_printer->styleList();	
-	for(styleList.first(); styleList.current(); styleList.next()) {
-		if (styleList.current()->styleName() == styleName) {
-		 	m_printItemList->applyStyleToSelected( styleList.current() );
-		 	break;
-		}
-	}
-}
-
-/** Is called when the CPrinter object sends a signal that the styles have changed. */
-void CPrintItemListPage::stylesChanged(){
-	m_styleComboBox->clear();
-	//refill the combobox
-	StyleItemList& styleList = m_printer->styleList();	
-	for(styleList.first(); styleList.current(); styleList.next()) {
-		m_styleComboBox->insertItem(styleList.current()->styleName());
-	}	
-}
diff --git a/bibletime/printing/cprintdialogpages.h b/bibletime/printing/cprintdialogpages.h
deleted file mode 100644
index 27bb7c2..0000000
--- a/bibletime/printing/cprintdialogpages.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
-                          cstylelistpage.h  -  description
-                             -------------------
-    begin                : Fri Feb 8 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSTYLELISTPAGE_H
-#define CSTYLELISTPAGE_H
-
-//Qt includes
-#include <qwidget.h>
-#include <qtoolbutton.h>
-
-//KDE includes
-#include <kdeprint/kprintdialogpage.h>
-
-
-class QComboBox;
-class QSpinBox;
-class QListViewItem;
-
-class CPrintItemList;
-class CStyleList;
-class CPrinter;
-
-/**
-  *@author The BibleTime team
-  */
-
-class CStyleListPage : public KPrintDialogPage  {
-   Q_OBJECT
-public: 
-	CStyleListPage(CPrinter* printer, QWidget *parent=0, const char *name=0);
-	~CStyleListPage();
-	virtual void  getOptions (QMap<QString,QString>& opts, bool incldef = false);
-	virtual void  setOptions (const QMap<QString,QString>& opts);
-	virtual bool  isValid (QString&);
-
-private:
-	CPrinter* m_printer;
-  QSpinBox *m_marginSpin[4];
-  CStyleList*	m_styleList;		
-  QToolButton* m_deleteStyleButton;		
-  QToolButton* m_newStyleButton;		
-  QToolButton* m_editStyleButton;
-  /**
-  * Is called when the style selection changed in the syle list box.
-  */
-
-private slots:
-  void currentStyleChanged(QListViewItem*);
-};
-
-// --------------------------
-
-/**
-  *@author The BibleTime team
-  */
-
-class CPrintItemListPage : public KPrintDialogPage  {
-   Q_OBJECT
-public:
-	CPrintItemListPage(CPrinter* printer, QWidget *parent=0, const char *name=0);
-	~CPrintItemListPage();
-	virtual void  getOptions (QMap<QString,QString>& opts, bool incldef = false);
-	virtual void  setOptions (const QMap<QString,QString>& opts);
-	virtual bool  isValid (QString&);
-
-private:
-	CPrinter* m_printer;
-	CPrintItemList* m_printItemList;
-	QComboBox* m_styleComboBox;
-	QToolButton* m_moveUpButton;
-	QToolButton* m_moveDownButton;
-	QToolButton* m_deleteButton;		
-
-private slots:
-  /**
- 	* Applies the given styles to the print item list.
- 	*/
-  void slotListApplyStyle(const QString&);
-protected slots: // Protected slots
-  /**
-  * Is called when the CPrinter object sends a signal
-  * that the styles have changed.
-  */
-  void stylesChanged();
-};
-
-
-#endif
diff --git a/bibletime/printing/cprinter.cpp b/bibletime/printing/cprinter.cpp
deleted file mode 100644
index 632e54a..0000000
--- a/bibletime/printing/cprinter.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/***************************************************************************
-                          cprinter.cpp  -  description
-                             -------------------
-    begin                : Sat Aug 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprinter.h"
-#include "cprintitem.h"
-#include "cprintdialogpages.h"
-
-#include "backend/cswordbackend.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-
-//KDE includes
-#include <kconfig.h>
-#include <kprocess.h>
-#include <kconfigbase.h>
-#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kapplication.h>
-
-//Qt includes
-#include <qfile.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <qpainter.h>
-#include <qpaintdevice.h>
-#include <qpaintdevicemetrics.h>
-
-
-CPrinter::CPrinter( QObject* parent ) : QObject(parent) {
-  m_styleData.standardStyle = QString::fromLatin1(\
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE DOC ><BibleTimePrintingStyle syntaxVersion=\"1\" name=\"%1\">\
- <HEADER alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"75\" pointsize=\"12\" italic=\"0\" />\
-  <FRAME enabled=\"0\" />\
- </HEADER>\
- <DESCRIPTION alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"0\" />\
-  <FRAME enabled=\"0\" />\
- </DESCRIPTION>\
- <MODULETEXT alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" /> \
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"0\" />\
-  <FRAME enabled=\"0\" />\
- </MODULETEXT>\
-</BibleTimePrintingStyle>").arg(i18n("Standard"));
-
-  m_styleData.bwStyle = QString::fromLatin1(\
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE DOC ><BibleTimePrintingStyle syntaxVersion=\"1\" name=\"%1\" >\
- <HEADER alignment=\"1\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"75\" pointsize=\"12\" italic=\"0\" />\
-  <FRAME thickness=\"1\" style=\"1\" color=\"#000000\" enabled=\"1\" />\
- </HEADER>\
- <DESCRIPTION alignment=\"1\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"1\" />\
-  <FRAME enabled=\"0\" />\
- </DESCRIPTION>\
- <MODULETEXT alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"0\" />\
-  <FRAME thickness=\"1\" style=\"1\" color=\"#000000\" enabled=\"1\" />\
- </MODULETEXT>\
-</BibleTimePrintingStyle>").arg(i18n("Black&amp;White for larger text portions"));
-
-
-	m_config = new KConfig("bt-printing", false, true );
-
-	m_queue.setAutoDelete(true);			
-	m_styleList.setAutoDelete(true);		
-	m_cachedPage.initialized = false;
-	m_cachedPage.refresh = false;	
-	m_addedItem = false;
-	
-	{
-		KConfigGroupSaver gs(m_config, "Options");	
-		QMap<QString, QString> map = m_config->entryMap("Options");
-		setOptions(map);
-	}
-	
-	m_styleDir = "printing/";
-	KStandardDirs stdDirs;
-	m_styleSaveLocation = stdDirs.saveLocation("data", "bibletime/"+m_styleDir);		
-	
-	readSettings();
-	setupStyles();
-	setupStandardStyle();		
-}
-
-CPrinter::~CPrinter(){
-	saveSettings();
-	saveStyles();	
-	m_config->sync();
-			
-	delete m_config;
-}
-
-/** Appends a new page where the next things will be painted. */
-const bool CPrinter::newPage(){
-	if (aborted()) {
-		qWarning("CPrinter::newPage: Printing was aborted!");
-		return false;
-	}
-	const bool result = KPrinter::newPage();
-	if (result) {
-		m_pagePosition.curPage++;
-	 	m_pagePosition.rect = contentSize();			
-	 	setVerticalPos(pageMargins().top);
-	}
-	return result;
-}
-
-/** Sets all the margins at one time. */
-void CPrinter::setAllMargins( const CPageMargin margins ) {
-	m_cachedPage.refresh = true;	
-	m_pageMargin = margins;
-}
-
-/** Returns the margins of the pages. */
-const CPrinter::CPageMargin& CPrinter::pageMargins() const {
-	return m_pageMargin;
-}
-
-/** Setups the printer using CPrinterDialog. */
-void CPrinter::setup( QWidget* parent ){
-	KPrinter::addDialogPage( new CPrintItemListPage(this) );
-	KPrinter::addDialogPage( new CStyleListPage(this) );
-
-	if ( KPrinter::setup(parent) ) {
-		saveSettings();
-		readSettings();
-		print();
-	}
-}
-
-/** Starts printing the items. */
-void CPrinter::print(){
-  emit printingStarted();
-  
-	QPainter p;
-	if (!p.begin(this)) {
-		p.end();
-		return;
-	}	
-	int lastPercent = 0;
-	int pos = 1;
-	const int count = m_queue.count();
-	const int copies = numCopies();
-	float copyFrac;
-	emit percentCompleted(0);
-	
-	for (int copy = 0; copy < copies && !aborted(); copy++) {	//make numCopies() copies of the pages
-		copyFrac = (float(copies)) / (float)(copy+1);
-    
-		for (m_queue.first(), pos = 1; m_queue.current(); m_queue.next(), ++pos) {
-			KApplication::kApplication()->processEvents(5); //do not lock the GUI!
-			if (!aborted()) {
-				m_queue.current()->draw(&p,this);				
-				if ((int)((float)pos / (float)count *(float)100 * copyFrac) > lastPercent) {
-					emit percentCompleted(++lastPercent);
-        }
-			}
-		};
-		if (!aborted() && (copy+1 < copies) ) {
-			newPage();	//new pages seperate copies
-    }
-	}
-
-  //clean up
-  p.end(); //send the data to the printer
-  emit printingFinished();
-	clearQueue();//delete all items
-}
-
-/** Appends items to the printing queue. */
-void CPrinter::appendItems( ListCPrintItem& items ){
-	for(items.first(); items.current(); items.next()) {
-		items.current()->setStyle(m_standardStyle);
-		m_queue.append(items.current());
-	}
-	if (items.count() && !m_addedItem) {
-		m_addedItem = true;
-		emit addedFirstQueueItem();	
-	}
-}
-
-/**  */
-void CPrinter::clearQueue(){
-	m_queue.clear();
-	m_addedItem = false;//queue is empty	
-	emit queueCleared();	
-}
-
-/** Returns the print queue object. */
-ListCPrintItem& CPrinter::queue() {
-	return m_queue;
-}
-
-/** Sets the printing queue to queue. */
-void CPrinter::setPrintQueue( ListCPrintItem& queue ){
-	clearQueue();
-	m_queue = queue; //copy items
-}
-
-/** Appends the item o the queue. */
-void CPrinter::appendItem(CPrintItem* newItem){
-	if (!newItem)
-		return;
-	newItem->setStyle(m_standardStyle);
-	m_queue.append(newItem);
-
-	if (!m_addedItem) {
-		m_addedItem = true;
-		emit addedFirstQueueItem();
-	}
-}
-
-/** Reads the style from config. */
-void CPrinter::setupStyles(){	
-//load local styles	
-	QDir d( m_styleSaveLocation );
-	QStringList files = d.entryList("*.xml");
-  CStyle* style = 0;
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		m_styleList.append( style = new CStyle() ); //automatically load from file		
-    style->loadFromFile(m_styleSaveLocation + *it);
-	}
-	
-//load styles included in this source file!
-  if (CStyle* newStyle = new CStyle(m_styleData.standardStyle)) {
- 		bool found = false;				
- 		for(m_styleList.first(); m_styleList.current() && !found; m_styleList.next()) {
- 			if (newStyle->styleName() == m_styleList.current()->styleName()) {
- 				found = true;
- 			}
- 		}		
-				
- 		if (!found) {
- 			m_styleList.append( newStyle );
- 		}
-     else {
-       delete newStyle;
-     };
-  };
-
-  if (CStyle* newStyle = new CStyle(m_styleData.bwStyle)) {
- 		bool found = false;				
- 		for(m_styleList.first(); m_styleList.current() && !found; m_styleList.next()) {
- 			if (newStyle->styleName() == m_styleList.current()->styleName()) {
- 				found = true;
- 			}
- 		}		
-				
- 		if (!found) {
- 			m_styleList.append( newStyle );
- 		}
-     else {
-       delete newStyle;
-     };
-  };
-
-
-//load systemwide styles, probably standard styles installed by BibleTime
-	KStandardDirs stdDirs;
-	QStringList globalPaths = stdDirs.findDirs("data", "bibletime/"+m_styleDir);
-	if (globalPaths.count()) { //try to find some new global styles	
-		for (QStringList::Iterator path = globalPaths.begin(); path!=globalPaths.end(); ++path) {
-			d = QDir( *path );
-			QStringList files = d.entryList("*.xml");
-			for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-				CStyle* newStyle = new CStyle();
-        newStyle->loadFromFile(*path + *it);
-				
-				bool found = false;				
-				for(m_styleList.first(); m_styleList.current() && !found; m_styleList.next()) {
-					if (newStyle->styleName() == m_styleList.current()->styleName()) {
-						found = true;
-					}
-				}		
-				
-				if (!found) {
-					m_styleList.append( newStyle );
-				}
-        else {
-          delete newStyle;
-        };
-			}		
-		}
-	}
-}
-
-/** Saves the styles to config file. */
-void CPrinter::saveStyles(){
-	QDir d(m_styleSaveLocation);	
-	QStringList files = d.entryList("*.xml");
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		d.remove(*it);
-	}
-	
-	for (m_styleList.first(); m_styleList.current(); m_styleList.next()) {
-		m_styleList.current()->saveToFile(  m_styleSaveLocation + QString::fromLatin1("printing-style-%1").arg(m_styleList.at()) + ".xml" );
-	}
-}
-
-/**  */
-void CPrinter::readSettings(){
-	KConfigGroupSaver gs(m_config, "Settings");
-	const QString leading = "kde-bibletime-";
-		
-	setFullPage(true);
-	m_pagePosition.curPage = 1;
-	m_pagePosition.rect = contentSize();
-
-	QPaintDeviceMetrics m(this);
-	const float r = static_cast<float>(m.width()) / m.widthMM();		
-	m_pageMargin.left 	= (int)(r * m_config->readNumEntry("Left margin", 15));
-	setOption(leading+"left_margin", QString::number(m_config->readNumEntry("Left margin", 15)));
-	
-	m_pageMargin.right 	= (int)(r * m_config->readNumEntry("Right margin", 15));
-	setOption(leading+"right_margin", QString::number(m_config->readNumEntry("Right margin", 15)));
-		
-	m_pageMargin.top 		= (int)(r * m_config->readNumEntry("Top margin", 15));
- 	setOption(leading+"upper_margin", QString::number(m_config->readNumEntry("Top margin", 15)));
-		
-	m_pageMargin.bottom = (int)(r * m_config->readNumEntry("Bottom margin", 15));
-	setOption(leading+"lower_margin", QString::number(m_config->readNumEntry("Bottom margin", 15)));		
-	
-	m_cachedPage.refresh = true;	
-}
-
-/**  */
-void CPrinter::saveSettings(){	
-	const QString leading = "kde-bibletime-";
-	KConfigGroupSaver gs(m_config, "Settings");
-	m_config->writeEntry("Left margin", option(leading+"left_margin").toInt());
-	m_config->writeEntry("Right margin", option(leading+"right_margin").toInt());
-	m_config->writeEntry("Top margin", option(leading+"upper_margin").toInt());
-	m_config->writeEntry("Bottom margin", option(leading+"lower_margin").toInt());
-}
-
-/** Returns the list of styles. */
-StyleItemList& CPrinter::styleList() {
-	return m_styleList;
-}
-
-/** Sets the application wide style list to list. */
-void CPrinter::setStyleList( StyleItemList& list){
-	m_styleList = list; //copy items
-}
-
-/** Returns the page size without headers. */
-const QRect CPrinter::contentSize() {
-  if 	(	m_cachedPage.refresh || !m_cachedPage.initialized || (m_cachedPage.initialized && (m_cachedPage.cachedPaper != pageSize())) )
-  { //refresh page size info
-		m_cachedPage.initialized = true;
-		m_cachedPage.refresh = false;
-		m_cachedPage.cachedPaper = pageSize();		
-		
-	  QPaintDeviceMetrics metric( this ); //note that metric's width and height span the whole page				
-	  m_cachedPage.size.setLeft( m_pageMargin.left );
-	  m_cachedPage.size.setTop( m_pageMargin.top );
-	  m_cachedPage.size.setRight( metric.width() -  m_pageMargin.right );
-	  m_cachedPage.size.setBottom( metric.height() /*- m_pageMargin.top*/ - m_pageMargin.bottom );
-	}
-  return m_cachedPage.size;
-}
-
-/** Returns the config used for this printer object. */
-KConfig* const CPrinter::config() const {
-	return m_config;	
-}
-
-/** Creates the standard style. */
-void CPrinter::setupStandardStyle(){
-	//see if m_items contains standard style
-	bool found = false;
-	for (m_styleList.first(); m_styleList.current(); m_styleList.next()) {
-		if (m_styleList.current()->styleName() == i18n("Standard")) {	//found the style
-			found = true;
-			m_standardStyle = m_styleList.current();
-			break;
-		}
-	}
-		
-	if (!found) {
-		m_standardStyle = new CStyle();		
-		m_standardStyle->setStyleName(i18n("Standard"));		
-		m_styleList.append( m_standardStyle );
-	}
-}
-
-/** Sets the vertical position of the printer's painter. */
-void CPrinter::setVerticalPos( const int yPos ){
-	m_pagePosition.rect.setY(yPos);
-}
-
-/** Emits the signal that the styles changed. */
-CStyle* const CPrinter::standardStyle() const {
-	return m_standardStyle;
-}
diff --git a/bibletime/printing/cprinter.h b/bibletime/printing/cprinter.h
deleted file mode 100644
index 0037699..0000000
--- a/bibletime/printing/cprinter.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/***************************************************************************
-                          cprinter.h  -  description
-                             -------------------
-    begin                : Sat Aug 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPRINTER_H
-#define CPRINTER_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-#include "cprintitemlist.h"
-#include "cprintitem.h"
-#include "cstylelist.h"
-#include "cstyle.h"
-
-//KDE includes
-#include <kprinter.h>
-
-//Qt includes
-#include <qobject.h>
-#include <qpainter.h>
-
-
-/**
-	* This is the class which prints the items (low-level).
-	* It uses a QPainter to do it.
-  * @author The BibleTime team
-  */
-
-class CPrinterDialog;
-class CPrintItem;
-class CSwordBackend;
-
-class KConfig;
-class KProcess;
-
-class CPrinter : public QObject, public KPrinter, public CPointers  {
-	Q_OBJECT
-public:	
-	struct CPageSize {
-	  unsigned int width;
-	  unsigned int height;
-	};
-	struct CPagePosition {
-	  unsigned int curPage;
-	  QRect rect;
-	};	
-	struct CPageMargin {
-	  unsigned int top;
-	  unsigned int right;
-	  unsigned int bottom;
-	 	unsigned int left;
-	};
-	
-	CPrinter( QObject* parent );
-	virtual ~CPrinter();
-  /**
-  * Sets the vertical position of the printer's painter.
-  */
-  void setVerticalPos( const int yPos );
-  /**
-  * returns the vertical position of the printer's painter.
-  */
-  const int verticalPos() const;
-	/**
-	* Creates a new page and positions the painter at the beginning of it.
-	*/
-  const bool newPage();
-  /**
- 	* Returns the margins of the pages.
- 	*/
-  const CPrinter::CPageMargin& pageMargins() const;
-  /**
- 	* Sets all the margins at one time.
- 	*/
-  void setAllMargins( const CPageMargin margins );
-  /**
- 	* Setups the printer using CPrinterDialog.
- 	*/
-  void setup( QWidget* parent );
-  /**
- 	* Starts printing the items.
- 	*/
-  void print();
-  /**
- 	* Sets the printing queue to queue.
- 	*/
-  void setPrintQueue(ListCPrintItem& queue);
-  /**
- 	* Returns the print queue object.
- 	*/
-  ListCPrintItem& queue();
-  /**
- 	* Appends items to the printing queue.
- 	*/
-  void appendItems( ListCPrintItem& items );
-  /**
-  * Appends the item o the queue.
-  */
-  void appendItem( CPrintItem* newItem );
-  /**
-  * Sets the application wide style list to list.
-  */
-  void setStyleList( StyleItemList& list);
-  /**
-  * Returns the list of styles.
-  */
-  StyleItemList& styleList();
-  /**
-  * Reimplementation. cReates a new page.
-  */
-  const QRect contentSize();
-  /**
-  * Returns the config used for this printer object.
-  */
-  KConfig* const config() const;
-  /**
-  * Returns the standard stlye of the printer
-  */
-  CStyle* const standardStyle() const;
-
-public slots: // Public slots
-  /**
-  * Clears the printing queue.
-  */
-  void clearQueue();
-  /**
-  * Emits the signal that the styles changed.
-  */
-  void emitStylesChanged();
-
-protected:
-  /**
-  * Saves the styles to config file.
-  */
-  void saveStyles();
-  /**
-  * Reads the style from config.
-  */
-  void setupStyles();
-  /**
-  *
-  */
-  void saveSettings();
-  /**
- 	*
- 	*/
-  void readSettings();
-  /**
- 	* Creates the standard style.
- 	*/
-  void setupStandardStyle();
-
-private:
-	CPageMargin	m_pageMargin;
-	CPagePosition	m_pagePosition;
-	ListCPrintItem m_queue;
-	StyleItemList	m_styleList;
-	CStyle* m_standardStyle;
-	KConfig* m_config;
-
-	struct PaperSizeCache {
-		bool initialized;
-		bool refresh;		
-		KPrinter::PageSize cachedPaper;
-		QRect size;
-	} m_cachedPage;
-	
-	bool m_addedItem;
-
-  struct {
-    QString standardStyle;
-    QString bwStyle;
-  } m_styleData;
-	 	
-	QString m_styleSaveLocation;
-	QString m_styleDir;
-	
-signals: // Signals
-	/**
-	* Is emitted if percent percent of the printing process are completed.
-	*/
-	void percentCompleted(const int percent);
-  /**
- 	* Is emitted after all items were printed.
- 	*/
-  void printingFinished();
-  /**
- 	* Is emitted when printing was interrupted by the user.
- 	*/
-  void printingInterrupted();
-  /**
- 	* Is emmitted when the printing has started.
- 	*/
-  void printingStarted();	
-  /**
- 	* Is emmitted when the first item was added to the queue
-	* This signal is useful to enable the "Clear printer queue"
- 	* icon if the queue contains items
- 	*/
-  void addedFirstQueueItem();	
-  /**
- 	* Is emmitted when the printing queue was cleared.
- 	*/
-  void queueCleared();
-  /**
-  * The styles changed.
-  */
-  void sigStylesChanged();
-};
-
-/** returns the vertical position of the printer's painter. */
-inline const int CPrinter::verticalPos() const {
-	return m_pagePosition.rect.y();
-}
-
-/** Emits the signal that the styles changed. */
-inline void CPrinter::emitStylesChanged(){
-	emit sigStylesChanged();
-}
-
-#endif
-
diff --git a/bibletime/printing/cprintitem.cpp b/bibletime/printing/cprintitem.cpp
deleted file mode 100644
index 6091090..0000000
--- a/bibletime/printing/cprintitem.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/***************************************************************************
-                          cprintitem.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-#include "cprintitem.h"
-#include "cprintitemlist.h"
-#include "cstyle.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-#include "backend/cswordtreekey.h"
-//#include "backend/chtmlentrydisplay.h"
-#include "frontend/cbtconfig.h"
-#include "util/scoped_resource.h"
-
-
-//Qt includes
-#include <qsimplerichtext.h>
-#include <qlistview.h>
-#include <qregexp.h>
-#include <qstylesheet.h>
-
-//Sword includes
-#include <swmodule.h>
-#include <swkey.h>
-#include <versekey.h>
-
-
-#define PARAGRAPH_SPACE 10 // Space between different paragraphs
-#define STYLE_PART_SPACE 1	//Space between the different parts (header, moduletext ...)
-#define BORDER_SPACE 3 	//border between text and rectangle
-
-
-CPrintItem::ListViewItem::ListViewItem( QListView* parent, CPrintItem* printItem )
-	: QListViewItem(parent), m_printItem(printItem) {
-	
-};
-
-CPrintItem* const CPrintItem::ListViewItem::printItem() const {
-	return m_printItem;
-};
-
-CStyle* const CPrintItem::ListViewItem::style() const {
-	return (m_printItem) ? m_printItem->style() : 0;
-};
-
-
-CPrintItem::CPrintItem(CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description,const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions)
-  : m_style(0),
-  m_headerText(QString::null),
-  m_description(description),
-  m_moduleText(QString::null),
-  m_startKey(startKey),
-  m_module(module),
-  m_listViewItem(0),
-  m_displayOptions(displayOptions),
-  m_filterOptions(filterOptions)
-{	
-	m_startEmpty = startKey.isEmpty();	
-	m_stopKey = (!m_startEmpty && (startKey != stopKey) ) ? stopKey : QString::null;
-	m_stopEmpty  = m_stopKey.isEmpty();	
-	
-	headerText();
-	moduleText(); //cache the module text, makes printing faster (at least the user thinks this :)
-}
-
-/** Returns the moduletext used by this item. */
-const QString& CPrintItem::moduleText() {
-	/**
-	* If a special text is set use the text.
-	* If the moduleText variable is empty use the CModuleInfo
-	* object to retrieve the text,
-	*/
-	if (!m_moduleText.isEmpty()) //cached text
-		return m_moduleText;
-
-	if (m_startEmpty || !m_module)
-		return QString::null;
-
-	CPointers::backend()->setDisplayOptions(m_displayOptions);
-	CPointers::backend()->setFilterOptions(m_filterOptions);	
-	
-	if (m_stopEmpty) {//only start key
-		util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(m_module));
-		key->key(m_startKey);
-		m_moduleText = key->renderedText();			
-	}
-	else if (m_module->type() == CSwordModuleInfo::Bible || m_module->type() == CSwordModuleInfo::Commentary ) {
-		util::scoped_ptr<CSwordVerseKey> startKey(dynamic_cast<CSwordVerseKey*>(CSwordKey::createInstance(m_module)));
-		util::scoped_ptr<CSwordVerseKey> stopKey(dynamic_cast<CSwordVerseKey*>(CSwordKey::createInstance(m_module)));
-		
-		startKey->key(m_startKey);
-		stopKey->key(m_stopKey);
-	
-//		const QString format = QString::fromLatin1(" <FONT SIZE=\"-2\"><NOBR>%1</NOBR></FONT>");
-		const QString format = QString::fromLatin1(" <FONT SIZE=\"-3\"><NOBR>%1</NOBR></FONT> ");
-		while ( (*startKey) < (*stopKey) || (*startKey) == (*stopKey) ) {
-			m_moduleText += (m_displayOptions.verseNumbers ? format.arg(startKey->Verse()) : QString::null)
-+ startKey->renderedText() + (/*m_displayOptions.lineBreaks ?*/ "<BR>\n"/* : QString::null*/);
-			startKey->next(CSwordVerseKey::UseVerse);
-		}
-	}
-//	else if (m_module->type() == CSwordModuleInfo::GenericBook ) {
-//		util::scoped_ptr<CSwordTreeKey> startKey(dynamic_cast<CSwordTreeKey*>(CSwordKey::createInstance(m_module)));
-//		util::scoped_ptr<CSwordTreeKey> stopKey(dynamic_cast<CSwordTreeKey*>(CSwordKey::createInstance(m_module)));
-//
-//		startKey->key(m_startKey);
-//		stopKey->key(m_stopKey);
-//
-//    while ( (startKey < stopKey) || (startKey == stopKey) ) {
-//      m_moduleText = startKey->renderedText();
-//      (*startKey)++;
-//      qWarning(startKey->key().latin1());
-//    }
-//  };
-	
-	m_moduleText.replace(QRegExp("$\n\n+"), "");
-	m_moduleText.replace(QRegExp("$<BR><BR>+"), "");	
-	return m_moduleText;
-}
-
-/** Sets the style for this item. */
-void CPrintItem::setStyle( CStyle* newStyle ) {
-	m_style = newStyle;
-}
-
-CStyle* const CPrintItem::style() const {
-	return m_style;
-}
-
-/** Returns the listview item for this printitem. */
-QListViewItem* CPrintItem::listViewItem( CPrintItemList* list ) {
-	deleteListViewItem();
-	m_listViewItem = new ListViewItem( list, this );
-	updateListViewItem();
-	return m_listViewItem;
-}
-
-/** Updates the item. */
-void CPrintItem::updateListViewItem(){
-	if (m_module)
-		m_listViewItem->setText(0, m_module->name() );
-	
-	if (!m_startEmpty)
-		m_listViewItem->setText(1,m_startKey);
-	
-	if (!m_stopEmpty)
-		m_listViewItem->setText(2,m_stopKey);
-	else if (!m_startEmpty)
-		m_listViewItem->setText(2,m_startKey);
-	
-	if (m_style)
-		m_listViewItem->setText(3, m_style->styleName() );
-}
-
-/**  */
-
-QListViewItem* const CPrintItem::listViewItem() const {
-	return m_listViewItem;
-}
-
-/** Deletes the list view item. */
-void CPrintItem::deleteListViewItem(){
-	delete m_listViewItem;
-	m_listViewItem = 0;
-}
-
-/** Draws the content of this item on the page. */
-void CPrintItem::draw(QPainter* p, CPrinter* printer){
-	/**
-	* Print this item
-	* Steps to do for the printing:
-	*
-	*	1. Get the settings (font, colors, alignment etc.) and generate the correct richtext for this (correct alignment)
-	*	2. Apply the settings to the printer's painter object
-	*/
-	QFont font;
-	QColor fgColor;
-	QColor bgColor;
-	CStyle::Format* format;
-	CStyle::Format::Frame* frame = 0;
-	int frameThickness = 0;
-	CStyle::Format::Alignment alignment;	
-	CStyle::StyleType type = CStyle::Unknown;
-	QString text;
-	
-	QColorGroup cg;
-	QPen pen;
-	QBrush brush;
-
-	const int leftMargin 	= printer->pageMargins().left;
-	const int upperMargin = printer->pageMargins().top;	
-	const QRect pageSize =  printer->contentSize();
-	const int pageHeight 	= pageSize.height();
-	const int pageWidth 	= pageSize.width();
-	
-//moved out of the loop for optimization	
-	int verticalPos = printer->verticalPos();		
-	int arguments	= 0;
-	QRect boundingRect; //rectangle for the content
-	QRect br;	
-	QRect view;
-	QPen framePen;
-	int movePixs;
-	
-	for (int i = 0; i < 3; ++i) {		
-		type = static_cast<CStyle::StyleType>(i);
-		
-		if (!m_style->hasFormatTypeEnabled(type)) //jump to next part if this is not enabled
-			continue;
-				
-		format 	= m_style->formatForType( type );
-		fgColor = format->color( CStyle::Format::Foreground );
-		bgColor = format->color( CStyle::Format::Background );
-		pen.setColor(fgColor);
-		font = format->font();
-		
-		frame = format->frame();
-		frameThickness = frame ? frame->thickness() : 0;		
-		alignment = format->alignment();
-		if (type == CStyle::Header)
-			text = headerText();
-		else if (type == CStyle::Description)
-			text = m_description;
-		else
-			text = moduleText();
-
-		p->setFont(font);
-		p->setPen(pen);
-		cg.setColor(QColorGroup::Text, fgColor);
-				
-		arguments = Qt::WordBreak;		
-		if (alignment == CStyle::Format::Left)
-			arguments |= Qt::AlignLeft;
-		else if (alignment == CStyle::Format::Center)
-			arguments |= Qt::AlignHCenter;
-		else if (alignment == CStyle::Format::Right)
-			arguments |= Qt::AlignRight;
-				
-		if ((type == CStyle::Header || type == CStyle::Description) && !text.isEmpty()) {
-			boundingRect = p->boundingRect (
-				leftMargin, //x of upper left corner
-				verticalPos, //y of upper left corner
-				pageWidth - 2*BORDER_SPACE - 2*frameThickness, //pixels to the right from the upper left corner
-				pageHeight - 2*BORDER_SPACE - 2*frameThickness - verticalPos + upperMargin, //pixels down from upper left corner
-				arguments, text
-			);
-			
-			//check if the new text fits into the current page page
-			//WARNING: use 2* or 1* frameThickness here??
-			if ( 		( boundingRect.height() + 2*BORDER_SPACE + 2*frameThickness + STYLE_PART_SPACE )
-						> ( pageHeight - verticalPos  + upperMargin ) )
-			{
-				//this part doesn't fit on the current page
-				printer->newPage();
-				verticalPos = printer->verticalPos();
-				boundingRect = p->boundingRect(
-					leftMargin,
-					verticalPos,
-					pageWidth - 2*BORDER_SPACE - 2*frameThickness,
-					pageHeight- 2*BORDER_SPACE - 2*frameThickness - verticalPos + upperMargin,
-					arguments, text
-				);
-			}
-			br = boundingRect;	//rectangle for the background fill		
-			br.setLeft(leftMargin);
-			br.setWidth(pageWidth-frameThickness); //because we move in the next lines
-			br.setHeight(br.height()+BORDER_SPACE); //because we move in the next lines
-			br.moveBy(frameThickness, frameThickness);			
-			p->fillRect(br, bgColor);
-
-			br = boundingRect;	// the rect for the border		
-			/**
-			* we have to substract frameThickness/2,
-			* because QPainter paints one half outside and the other part inside the rectangle.
-			*/
-			const int halfWidth = (int)((float)frameThickness/2);
-
-//			br.setHeight( br.height() + 2*halfWidth  + BORDER_SPACE );						
-			br.setLeft( leftMargin + halfWidth );
-			br.setTop( br.top() + halfWidth ); //boundingRect is moved by 2*halfWidth down -> use +halfWidth !!
-			br.setWidth( pageWidth - 2*halfWidth);
-			br.setHeight( br.height() + 2*halfWidth  + BORDER_SPACE );						
-			
-//			boundingRect.setWidth(boundingRect.width()+5);//HACK to avoid cut letters
-			boundingRect.moveBy(BORDER_SPACE + frameThickness, frameThickness);
-//			arguments |= Qt::AlignVCenter; //WARNING: Right here? Will it change the boundingrect??
-
-    		p->setClipRect(
-    			upperMargin,
-    			leftMargin,
-    			pageWidth,
-    			pageHeight
-    		);
-
-			p->drawText(boundingRect, arguments, text);
-			
-			p->setClipping(false);
-			
-			printer->setVerticalPos(boundingRect.top() + boundingRect.height() + 2*frameThickness + STYLE_PART_SPACE);
- 			verticalPos = printer->verticalPos();
- 			
-			if (frame) {
-				framePen = pen;
-				framePen.setWidth( frameThickness );
-				framePen.setColor( frame->color() );
-				framePen.setStyle( frame->lineStyle() );
-				p->setPen( framePen );
-
-				p->drawRect( br );
-			}						
-		}
-		else if (type == CStyle::ModuleText) {		
-			p->save();
-			
-			font = CBTConfig::get( m_module->language() ).second;
-
-			if (alignment == CStyle::Format::Center)		
-				text = QString::fromLatin1("<CENTER>%1</CENTER>").arg(text);
-			else if (alignment == CStyle::Format::Right)		
-				text = QString::fromLatin1("<P ALIGN=\"RIGHT\">%1</P>").arg(text);
-    	QSimpleRichText richText(
-    		text,
-    		font,
-    		QString::null,
-    		QStyleSheet::defaultSheet(),
-    		QMimeSourceFactory::defaultFactory(),
-				pageHeight + upperMargin - verticalPos - 2*frameThickness - 2*BORDER_SPACE
-			);
-
-    	richText.setWidth( p, pageWidth-2*frameThickness-2*BORDER_SPACE );
-    	view = QRect( //the content area of the whole page
-    		leftMargin + frameThickness  + BORDER_SPACE,
-    		upperMargin + frameThickness + BORDER_SPACE,
-	    	pageWidth - 2*frameThickness - 2*BORDER_SPACE,
-	    	pageHeight - 2*frameThickness - 2*BORDER_SPACE
-    	);
-    	
-    	int translated = 0;
-    	do {
-    		if ((int)(verticalPos - upperMargin + richText.height() - translated) <= (int)(pageHeight) ) {
-    			//text fits on current page
-					br = QRect (
-	    			leftMargin + frameThickness,
-	    			verticalPos + frameThickness,
-		    		pageWidth - frameThickness,
-		    		richText.height() - translated + frameThickness + BORDER_SPACE
-	    		);
-				}
-    		else { //doesn't fit completely on current page, fill to bottom of the page    		
-		    	br = QRect(
-		    		leftMargin + frameThickness,
-		    		verticalPos + frameThickness,
-			    	pageWidth - frameThickness,
-			    	pageHeight - verticalPos + upperMargin - frameThickness
-		    	);
-    		}
-				br.moveBy(0,translated); //we have to move down as far as the painter moved    		
-    		p->setClipRect(
-    			upperMargin,
-    			leftMargin,
-    			pageWidth,
-    			pageHeight
-    		);
-   			p->fillRect(br,QBrush(bgColor)); //fill rect with background color
-				if (frame) {
-					br.moveBy( (int)(-(float)frameThickness/2), (int)(-(float)frameThickness/2) );	
-
-					framePen = pen;
-					framePen.setWidth( frameThickness );
-					framePen.setColor( frame->color() );
-					framePen.setStyle( frame->lineStyle() );
-					p->setPen( framePen );
-
-					p->drawRect(br);
-				}						   			
-    		p->setClipping(false);
-    		
-        richText.draw(p, leftMargin+frameThickness+BORDER_SPACE, verticalPos+frameThickness+BORDER_SPACE, view, cg);
-				movePixs = //move down the painted area height
-						(((int)richText.height()-translated) > (int)(pageHeight - verticalPos + upperMargin ))
-					? (pageHeight - verticalPos + upperMargin) //move to bottom of page
-					: richText.height() - translated + 2*frameThickness + 2*BORDER_SPACE; //only move the painted area
-
-   			printer->setVerticalPos(verticalPos + movePixs);					
-
-		    view.moveBy( 0,movePixs);
-        p->translate( 0,-movePixs);
-        translated += movePixs;
-        if ( view.top() >= richText.height() ) //bottom or top(default)
-    			break;
-
-    		printer->newPage();
-   			verticalPos = printer->verticalPos();    		
-    	} while (true);
-			p->restore();
-    }
-	}
-	printer->setVerticalPos(printer->verticalPos() + PARAGRAPH_SPACE);	
-}
-
-/** Updates and returns the header text. */
-const QString& CPrintItem::headerText() {
-	if (!m_headerText.isEmpty())  // cached?
-		return m_headerText;
-
-  if (m_startEmpty)
-  	return QString::null; 	
-	if (m_stopEmpty)
-		m_headerText = m_startKey;
-	else {//start and stop key do exist and are different
-		m_headerText = QString::fromLatin1("%1 - %2").arg(m_startKey).arg(m_stopKey);
-	}	
-	return m_headerText;
-}
diff --git a/bibletime/printing/cprintitem.h b/bibletime/printing/cprintitem.h
deleted file mode 100644
index 81b33a3..0000000
--- a/bibletime/printing/cprintitem.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
-                          cprintitem.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPRINTITEM_H
-#define CPRINTITEM_H
-
-//BibleTime includes
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qobject.h>
-#include <qguardedptr.h>
-#include <qptrlist.h>
-#include <qlistview.h>
-
-class CSwordKey;
-class CSwordModuleInfo;
-class CStyle;
-class CPrinter;
-class CPrintItem;
-class CPrintItemList;
-
-typedef QPtrList<CPrintItem> ListCPrintItem;
-
-/**
-	* The class which implements the printable items.
-  * @author The BibleTime team
-  */
-class CPrintItem {
-public:
-  class ListViewItem : public QListViewItem {
-		public:
-			ListViewItem( QListView* parent, CPrintItem* printItem );
-			CPrintItem* const printItem() const;		
-			CStyle* const style() const;			
-		private:
-			CPrintItem* m_printItem;
-  };
-	
-	CPrintItem(CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description = QString::null, const CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(),const CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults() );
-  /**
-	* Sets the style for this item.
- 	*/
-	void setStyle( CStyle* );
-  /**
-	* Sets the style for this item.
- 	*/
-	CStyle* const style() const;
-  /**
- 	* Returns the listview item for this printitem.
- 	*/
-  QListViewItem* listViewItem( CPrintItemList* );
-  /**
- 	* Updates the item.
- 	*/
-  void updateListViewItem();
-  /**
-	* Returns the used ListView item.
-	*/
-  QListViewItem* const listViewItem() const;
-  /**
- 	* Deletes the list view item.
- 	*/
-  void deleteListViewItem();
-  /**
-  * Draws the content of this item on the page.
-  */
-  void draw(QPainter* p, CPrinter* printer);
-
-private: // Protected attributes
-  const QString& headerText();
-  const QString& moduleText();
-
-  CStyle* m_style;
-  QString m_headerText;
-  QString m_description;
-  QString m_moduleText;
-	QString m_startKey;
-	QString m_stopKey;
-	bool m_startEmpty;
-	bool m_stopEmpty;
-  CSwordModuleInfo* m_module;
-  QListViewItem* m_listViewItem;
-
-  CSwordBackend::DisplayOptions m_displayOptions;
-  CSwordBackend::FilterOptions m_filterOptions;
-};
-
-#endif
diff --git a/bibletime/printing/cprintitemlist.cpp b/bibletime/printing/cprintitemlist.cpp
deleted file mode 100644
index 3bd6ad6..0000000
--- a/bibletime/printing/cprintitemlist.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/***************************************************************************
-                          cprintitemlist.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//Own includes
-#include "cprintitemlist.h"
-
-//Qt includes
-#include <qstring.h>
-
-//KDE includes
-#include <klocale.h>
-
-CPrintItemList::CPrintItemList( ListCPrintItem* items,  QWidget *parent, const char *name ) : KListView(parent,name) {
-	m_items = items;
-	initView();
-	
-	insertItems(m_items);
-}
-
-CPrintItemList::~CPrintItemList(){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		if (m_items->current())
-			m_items->current()->deleteListViewItem();
-	}	
-}
-
-/** Initializes the view. */
-void CPrintItemList::initView(){
-	setAllColumnsShowFocus(true);
-	addColumn(i18n("Module"),-1);
-	addColumn(i18n("From"), -1);
-	addColumn(i18n("To"), -1);	
-	addColumn(i18n("Style"), -1);	
-
-  //disable sorting for all columns
-  setSorting(-1);    
-  	
-	setSelectionMode( QListView::Extended );
-}
-
-/** Inserts the items of the list into the tree. */
-void CPrintItemList::insertItems( ListCPrintItem* itemList ) {
-	const bool sameList = (itemList == m_items);
-	for(itemList->last(); itemList->current(); itemList->prev() ) {
-		if (!sameList)
-			m_items->append(itemList->current());
-		itemList->current()->listViewItem(this);	//insert the QListViewItem into the list
-	}
-}
-
-/** Sets the tree to contain the items of the list. Other items will be removed. */
-void CPrintItemList::setItems( ListCPrintItem* itemList ){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		if (m_items->current())
-			m_items->current()->deleteListViewItem();
-	}
-	insertItems( itemList );
-}
-
-/** Deletes the current item. */
-void CPrintItemList::deleteSelectedItems(){
-	QPtrList<QListViewItem> items = selectedItems();	
-	if (!items.count())
-		return;
-	const bool autoDelete = items.autoDelete();
-	
-	CPrintItem* p = 0;
-	for (items.first(); items.current(); items.next()) {
-		if ( CPrintItem::ListViewItem* item = dynamic_cast<CPrintItem::ListViewItem*>(items.current()) ) {
-			if (!(p = item->printItem()))
-				continue;
-      const int pos = m_items->findRef(p);
-			if (pos != -1) //make sure item's pointer was found
-        m_items->take(pos);
-			p->deleteListViewItem();
-			if (!autoDelete)
-				delete p;
-		}
-	}
-}
-
-/** Moves the item one item up. */
-void CPrintItemList::moveUp(){
-	QPtrList<QListViewItem> items = selectedItems();
-	for (items.first(); items.current(); items.next()) {
-		QListViewItem* current = items.current();
-		if (current && current->itemAbove() &&  current->itemAbove()->itemAbove()) {
-			current->moveItem( current->itemAbove()->itemAbove() );
-		}
-	}
-}
-
-/** Moves the selected entry one entry down. */
-void CPrintItemList::moveDown(){
-	QPtrList<QListViewItem> items = selectedItems();
-	for (items.last(); items.current(); items.prev()) {
-		QListViewItem* current = items.current();
-		if (current && current->itemBelow()) {
-			current->moveItem( current->itemBelow() );
-		}
-	}
-}
-
-/** Applies the style to the selected items. */
-void CPrintItemList::applyStyleToSelected( CStyle* style){
-	CPrintItem* printItem;
-	CPrintItem::ListViewItem* item;
-	QPtrList<QListViewItem> list = selectedItems();
-	for ( QListViewItem* i = list.first(); i; i = list.next()) {
-		if ((item = dynamic_cast<CPrintItem::ListViewItem*>(i))) {
-			printItem = item->printItem();
-			printItem->setStyle(style);
-			printItem->updateListViewItem();
-		}
-	}
-}
-
diff --git a/bibletime/printing/cprintitemlist.h b/bibletime/printing/cprintitemlist.h
deleted file mode 100644
index fc1cf8f..0000000
--- a/bibletime/printing/cprintitemlist.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
-                          cListCPrintItem.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPRINTITEMLIST_H
-#define CPRINTITEMLIST_H
-
-#include <qwidget.h>
-#include <qptrlist.h>
-#include <klistview.h>
-
-#include "cprintitem.h"
-
-/**A KListView derived class which handles CPrintItem classes
-  *@author The BibleTime team
-  */
-class CPrintItemList : public KListView  {
-   Q_OBJECT
-public:
-	CPrintItemList(ListCPrintItem* items, QWidget *parent=0, const char *name=0);
-	~CPrintItemList();
-  /**
- 	* Sets the tree to contain the items of the list. Other items will be removed.
- 	*/
-  virtual void setItems( ListCPrintItem* itemList);
-  /**
- 	* Inserts the items of the list into the tree.
- 	*/
-  virtual void insertItems( ListCPrintItem* itemList );
-  /**
- 	* Initializes the view.
- 	*/
-  virtual void initView();
-  /**
- 	* Applies the style to the selected items.
- 	*/
-  void applyStyleToSelected( CStyle* );
-
-public slots: // Public slots
-  /**
- 	* Moves the selected entry one entry down.
- 	*/
-  void moveDown();
-  /**
- 	* Moves the item one item up.
- 	*/
-  void moveUp();
-  /**
- 	* Deletes the current item.
- 	*/
-  void deleteSelectedItems();
-
-private:
-	ListCPrintItem* m_items;		
-};
-#endif
diff --git a/bibletime/printing/cstyle.cpp b/bibletime/printing/cstyle.cpp
deleted file mode 100644
index b460fc8..0000000
--- a/bibletime/printing/cstyle.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-/***************************************************************************
-                          cstyle.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cstyle.h"
-#include "cstylelist.h"
-
-
-//Qt includes
-#include <qapplication.h>
-#include <qdom.h>
-#include <qfile.h>
-#include <qlistview.h>
-#include <qstring.h>
-#include <qtextstream.h>
-
-//KDE includes
-#include <klocale.h>
-
-#define CURRENT_SYNTAX_VERSION 1
-
-CStyle::Format::Format(const CStyle::StyleType type) : m_frame(0), m_type(type) {
-	clearData();
-}
-
-CStyle::Format::Format(const Format& f) {
-	m_BGColor = f.m_BGColor;
-	m_FGColor = f.m_FGColor;
-	m_alignment = f.m_alignment;
-	m_font = f.m_font;
-	m_hasFrame = f.m_hasFrame;			
-	m_frame = 0;
-	if (m_hasFrame) {
-		Frame* newFrame = frame();//create
-		*newFrame = *f.m_frame; //copy content
-	}
-	m_type = f.m_type;
-};
-
-CStyle::Format::~Format(){
-	delete m_frame;
-}
-
-/** Returns the font of this style. */
-const QFont& CStyle::Format::font() const {
-	return m_font;
-}
-
-/** sets the font of this format. */
-void CStyle::Format::setFont( QFont newFont ) {
-	m_font = newFont;
-}
-
-/** Returns the background color of this format. */
-const QColor& CStyle::Format::color( const Color type ) const {
-	switch (type) {
-		case Foreground:
-			return m_FGColor;
-		case Background:
-			return m_BGColor;		
-	};
-	return Qt::white; //shouldn't be executed
-}
-
-/** Sets the foreground color of this format. */
-void CStyle::Format::setColor( const Color type, const QColor& newColor ) {
-	switch (type) {
-		case Foreground:
-			m_FGColor = newColor;
-			break;
-		case Background:
-			m_BGColor = newColor;
-			break;
-	};
-}
-
-/** Returns the frame if we have one. Otherwise we return 0. */
-CStyle::Format::Frame* const CStyle::Format::frame() {
-	if (m_hasFrame)
-		return !m_frame ? (m_frame = new CStyle::Format::Frame) : m_frame;
-	return 0;
-}
-
-/** Sets the frame of this style. */
-void CStyle::Format::setFrameEnabled( const bool hasFrame ) {
-	m_hasFrame = hasFrame;
-	if (!m_hasFrame) {
-		delete m_frame;
-		m_frame = 0;
-	};
-}
-
-/** Returns the alignement of this style format. */
-const CStyle::Format::Alignment& CStyle::Format::alignment() const {
-	return m_alignment;
-}
-
-/** Sets the alignement flags of this style format. */
-void CStyle::Format::setAlignment( const Alignment newAlignment) {
-	m_alignment = newAlignment;
-}
-
-/** Resets the data variables. */
-void CStyle::Format::clearData(){
-	m_BGColor = Qt::white;
-	m_FGColor = Qt::black;	
-	delete m_frame;
-	m_frame = 0;	
-	m_hasFrame = false;
-	m_font = QApplication::font();
-	m_alignment = Format::Left;
-}
-
-const CStyle::StyleType CStyle::Format::type() const {
-	return m_type;
-}
-
-CStyle::Format::Frame::Frame() {
-	m_thickness = 1;
-	m_color = Qt::black;
-	m_lineStyle = Qt::SolidLine;
-}
-
-CStyle::Format::Frame::Frame(const Frame& f) {
-	m_thickness = f.m_thickness;
-	m_color = f.m_color;
-	m_lineStyle = f.m_lineStyle;
-}
-
-/** Returns the thickness of this frame. */
-const int& CStyle::Format::Frame::thickness() const {
-	return m_thickness;
-}
-
-/** Sets te thickness of this frame. */
-void CStyle::Format::Frame::setThickness( const int newThickness ) {
-	m_thickness = newThickness;
-}
-
-/** Returns the style how to paint the lines of this frame. */
-const Qt::PenStyle& CStyle::Format::Frame::lineStyle() const {
-	return m_lineStyle;
-}
-
-/** Sets the style how to paint the lines. */
-void CStyle::Format::Frame::setLineStyle( const Qt::PenStyle newLineStyle ){
-	m_lineStyle = newLineStyle;
-}
-
-/** Returns the color of this frame. */
-const QColor& CStyle::Format::Frame::color() const {
-	return m_color;
-}
-
-/** Sets the color of this frame. */
-void CStyle::Format::Frame::setColor( const QColor& newColor ) {
-	m_color = newColor;
-}
-
-CStyle::CStyle() :
-	m_headerFormat(new Format(CStyle::Header)),
-	m_descriptionFormat(new Format(CStyle::Description)),
-	m_moduleTextFormat(new Format(CStyle::ModuleText))
-{
-
-	//dummy command to translate names of standard styles
-//	i18n("Standard");
-//	i18n("Colored style for larger text portions");
-//18n("Black&White for larger text portions");
-	
-	m_listViewItem = 0;
-	m_isHeaderFormatEnabled = m_isDescriptionFormatEnabled = m_isModuleTextFormatEnabled = true;
-
-	setStyleName( i18n("Unknown") );
-};
-
-CStyle::CStyle( const QString text ) :
-	m_headerFormat(new Format(CStyle::Header)),
-	m_descriptionFormat(new Format(CStyle::Description)),
-	m_moduleTextFormat(new Format(CStyle::ModuleText))
-{
-	m_listViewItem = 0;
-	m_isHeaderFormatEnabled = m_isDescriptionFormatEnabled = m_isModuleTextFormatEnabled = true;
-	
-	loadFromText(text);	
-}
-
-CStyle::~CStyle(){
-  delete m_headerFormat;
-  delete m_descriptionFormat;
-  delete m_moduleTextFormat;
-}
-
-/** Returns the proper CStyleFormat for the given type. */
-CStyle::Format* const CStyle::formatForType( const CStyle::StyleType type) {
-	switch (type) {
-		case Header:
-			return m_headerFormat;
-		case Description:
-			return m_descriptionFormat;		
-		case ModuleText:
-			return m_moduleTextFormat;		
-		default:
-			return 0;
-	}
-}
-
-/** Set the printing of the header (true enables it). */
-void CStyle::setFormatTypeEnabled( const CStyle::StyleType type, const bool setEnabled) {
-	switch (type) {
-		case Header:
-			m_isHeaderFormatEnabled = setEnabled;
-			break;
-		
-		case Description:
-			m_isDescriptionFormatEnabled = setEnabled;		
-			break;
-		
-		case ModuleText:
-			m_isModuleTextFormatEnabled = setEnabled;		
-			break;
-		
-		default:
-			break;
-	}
-}
-
-/** Returns a QListViewItem for inserted in list. */
-QListViewItem* const CStyle::listViewItem( CStyleList* const list ){
-	if (!list) {
-		if (!m_listViewItem)
-			return 0;
-		else
-			return m_listViewItem;
-	}
-	deleteListViewItem();
-	m_listViewItem = new QListViewItem( list );
-	updateListViewItem();	
-	return m_listViewItem;
-}
-
-/** Returns the style name */
-const QString& CStyle::styleName() const{
-	return m_name;
-}
-
-/** Sets the name of the style. */
-void CStyle::setStyleName( const QString name ){
-	m_name = name;
-}
-
-/** Clears all variables and sets them back */
-void CStyle::clearData(){
-//	qDebug("CStyle::clearData()");
-	deleteListViewItem();
-	m_name = QString::null;
-	m_isDescriptionFormatEnabled = m_isHeaderFormatEnabled = m_isModuleTextFormatEnabled = true;		
-}
-
-/** Updates the Listview items */
-void CStyle::updateListViewItem(){
-//	qWarning("CStyle::updateListViewItem() for %s", m_name.latin1());
-	m_listViewItem->setText(0, styleName() );
-}
-
-/** Deletes the list view item. */
-void CStyle::deleteListViewItem(){
-	delete m_listViewItem;
-	m_listViewItem = 0;
-}
-
-/** Loads the session from a XML file. */
-const bool CStyle::loadFromFile(const QString& filename){
-	QFile file(filename);
-	if (!file.exists()) {
-		qWarning("file doesn't exist");
-		return false;
-	}
-	
-	if (file.open(IO_ReadOnly)) {	
-		QTextStream t(&file);
-		t.setEncoding(QTextStream::UnicodeUTF8);		
-		loadFromText( t.read() );
-		file.close();	
-	}
-	else {
-		qWarning("CStyle::load: unable to open file %s", filename.latin1());
-		return false;
-	};
-  return true;
-}
-
-const bool CStyle::loadFromText(const QString& text){
-/**
-* The XML file should look like this:
-* 	
- <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC >
- <BibleTimePrintingStyle syntaxVersion="1" name="Standard" translate="1">
-  <HEADER enabled="1" alignment="center">
-    <COLORS bgcolor="black" fgcolor="white">
-    <FONT family="Arial" charset="2" pointsize="10" weight="1" italic="0">
-    <FRAME enabled="1" color="blue" style="1" thickness="2">
-  </HEADER>
- </BibleTimePrintingStyle>
-*/
-	QDomDocument doc;		
-  doc.setContent(text);
-	
-  QDomElement document = doc.documentElement();
-  if(document.tagName() != "BibleTimePrintingStyle") {
-		qWarning("CProfile::load: Missing BibleTime doc");
-		return false;
-	}
-	if (document.hasAttribute("name")) { //name of the printing style
-		m_name = document.attribute("name");
-		if (document.hasAttribute("translate") && document.attribute("translate").toInt()) {
-			m_name = i18n(m_name.local8Bit()); //standard styles should be translated
-		}
-	}
-	
-	QDomElement elem = document.firstChild().toElement();
-	while (!elem.isNull()) {
-		StyleType type = Unknown;
-		if (elem.tagName() == "HEADER") {
-			type = Header;
-		}
-		else if (elem.tagName() == "DESCRIPTION") {
-			type = Description;
-		}
-		else if (elem.tagName() == "MODULETEXT") {
-			type = ModuleText;
-		}
-		Format* p = formatForType(type);
-
-		if (!p || type == Unknown)
-			continue;
-		
-		if (elem.hasAttribute("enabled")) {
-			setFormatTypeEnabled(type, elem.attribute("enabled").toInt());
-		}
-		if (elem.hasAttribute("alignment")) {		
-			const int align = elem.attribute("alignment").toInt();
-			p->setAlignment( static_cast<Format::Alignment>(align) );
-		}
-		
-		QDomElement object = elem.namedItem("COLORS").toElement();
-		if (!object.isNull()) {
-			if (object.hasAttribute("bgcolor"))
-				p->setColor(Format::Background, QColor(object.attribute("bgcolor")));
-			if (object.hasAttribute("fgcolor"))
-				p->setColor(Format::Foreground, QColor(object.attribute("fgcolor")));				
-		}
-
-		object = elem.namedItem("FONT").toElement();
-		if (!object.isNull()) {
-			QString family = object.hasAttribute("family") ? object.attribute("family") : QApplication::font().family();
-			unsigned int size = object.hasAttribute("pointsize") ? object.attribute("pointsize").toInt() : QApplication::font().pointSize();
-			const int weight = object.hasAttribute("weight") ? object.attribute("weight").toInt() : QFont::Normal;
-			const bool italic = object.hasAttribute("italic") ? static_cast<bool>(object.attribute("italic").toInt()) : false;
-			
-			if (family.isEmpty())
-				family = QApplication::font().family();
-			if (!size)
-				size = QApplication::font().pointSize();
-			
-			p->setFont( QFont(family, size, weight, italic) );			
-		}	
-
-		object = elem.namedItem("FRAME").toElement();
-		if (!object.isNull()) { //frame-section exists
-			const bool enabled = object.hasAttribute("enabled") ? object.attribute("enabled").toInt() : false;			
-			p->setFrameEnabled(enabled);
-			if (Format::Frame* frame = p->frame()) {
-				const QColor color = object.hasAttribute("color") ? QColor(object.attribute("color")) : Qt::white;
-				Qt::PenStyle style = object.hasAttribute("style") ? static_cast<Qt::PenStyle>(object.attribute("style").toInt()) : Qt::SolidLine;
-				const int thickness = object.hasAttribute("thickness") ? object.attribute("thickness").toInt() : 1;			
-				
-				frame->setColor(color);
-				frame->setLineStyle(style);
-				frame->setThickness(thickness);
-			}
-		}
-		elem = elem.nextSibling().toElement();	
-	}
-	return true;
-}
-
-const bool CStyle::saveToFile( const QString& filename ){
-/* Saved file should look like this:
-
- <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC >
- <BibleTimePrintingStyle syntaxVersion="1" name="Standard" translate="1">
-  <HEADER enabled="1" alignment="center">
-    <COLORS bgcolor="black" fgcolor="white">
-    <FONT family="Arial" charset="2" pointsize="10" weight="1" italic="0">
-    <FRAME enabled="1" color="blue" style="1" thickness="2">
-  </HEADER>
-  // same for DESCRIPTION and MODULETEXT
-
- </BibleTimePrintingStyle>
-*/
-	bool ret = false;
-	
-  QDomDocument doc("DOC");
-  doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-  QDomElement content = doc.createElement("BibleTimePrintingStyle");
-  content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-  content.setAttribute("name", m_name);
-  content.setAttribute("translate", 0); //don't trabslate styles except of prinstalled ones
-  doc.appendChild(content);
-
-  for (unsigned int i = Header; i <= ModuleText; ++i) {
-		QDomElement elem;
-			
-		const StyleType type = static_cast<StyleType>(i);
-		switch (type) {
-			case Header:
-				elem = doc.createElement("HEADER");
-				break;
-			case Description:
-				elem = doc.createElement("DESCRIPTION");			
-				break;
-			case ModuleText:
-				elem = doc.createElement("MODULETEXT");
-				break;
-			default:
-				break;
-		};		
-		if (elem.isNull()) //shouldn't happen
-			continue;
-		content.appendChild(elem);
-			
-		Format* format = formatForType(type);			
-		
-		elem.setAttribute("enabled", hasFormatTypeEnabled(type));
-		elem.setAttribute("alignment", static_cast<int>(format->alignment()));
-		
-		QDomElement object = doc.createElement("COLORS");
-		object.setAttribute("bgcolor", format->color(Format::Background).name());
-		object.setAttribute("fgcolor", format->color(Format::Foreground).name());
-		elem.appendChild(object);		
-				
-		QFont font = format->font();
-		object = doc.createElement("FONT");
-		object.setAttribute("family", font.family());
-		object.setAttribute("pointsize", font.pointSize());		
-		object.setAttribute("weight", font.weight());
-		object.setAttribute("italic", font.italic());
-		elem.appendChild(object);
-						
-		object = doc.createElement("FRAME");		
-		Format::Frame* frame = format->frame();
-		object.setAttribute("enabled", static_cast<bool>(frame) );
-		if (frame) {
-			object.setAttribute("color", frame->color().name());
-			object.setAttribute("thickness", frame->thickness());
-			object.setAttribute("style", static_cast<int>(frame->lineStyle()) );
-    }		
-		elem.appendChild(object);
-  };
-  ret = false;
-
-
-	QFile file(filename);
-	if (file.open(IO_WriteOnly)) {
-		ret = true;
-		QTextStream t( &file );        // use a text stream
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		t << doc.toString();
-		file.close();
-	}
-	return ret;
-}
diff --git a/bibletime/printing/cstyle.h b/bibletime/printing/cstyle.h
deleted file mode 100644
index 9ad385f..0000000
--- a/bibletime/printing/cstyle.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/***************************************************************************
-                          cstyle.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cprinter.h"
-
-//Qt includes
-#include <qlistview.h>
-#include <qptrlist.h>
-
-
-#ifndef CSTYLE_H
-#define CSTYLE_H
-
-//forward class decalarations
-class CStyleList;
-class CStyle;
-
-class QListViewItem;
-class QListView;
-
-typedef QPtrList<CStyle> StyleItemList;
-
-/** The class containing the properties requiredfor prinitng styles.
-  * @author The BibleTime team
-  */
-class CStyle {
-public:
-
-	enum StyleType {
-		Header = 0, /** The header displayed over each printed item */
-		Description = 1 /** The description, used in bookmarks for example */,
-		ModuleText = 2 /** The real text of the entry or the range of verses */,
-		Unknown /** Unknown for us, should not be used */
-	};
-
-	/**	
-  * A class which contains methods to support a format for the CStyle class.
-  *	@author The BibleTime team
-  * @version $Id: cstyle.h,v 1.17 2003/02/20 21:52:08 mgruner Exp $
-  */
-  class Format {
-  public:
-    class Frame  {
-    public:
-    	Frame();
-			Frame(const Frame& f);
-      /**
-      * Sets the color of this frame.
-      */
-      void setColor( const QColor& );
-      /**
-      * Returns the color of this frame.
-      */
-      const QColor& color() const;
-      /**
-      * Sets the style how to paint the lines.
-      */
-      void setLineStyle( const Qt::PenStyle );
-    	/**
-      * Returns the style how to paint the lines of this frame.
-      */
-      const Qt::PenStyle& lineStyle() const;
-      /**
-      * Sets te thickness of this frame.
-      */
-      void setThickness( const int );
-      /**
-      * Returns the thickness of this frame.
-      */
-      const int& thickness() const;
-
-    private:
-    	QColor m_color;
-    	Qt::PenStyle m_lineStyle;
-    	int m_thickness;	
-    };
-
-  	enum Alignment { Left, Center, Right, Justification};
-  	enum Color { Background, Foreground };
-    	
-  	Format(const CStyle::StyleType type = CStyle::Unknown);
-  	Format(const Format& f);
-  	~Format();
-    const CStyle::StyleType type() const;
-    /**
-   	* Returns the foreground color of this format.
-   	*/
-  	const QColor& color( const Color type ) const;
-    /**
-   	* Sets the background color of this format.
-   	*/
-    void setColor( const Color type,  const QColor& );
-    /**
-    * sets the font of this format.
-    */
-    void setFont( QFont );
-    /**
-    * Returns the font of this style.
-    */
-    const QFont& font() const;
-    /**
-   	* Sets the alignement flags of this style format.
-   	*/
-    void setAlignment( const CStyle::Format::Alignment );
-    /**
-   	* Returns the alignement of this style format.
-   	*/
-    const CStyle::Format::Alignment& alignment() const;
-    /**
-   	* Sets the frame of this style.
-   	*/
-    void setFrameEnabled( const bool hasFrame );
-    /**
-   	* Returns the frame if we have one. Otherwise we return 0.
-   	*/
-    Frame* const frame();
-
-  private:
-    void clearData();
-      	
-  	QFont m_font;
-  	QColor m_FGColor;
-  	QColor m_BGColor;
-  	bool m_hasFrame;
-  	Frame* m_frame;
-  	Alignment m_alignment;
-   	CStyle::StyleType m_type;  	
-  };
-	
-	CStyle(); //standard constructor, doesn't load from file
-	virtual ~CStyle();
-  /**
- 	* Returns the proper CStyleFormat for the given type.
- 	*/
-  CStyle::Format* const formatForType( const CStyle::StyleType );
-  /**
- 	* Set the printing of the header (true enables it).
- 	*/
-  void setFormatTypeEnabled( const CStyle::StyleType, const bool );
-  /**
- 	* Returns true if we have the given type enabled.
- 	*/
-  const bool hasFormatTypeEnabled( const CStyle::StyleType ) const;
-  /**
- 	* Returns a QListViewItem for inserted in list.
- 	*/
-  QListViewItem* const listViewItem( CStyleList* const list = 0 );
-  /**
- 	* Sets the name of the style.
- 	*/
-  void setStyleName( const QString name );
-  /**
- 	* Returns the style name
- 	*/
-  const QString& styleName() const;
-  /**
- 	* Updates the Listview items
- 	*/
-  void updateListViewItem();
-  /**
- 	* Deletes the list view item.
- 	*/
-  void deleteListViewItem();
-  /**
-  * Loads the style from a XML file.
-  */
-  const bool loadFromText(const QString& text);
-  const bool loadFromFile(const QString& file);
-  /**
-  * Saves the style to the XML file.
-  */
-  const bool saveToFile( const QString& file );
-
-protected:
-	friend class CPrinter;
-	CStyle( const QString filename );
-
-private:
-  /**
- 	* Clears all variables and sets them back
- 	*/
-  void clearData();
-	
-	QString	m_name;
-	
-  Format* m_headerFormat;
-	Format* m_descriptionFormat;		
-	Format* m_moduleTextFormat;
-	
-	bool m_isHeaderFormatEnabled;
-	bool m_isModuleTextFormatEnabled;
-	bool m_isDescriptionFormatEnabled;
-	
-	QListViewItem*	m_listViewItem;
-};
-
-/** Set the printing of the header (true enables it). */
-inline const bool CStyle::hasFormatTypeEnabled( const CStyle::StyleType type) const {
-	switch (type) {
-		case Header:
-			return m_isHeaderFormatEnabled;
-		case Description:
-			return m_isDescriptionFormatEnabled;
-		case ModuleText:
-			return m_isModuleTextFormatEnabled;
-		default:
-			return false;
-	}
-}
-
-#endif
diff --git a/bibletime/printing/cstyleeditordialog.cpp b/bibletime/printing/cstyleeditordialog.cpp
deleted file mode 100644
index 9f2dbc3..0000000
--- a/bibletime/printing/cstyleeditordialog.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/***************************************************************************
-                          cstyleeditordialog.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cstyleeditordialog.h"
-
-//KDE includes
-#include <kcombobox.h>
-#include <klocale.h>
-#include <kcolorbutton.h>
-#include <kfontdialog.h>
-
-//Qt includes
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qwidget.h>
-#include <qbuttongroup.h>
-#include <qvbuttongroup.h>
-#include <qhbuttongroup.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-
-CStyleEditorDialog::CStyleEditorDialog(CStyle* style, QWidget *parent, const char *name )
-	: KDialogBase(parent,name, true, i18n("Style editor")) {
-	m_style = style;
-	m_formatEnabled =  false;
-	
-	initView();	
-	readSettings();	
-	styleTypeChanged("Header");
-}
-
-CStyleEditorDialog::~CStyleEditorDialog(){
-	saveSettings();
-}
-
-/** Initializes te view. */
-void CStyleEditorDialog::initView(){
-  enableButtonSeparator( true );
-  QFrame *mainWidget = makeMainWidget();
-  QLabel* label = 0;
-
-  QVBoxLayout *topLayout = new QVBoxLayout( mainWidget, 5, 5 );
-	
-	QHBoxLayout *hboxLayout = new QHBoxLayout(0, 5, 5);
-  m_styleNameEdit = new QLineEdit( mainWidget );
-	label = new QLabel(m_styleNameEdit, i18n("Name:"), this);
-	hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_styleNameEdit);	
-
-  topLayout->addLayout(hboxLayout);
-
-	hboxLayout = new QHBoxLayout(0, 5, 5);	
-  m_styleTypeChooser = new KComboBox( mainWidget, "styleTypeChooser" );
-  label = new QLabel( m_styleTypeChooser, i18n("Choose a part of the style:"), mainWidget );
-  hboxLayout->addWidget(label);
-  m_styleTypeChooser->insertItem( i18n("Header") );
-  m_styleTypeChooser->insertItem( i18n("Description") );
-  m_styleTypeChooser->insertItem( i18n("Module text") );
-  connect(m_styleTypeChooser, SIGNAL(activated(const QString&)), SLOT(styleTypeChanged(const QString&)));
-  m_currentFormat = m_style->formatForType( CStyle::Header );
-  hboxLayout->addWidget( m_styleTypeChooser );
-
-  m_setEnabledBox = new QCheckBox( mainWidget );
-  m_setEnabledBox->setText( i18n("Enable this part"));
-  connect( m_setEnabledBox, SIGNAL(clicked()), SLOT(enableBoxClicked()));
-  hboxLayout->addWidget( m_setEnabledBox );
-
-  topLayout->addLayout( hboxLayout );
-
-
-	hboxLayout = new QHBoxLayout(0, 5, 5);
-	topLayout->addLayout(hboxLayout);
-
-  m_alignRadios.buttongroup = new QVButtonGroup( mainWidget );
-	m_alignRadios.leftRB = new QRadioButton( i18n("Left"), m_alignRadios.buttongroup);
-	m_alignRadios.centerRB = new QRadioButton( i18n("Center"), m_alignRadios.buttongroup);
-	m_alignRadios.rightRB = new QRadioButton(i18n("Right"),m_alignRadios.buttongroup);
-	m_alignRadios.buttongroup->setFixedHeight( m_alignRadios.buttongroup->sizeHint().height());
-  hboxLayout->addWidget( m_alignRadios.buttongroup );
-
-	QButtonGroup* box = new QButtonGroup( mainWidget );
-	QVBoxLayout* boxLayout = new QVBoxLayout( box, 5, 5 );
-	
-	QHBoxLayout* layout1 = new QHBoxLayout(0, 1, 1);
-	m_colors.foregroundChooser = new KColorButton( box );
-	label = new QLabel(m_colors.foregroundChooser, "label", box);
-	label->setText(i18n("Foreground:"));	
-	layout1->addWidget(label);
-  layout1->addStretch(2);	
-	layout1->addWidget(m_colors.foregroundChooser);
-  	
-  boxLayout->addLayout(layout1);
-  boxLayout->addStretch(3);
-  	
-	layout1 = new QHBoxLayout(0, 1, 1);
-	m_colors.backgroundChooser = new KColorButton(box);
-	label = new QLabel(m_colors.backgroundChooser, "label", box);
-	label->setText(i18n("Background:"));
-	layout1->addWidget(label);	
-  layout1->addStretch(2);	
-	layout1->addWidget(m_colors.backgroundChooser);
-    	
-  boxLayout->addLayout(layout1);
-  boxLayout->addStretch(3);
-  hboxLayout->addWidget(box);
-
-  hboxLayout = new QHBoxLayout();
-	m_font.fontButton = new QPushButton(mainWidget);
-	m_font.fontButton->setText(i18n("Choose font"));
-	connect(m_font.fontButton, SIGNAL(clicked()), SLOT(showFontChooser()));	
-  m_font.fontDisplay = new QLabel(m_font.fontButton, "", mainWidget);	
-  m_font.fontDisplay->setText(i18n("Font preview"));
-  hboxLayout->addWidget(m_font.fontDisplay);
-  hboxLayout->addWidget(m_font.fontButton);
-
-//  m_font.identation = new QSpinBox(mainWidget);
-//  label = new QLabel(m_font.identation, "identation", mainWidget);
-//  label->setText(i18n("Identation (in mm):"));
-//  hboxLayout->addStretch(2);
-//  hboxLayout->addWidget(label);
-//  hboxLayout->addWidget(m_font.identation);
-
-  topLayout->addLayout(hboxLayout);
-
-  m_frame.useFrame = new QCheckBox(mainWidget);
-  m_frame.useFrame->setText( i18n("Use frame") );
-  topLayout->addWidget(m_frame.useFrame);
-  connect(m_frame.useFrame, SIGNAL(clicked()), SLOT(useFrameClicked()));
-
-  m_frame.groupbox = new QGroupBox(mainWidget);
-	boxLayout = new QVBoxLayout(m_frame.groupbox);
-	
-	hboxLayout = new QHBoxLayout();
-  m_frame.lineThicknessChooser = new QSpinBox( m_frame.groupbox );
-  m_frame.lineThicknessChooser->setMinValue(1);
-  label = new QLabel(m_frame.lineThicknessChooser, "label", m_frame.groupbox);
-  label->setText( i18n("Line thickness (pt):") );
-  hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_frame.lineThicknessChooser);	
-	boxLayout->addLayout(hboxLayout);
-	
-	hboxLayout = new QHBoxLayout();
-	m_frame.colorChooser = new KColorButton(m_frame.groupbox);
-	label = new QLabel(m_frame.colorChooser, "", m_frame.groupbox);
-	label->setText(i18n("Frame color:"));
-	hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_frame.colorChooser);
-	boxLayout->addLayout(hboxLayout);
-
-	hboxLayout = new QHBoxLayout();
-	m_frame.lineStyleChooser = new QComboBox(m_frame.groupbox);
-	label = new QLabel(m_frame.lineStyleChooser, "", m_frame.groupbox);
-	label->setText(i18n("Line style:"));
-	hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_frame.lineStyleChooser);
-	boxLayout->addLayout(hboxLayout);
-			
-	topLayout->addWidget(m_frame.groupbox);
-	topLayout->addStretch(3);
-	
-	QPainter p;
-	QPen pen(Qt::black, 2, Qt::SolidLine);
-	QBrush brush(Qt::white);		
-	for (int i=1; i <= 5; i++) {  // from Qt::SolidLine to Qt::DashDotDotLine
-		QPixmap* pix = new QPixmap(/*m_frame.lineStyleChooser->width()*/150,15);
-		pen.setStyle((Qt::PenStyle)i);
-		p.begin(pix);
-		p.setPen(pen);
-		p.fillRect(0,0, pix->width(), pix->height(), brush);
-		p.drawLine(0,(int)((float)pix->height()/2),pix->width(),(int)((float)pix->height()/2));
-		p.end();
-		m_frame.lineStyleChooser->insertItem(*pix);	
-	}
-	
-	m_currentFormat = m_style->formatForType( CStyle::Header );	
-	setupWithFormat( m_currentFormat );
-	enableBoxClicked();
-}
-
-/** Reads settings from config file */
-void CStyleEditorDialog::readSettings(){
-	m_styleNameEdit->setText( m_style->styleName() );
-	if (m_styleNameEdit->text() == i18n("Standard"))
-		m_styleNameEdit->setEnabled(false);	//you can't change the name of the standard style
-}
-
-/** Saves settings to config file. */
-void CStyleEditorDialog::saveSettings(){
-	applySettingsToFormat( m_currentFormat );
-//  m_style->setFormatForType(m_currentFormat.type(), m_currentFormat );
-  m_style->setStyleName( m_styleNameEdit->text() );	
-}
-
-/** Opens the font chooser dialog. */
-void CStyleEditorDialog::showFontChooser(){
-	int result = KFontDialog::getFont( m_font.font );
-	if ( result == KFontDialog::Accepted ) {
-		setupFontWidgets( m_font.font );
-	}
-}
-
-/**  */
-void CStyleEditorDialog::useFrameClicked(){
-	m_frame.groupbox->setEnabled( m_frame.useFrame->isChecked() );
-}
-
-/** Sets up the states of the child widgets using the styl format given as parameter. */
-void CStyleEditorDialog::setupWithFormat( CStyle::Format* const format ){
-	const CStyle::StyleType type = format->type();
-	if (type == CStyle::Unknown)
-		return;
-	m_formatEnabled = m_style->hasFormatTypeEnabled(type);
-	
-  m_styleNameEdit->setText( m_style->styleName());	
-	//setup alignement
-	switch(format->alignment()) {
-		case CStyle::Format::Left:
-			m_alignRadios.leftRB->setChecked(true);
-			break;
-		case CStyle::Format::Center:
-			m_alignRadios.centerRB->setChecked(true);
-			break;
-		case CStyle::Format::Right:
-			m_alignRadios.rightRB->setChecked(true);
-			break;
-		default:
-			m_alignRadios.leftRB->setChecked(true);
-			break;
-	}
-	m_alignRadios.buttongroup->setEnabled(m_formatEnabled);	
-	m_setEnabledBox->setChecked(m_formatEnabled);
-	
-	//setup colors
-	m_colors.backgroundChooser->setColor( format->color( CStyle::Format::Background ) );
-	m_colors.backgroundChooser->setEnabled(m_formatEnabled);		
-	
-	m_colors.foregroundChooser->setColor( format->color( CStyle::Format::Foreground ) );
-	m_colors.foregroundChooser->setEnabled(m_formatEnabled);
-		
-	//setup fonts
-	m_font.font = format->font();
-	setupFontWidgets( m_font.font );
-	
-	//setup frame part
-	CStyle::Format::Frame* frame = format->frame();
-	m_frame.useFrame->setChecked(frame);
-	m_frame.useFrame->setEnabled(m_formatEnabled);		
-	useFrameClicked();
-	
-	if (frame) {
-		m_frame.colorChooser->setColor( frame->color() );
-		m_frame.lineThicknessChooser->setValue( frame->thickness() );	
-		m_frame.lineStyleChooser->setCurrentItem((int)(frame->lineStyle())-1);
-	}
-	
-	m_frame.groupbox->setEnabled(m_formatEnabled);			
-}
-
-/** Setups the font widgets using the parameter. */
-void CStyleEditorDialog::setupFontWidgets( QFont& font ){
-	QFont dummy(font);
-	dummy.setPointSize(12);
-	m_font.fontDisplay->setFont( dummy );
-	m_font.fontDisplay->setText( QString::fromLatin1("%1 - %2").arg(m_font.font.family()).arg(m_font.font.pointSize()) );
-	m_font.fontDisplay->setEnabled(m_formatEnabled);	
-	m_font.fontButton->setEnabled(m_formatEnabled);
-}
-
-/** Called when the type was changed in the combobox. */
-void CStyleEditorDialog::styleTypeChanged( const QString& name ){
-	applySettingsToFormat( m_currentFormat );
-	if (name == i18n("Header")) {
-		m_currentFormat = m_style->formatForType(CStyle::Header );
-		m_formatEnabled = m_style->hasFormatTypeEnabled( CStyle::Header );
-	}
-	else 	if (name == i18n("Description")) {
-		m_currentFormat = m_style->formatForType( CStyle::Description );
-		m_formatEnabled = m_style->hasFormatTypeEnabled( CStyle::Description );
-	}
-	else 	if (name == i18n("Module text")) {
-		m_currentFormat = m_style->formatForType(CStyle::ModuleText );	
-		m_formatEnabled = m_style->hasFormatTypeEnabled( CStyle::ModuleText );	
-	}
-	setupWithFormat( m_currentFormat );
-}
-
-/** Sets the properties of the cuzrrent format which are changed in the editor. */
-void CStyleEditorDialog::applySettingsToFormat( CStyle::Format* const format ){
-	m_style->setStyleName(m_styleNameEdit->text());
-	
-	//apply alignement settings
-	if (m_alignRadios.buttongroup->selected() == m_alignRadios.leftRB ) {
-		format->setAlignment( CStyle::Format::Left);
-	}
-	else if (m_alignRadios.buttongroup->selected() == m_alignRadios.centerRB) {
-		format->setAlignment( CStyle::Format::Center );
-	}
-	else if (m_alignRadios.buttongroup->selected() == m_alignRadios.rightRB ) {
-		format->setAlignment( CStyle::Format::Right );
-	}
-	
-	//apply color settings
-	format->setColor( CStyle::Format::Background, m_colors.backgroundChooser->color() );
-	format->setColor( CStyle::Format::Foreground, m_colors.foregroundChooser->color() );
-	
-	//apply font settings
-	format->setFont( m_font.font );
-	
-	//apply frame settings
-	format->setFrameEnabled( m_frame.useFrame->isChecked() );	
-	if (CStyle::Format::Frame* frame = format->frame()){
-		frame->setColor( m_frame.colorChooser->color() );	
-		frame->setThickness( m_frame.lineThicknessChooser->value() );
-		
-		//the position in the list equal to the position in Qt::PenStyle+1
-		frame->setLineStyle(static_cast<Qt::PenStyle>(m_frame.lineStyleChooser->currentItem()+1));
-	}
-}
-
-/** Is called when the enablePart box was clicked. */
-void CStyleEditorDialog::enableBoxClicked() {
-	const CStyle::StyleType styleType = m_currentFormat->type();		
-	m_style->setFormatTypeEnabled(styleType, m_setEnabledBox->isChecked());	
-	
-	applySettingsToFormat(m_style->formatForType(styleType));
-	setupWithFormat( m_currentFormat );
-}
diff --git a/bibletime/printing/cstyleeditordialog.h b/bibletime/printing/cstyleeditordialog.h
deleted file mode 100644
index 1bc124d..0000000
--- a/bibletime/printing/cstyleeditordialog.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/***************************************************************************
-                          cstyleeditordialog.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSTYLEEDITORDIALOG_H
-#define CSTYLEEDITORDIALOG_H
-
-//BibleTime includes
-#include "cstyle.h"
-
-//QT includes
-#include <qwidget.h>
-
-//KDE inludes
-#include <kdialogbase.h>
-#include "cstyle.h"
-
-
-/**The editor for the printing styles.
-  *@author The BibleTime team
-  */
-class QLineEdit;
-class KComboBox;
-class QRadioButton;
-class QSpinBox;
-class KFontDialog;
-class KColorButton;
-class QVButtonGroup;
-class QHButtonGroup;
-class QCheckBox;
-class QComboBox;
-class QGroupBox;
-
-class CStyleEditorDialog : public KDialogBase  {
-   Q_OBJECT
-public: 
-	CStyleEditorDialog(CStyle* style, QWidget *parent=0, const char *name=0);
-	~CStyleEditorDialog();
-
-protected: // Protected methods
-  /**
-  * Saves settings to config file.
-  */
-  void saveSettings();
-  /**
-  * Reads settings from config file
-  */
-  void readSettings();
-	/**
-  * Initializes te view.
-  */
-  void initView();
-
-protected slots:
-  /**
-  * Opens the font chooser dialog.
-  */
-  void showFontChooser();
-  /**
-  *
-  */
-  void useFrameClicked();
-  /**
- 	* Setups the font widgets using the parameter.
- 	*/
-  void setupFontWidgets( QFont& font );
-  /**
-  * Sets up the states of the child widgets using the styl format given as parameter.
-  */
-  void applySettingsToFormat( CStyle::Format* const format );  	
-  /**
-  * Sets the properties of the cuzrrent format which are changed in the editor.
-  */
-  void setupWithFormat( CStyle::Format* const format );
-  /**
-  * Is called when the enablePart box was clicked.
-  */
-  void enableBoxClicked();
-  /**
-  * Called when the type was changed in the combobox.
-  */
-  void styleTypeChanged( const QString& );
-
-private:
-	struct alignementRadios {
-		QRadioButton*	leftRB;
-		QRadioButton*	centerRB;
-		QRadioButton*	rightRB;
-		QVButtonGroup*	buttongroup;
-	} m_alignRadios;
-	
-	struct colorButtons {
-		KColorButton*	foregroundChooser;
-		KColorButton*	backgroundChooser;
-	} m_colors;
-	
-	struct frameWidgets {
-		QCheckBox*	useFrame;
-		KColorButton*	colorChooser;
-		QSpinBox* lineThicknessChooser;
-		QComboBox* lineStyleChooser;		
-		QGroupBox*	groupbox;
-	} m_frame;
-	
-	struct fontWidgets {
-		QFont font;
-		QPushButton* fontButton;
-		QLabel*	fontDisplay;
-	} m_font;
-	
-
-  QLineEdit*	m_styleNameEdit;
-  KComboBox*	m_styleTypeChooser;
-	CStyle*	m_style;
-	CStyle::Format* m_currentFormat;
-	QCheckBox*	m_setEnabledBox;
-
-
-	bool m_formatEnabled;
-};
-
-#endif
diff --git a/bibletime/printing/cstylelist.cpp b/bibletime/printing/cstylelist.cpp
deleted file mode 100644
index 9d1f604..0000000
--- a/bibletime/printing/cstylelist.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/***************************************************************************
-                          cstylelist.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cstylelist.h"
-#include "cstyleeditordialog.h"
-
-#include <qheader.h>
-#include <qlistview.h>
-#include <qcombobox.h>
-
-#include <klocale.h>
-#include <kaction.h>
-#include <kiconloader.h>
-
-CStyleList::CStyleList(StyleItemList* items, QWidget *parent, const char *name )
-	: KListView(parent,name), m_items(items)
-{
-	initView();	
-	setItems(m_items);	
-}
-
-CStyleList::~CStyleList(){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		m_items->current()->deleteListViewItem();
-	}
-}
-
-/** Initilizes the view. */
-void CStyleList::initView(){
-	addColumn(i18n("Name:"));
-	header()->hide();
-}
-
-/** Sets the content to itemList */
-void CStyleList::insertItems( StyleItemList* itemList ){
-	for(itemList->first(); itemList->current(); itemList->next() ) {
-		if (itemList != m_items)	//check if we do not insert our own m_items list
-			m_items->append( itemList->current() );
-		itemList->current()->listViewItem(this);
-	}
-	printer()->emitStylesChanged();
-}
-
-/** Appends the items of itemList */
-void CStyleList::setItems( StyleItemList* itemList ){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		if (m_items->current())
-			m_items->current()->deleteListViewItem();
-	}
-
-	if (m_items != itemList)
-		m_items->clear();
-	insertItems(m_items);	
-
-	QListViewItemIterator it( this );
-	if (it.current())
-		setCurrentItem(it.current());
-	emit currentChanged(it.current());
-}
-
-/** Appends the item to the list and m_items. */
-void CStyleList::insertItem( CStyle* item ){
-	m_items->append( item );
-	item->listViewItem(this);
-}
-
-/** Opens the style editor dialog for he selected style. */
-void CStyleList::editCurrentStyle(){
-	QListViewItem*	item = currentItem();
-	if (!item)
-		return;
-		
-	//go through style items and find the right one
-	CStyle*	currentStyle = 0;
-	for (m_items->first(); m_items->current();m_items->next()) {
-		if (m_items->current()->listViewItem() == item) {
-			currentStyle = m_items->current();
-			break;
-		}
-	}
-	if (currentStyle) {
-		openStyleEditor( currentStyle );		
-		currentStyle->updateListViewItem();
-	}
-}
-
-/** Creates a new style item. */
-void CStyleList::createNewStyle(){
-	CStyle*	style = new CStyle();	
-	insertItem( style );
-	
-	openStyleEditor( style );
-	
-	style->updateListViewItem();
-}
-
-/**  */
-void CStyleList::openStyleEditor( CStyle* const style ){
-	CStyleEditorDialog dlg(style, this);
-	dlg.exec();
-	printer()->emitStylesChanged();
-}
-
-/** Deletes the current style item. */
-void CStyleList::deleteCurrentStyle(){
-	QListViewItem* item = currentItem();
-	if (!item)
-		return;
-	if (item == printer()->standardStyle()->listViewItem()) {
-		qWarning("Deleting the standardstyle is not possible");
-		return;
-	}
-	
-	//go through style items and find the right one
-	CStyle*	currentStyle = 0;
-	for (m_items->first(); m_items->current();m_items->next()) {
-		if (m_items->current()->listViewItem() == item) {
-			currentStyle = m_items->current();
-      const int pos = m_items->findRef(currentStyle);
-			if (pos != -1)
-        m_items->take(pos);
-			currentStyle->deleteListViewItem();			
-			if (!m_items->autoDelete() && currentStyle) {
-				delete currentStyle;			
-				currentStyle = 0;
-			}	
-			if (printer())
-				printer()->emitStylesChanged();
-			return;
-		}
-	}
-}
-
-/** Returns a pointer to our list */
-StyleItemList* const CStyleList::styleList() const {
-	return m_items;
-}
-
diff --git a/bibletime/printing/cstylelist.h b/bibletime/printing/cstylelist.h
deleted file mode 100644
index 0e68dc8..0000000
--- a/bibletime/printing/cstylelist.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
-                          cstylelist.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSTYLELIST_H
-#define CSTYLELIST_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-#include "cstyle.h"
-
-
-//Qt includes
-#include <qwidget.h>
-#include <qptrlist.h>
-
-//KDE includes
-#include <klistview.h>
-#include <kpopupmenu.h>
-
-class KAction;
-class QComboBox;
-
-typedef QPtrList<CStyle> styleList;
-
-  /** A KListView derived class which handles CStyle items.
-  * @author The BibleTime team
-  */
-class CStyleList : public KListView, public CPointers   {
-   Q_OBJECT
-public:
-	CStyleList(StyleItemList* items, QWidget *parent=0, const char *name=0);
-	~CStyleList();
-  /**
- 	* Initilizes the view.
- 	*/
-  void initView();
-  /**
- 	* Appends the items of itemList
- 	*/
-  void insertItems( StyleItemList* itemList );
-  /**
- 	* Sets the content to itemList
- 	*/
-  void setItems( StyleItemList* itemList );
-  /**
- 	*
- 	*/
-  void openStyleEditor( CStyle* const style );
-  /**
- 	* Appends the item to the list and m_items.
- 	*/
-  void insertItem( CStyle* item);
-  /**
- 	*
- 	*/
-  StyleItemList* const styleList() const;
-
-public slots: // Public slots
-  /**
- 	* Deletes the current style item.
- 	*/
-  void deleteCurrentStyle();
-  /**
- 	* Creates a new style item.
- 	*/
-  void createNewStyle();
-  /**
- 	* Opens the style editor dialog for he selected style.
- 	*/
-  void editCurrentStyle();
-
-private:
-	StyleItemList* m_items;
-	QGuardedPtr<KAction> editStyle_action;
-	QGuardedPtr<KAction> deleteStyle_action;
-};
-
-#endif
diff --git a/bibletime/util/Makefile.am b/bibletime/util/Makefile.am
deleted file mode 100644
index c96f870..0000000
--- a/bibletime/util/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES = $(all_includes)
-libutil_a_METASOURCES = AUTO
-noinst_LIBRARIES = libutil.a
-
-libutil_a_SOURCES = \
-cpointers.cpp \
-cresmgr.cpp \
-ctoolclass.cpp
-
-all_headers = \
-scoped_resource.h \
-cpointers.h \
-cresmgr.h \
-ctoolclass.h
-
-EXTRA_DIST = $(libutil_a_SOURCES) $(all_headers)
diff --git a/bibletime/util/Makefile.in b/bibletime/util/Makefile.in
deleted file mode 100644
index 473bddd..0000000
--- a/bibletime/util/Makefile.in
+++ /dev/null
@@ -1,679 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-#>- libutil_a_METASOURCES = AUTO
-noinst_LIBRARIES = libutil.a
-
-libutil_a_SOURCES = \
-cpointers.cpp \
-cresmgr.cpp \
-ctoolclass.cpp
-
-
-all_headers = \
-scoped_resource.h \
-cpointers.h \
-cresmgr.h \
-ctoolclass.h
-
-
-EXTRA_DIST = $(libutil_a_SOURCES) $(all_headers)
-subdir = bibletime/util
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libutil_a_AR = $(AR) cru
-libutil_a_LIBADD =
-am_libutil_a_OBJECTS = cpointers.$(OBJEXT) cresmgr.$(OBJEXT) \
-	ctoolclass.$(OBJEXT)
-#>- libutil_a_OBJECTS = $(am_libutil_a_OBJECTS)
-#>+ 5
-libutil_a_final_OBJECTS = libutil_a.all_cpp.o 
-libutil_a_nofinal_OBJECTS = cpointers.$(OBJEXT) cresmgr.$(OBJEXT) \
-	ctoolclass.$(OBJEXT)
-@KDE_USE_FINAL_FALSE@libutil_a_OBJECTS = $(libutil_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libutil_a_OBJECTS = $(libutil_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpointers.Po ./$(DEPDIR)/cresmgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ctoolclass.Po
-#>+ 4
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libutil_a.all_cpp.P ./$(DEPDIR)/cpointers.Po ./$(DEPDIR)/cresmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ctoolclass.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  ./$(DEPDIR)/cpointers.Po ./$(DEPDIR)/cresmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ctoolclass.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libutil_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libutil_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/util/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/util/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/util/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libutil.a: $(libutil_a_OBJECTS) $(libutil_a_DEPENDENCIES) 
-	-rm -f libutil.a
-	$(libutil_a_AR) libutil.a $(libutil_a_OBJECTS) $(libutil_a_LIBADD)
-	$(RANLIB) libutil.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpointers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cresmgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctoolclass.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-KDE_DIST=cresmgr.h scoped_resource.h ctoolclass.h cpointers.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/util/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/util/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libutil_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cpointers.cpp $(srcdir)/cresmgr.cpp $(srcdir)/ctoolclass.cpp 
-	@echo 'creating libutil_a.all_cpp.cpp ...'; \
-	rm -f libutil_a.all_cpp.files libutil_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libutil_a.all_cpp.final; \
-	for file in cpointers.cpp cresmgr.cpp ctoolclass.cpp ; do \
-	  echo "#include \"$$file\"" >> libutil_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libutil_a.all_cpp.final; \
-	done; \
-	cat libutil_a.all_cpp.final libutil_a.all_cpp.files > libutil_a.all_cpp.cpp; \
-	rm -f libutil_a.all_cpp.final libutil_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libutil_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/util/cpointers.cpp b/bibletime/util/cpointers.cpp
deleted file mode 100644
index ea1aad3..0000000
--- a/bibletime/util/cpointers.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
-                          cpointers.cpp  -  description
-                             -------------------
-    begin                : Sun Feb 17 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cpointers.h"
-
-#include "backend/cswordbackend.h"
-
-#include "printing/cprinter.h"
-
-static CSwordBackend* m_backend = 0;
-static CPrinter*      m_printer = 0;
-static CLanguageMgr*  m_langMgr = 0;
-
-
-void CPointers::setPrinter(CPrinter* const printer) {
-	m_printer = printer;
-}
-
-void CPointers::setBackend(CSwordBackend* const backend) {
-	m_backend = backend;
-}
-
-void CPointers::deletePrinter() {
-	delete m_printer;
-	m_printer = 0;
-}
-
-void CPointers::deleteBackend() {
-	delete m_backend;
-	m_backend = 0;
-}
-
-
-/** Returns a pointer to the backend ... */
-CSwordBackend* const CPointers::backend() {
-	return m_backend;
-}
-
-/** Returns a pointer to the backend ... */
-CLanguageMgr* const CPointers::languageMgr() {
-  if (!m_langMgr) {
-    m_langMgr = new CLanguageMgr();
-  }
-	return m_langMgr;
-}
-
-/** Returns a pointer to the printer object. */
-CPrinter* const CPointers::printer() {
-	return m_printer;
-}
-
diff --git a/bibletime/util/cpointers.h b/bibletime/util/cpointers.h
deleted file mode 100644
index 1cf6f15..0000000
--- a/bibletime/util/cpointers.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
-                          cpointers.h  -  description
-                             -------------------
-    begin                : Sun Feb 17 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPOINTERS_H
-#define CPOINTERS_H
-
-//BibleTime includes
-#include "backend/clanguagemgr.h"
-
-class CSwordBackend;
-class CPrinter;
-class CLanguageMgr;
-
-/** Holds the pointers to important classes like modules, backend etc.
-  * @author The BibleTime team
-  */
-class CPointers {
-protected:
-	friend class BibleTime; //BibleTime may initialize this object
- 	friend class BibleTimeApp; //BibleTime may initialize this object	
-	friend int main(int argc, char* argv[]);
-	
-	static void setBackend(CSwordBackend* const);
-	static void setPrinter(CPrinter* const);
-	static void deleteBackend();
-	static void deletePrinter();
-
-public: // Public methods
-  /**
-  * Returns a pointer to the printer object.
-  */
-  static CPrinter* const printer();
-  /**
-  * Returns a pointer to the backend ...
-  */
-  static CSwordBackend* const backend();
-  static CLanguageMgr* const languageMgr();  
-};
-
-#endif
diff --git a/bibletime/util/cresmgr.cpp b/bibletime/util/cresmgr.cpp
deleted file mode 100644
index 4e88d62..0000000
--- a/bibletime/util/cresmgr.cpp
+++ /dev/null
@@ -1,1632 +0,0 @@
-/***************************************************************************
-                          cresmgr.cpp  -  description
-                             -------------------
-    begin                : Tue Jan 25 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "cresmgr.h"
-
-#include "backend/cswordbackend.h"
-
-//KDE includes
-#include <kglobal.h>
-#include <klocale.h>
-
-inline const QString makeToolTip( const QString& text ) {
-  return text;
-};
-
-inline const QString makeWhatsThis( const QString& title, const QString& description )  {
-  return QString::fromLatin1("<center><B>%1</B></center><HR>%2").arg(title).arg(description);
-};
-
-
-
-namespace CResMgr {
-  namespace modules {
-    namespace bible {
-      const QString icon_unlocked  = "bt_bible";
-      const QString icon_locked    = "bt_bible_locked";
-      const QString icon_add       = "bt_bible_add";
-    };
-    namespace commentary {
-      const QString icon_unlocked  = "bt_commentary";
-      const QString icon_locked    = "bt_commentary_locked";
-      const QString icon_add       = "bt_commentary_add";
-    };
-    namespace lexicon {
-      const QString icon_unlocked  = "bt_lexicon";
-      const QString icon_locked    = "bt_lexicon_locked";
-      const QString icon_add       = "bt_lexicon_add";
-    };
-    namespace book {
-      const QString icon_unlocked  = "bt_book";
-      const QString icon_locked    = "bt_book_locked";
-      const QString icon_add       = "bt_book_add";
-    };
-  };
-
-  namespace mainMenu { //Main menu
-    namespace file { //Main menu->File
-      namespace clearQueue {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon       = QString::fromLatin1("button_cancel");
-        const KShortcut accel    = KKeySequence();
-        const char* actionName   = "file_clear_queue_action";
-      }
-      namespace print { //a standard action
-        QString tooltip;
-        QString whatsthis;
-      }
-      namespace quit { //a standard action
-        QString tooltip;
-        QString whatsthis;
-      }
-    }
-
-    namespace view { //Main menu->View
-      namespace showMainIndex {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const KShortcut accel     = Qt::Key_F9;
-        const char* actionName    = "viewMainIndex_action";
-      }
-      namespace showToolBar { //a standard action
-        QString tooltip;
-        QString whatsthis;
-      }
-    }
-
-    namespace mainIndex { //Main menu->Settings
-      namespace search {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "find";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_M;
-        const char* actionName    = "groupmanager_search_action";
-      }
-      namespace searchdefaultbible {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "find";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_F;
-        const char* actionName    = "groupmanager_searchdefaultbible_action";
-      }
-    };
-
-    namespace window { //Main menu->Window
-      namespace loadProfile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const char* actionName    = "windowLoadProfile_action";
-      }
-      namespace saveProfile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const char* actionName    = "windowSaveProfile_action";
-      }
-      namespace saveToNewProfile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_S;
-        const char* actionName    = "windowSaveToNewProfile_action";
-      }
-      namespace setupProfiles {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const KShortcut accel     = KKeySequence();
-        const char* actionName    = "windowEditProfiles_action";
-      }
-      namespace showFullscreen {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "window_fullscreen";
-        const KShortcut accel     = Qt::CTRL + Qt::SHIFT + Qt::Key_F;
-        const char* actionName    = "windowFullscreen_action";
-      }
-      namespace tile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_tile";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_T;
-        const char* actionName    = "windowTile_action";
-      }
-      namespace cascade {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_cascade";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_A;
-        const char* actionName    = "windowCascade_action";
-      }
-      namespace autoTile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_tile_auto";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_T;
-        const char* actionName    = "windowAutoTile_action";
-      }
-      namespace autoCascade {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_cascade_auto";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_A;
-        const char* actionName    = "windowAutoCascade_action";
-      }
-      namespace closeAll {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "fileclose";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_K;
-        const char* actionName    = "windowCloseAll_action";
-      }
-    }
-
-    namespace settings { //Main menu->Settings
-      namespace editToolBar { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      }
-      namespace optionsDialog { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace swordSetupDialog {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_swordconfig";
-        const KShortcut accel     = Qt::Key_F4;
-        const char* actionName    = "options_sword_setup";
-      }
-
-    };
-
-    namespace help { //Main menu->Help
-      namespace handbook {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "contents";
-        const KShortcut accel     = Qt::Key_F1;
-        const char* actionName    = "helpHandbook_action";
-      };
-      namespace bibleStudyHowTo {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "contents";
-        const KShortcut accel     = Qt::Key_F2;
-        const char* actionName    = "helpHowTo_action";
-      };
-      namespace whatsThis { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace bugreport { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace dailyTip {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "idea";
-        const KShortcut accel     = KKeySequence();
-        const char* actionName    = "helpDailyTip_action";
-      };
-      namespace aboutBibleTime { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace aboutKDE { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-  }  //end of main menu
-
-  namespace searchdialog {
-    const QString icon = "find";
-
-    namespace searchButton {
-      QString tooltip;
-      QString whatsthis;
-    };
-    namespace cancelSearchButton {
-      QString tooltip;
-      QString whatsthis;
-    };
-
-    namespace options {
-      namespace moduleChooserButton {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace searchedText {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace searchType {
-        namespace multipleWords_and {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace multipleWords_or {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace exactMatch {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace regExp {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-
-      namespace searchOptions {
-        namespace caseSensitive {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-      namespace chooseScope {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace scopeEditor {
-        namespace rangeList {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace nameEdit {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace editRange {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace parsedResult {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace addNewRange {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace deleteCurrentRange {
-          QString tooltip;
-          QString whatsthis;
-        };
-
-      };
-    }
-    namespace result {
-      namespace moduleList {
-        QString tooltip;
-        QString whatsthis;
-
-        namespace copyMenu {
-          const QString icon = "editcopy";
-        };
-        namespace saveMenu {
-          const QString icon = "filesave";
-        };
-        namespace printMenu {
-          const QString icon = "fileprint";
-        };
-      };
-      namespace foundItems {
-        QString tooltip;
-        QString whatsthis;
-
-        namespace copyMenu {
-          const QString icon = "editcopy";
-        };
-        namespace saveMenu {
-          const QString icon = "filesave";
-        };
-        namespace printMenu {
-          const QString icon = "fileprint";
-        };
-      };
-      namespace textPreview {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-  };
-
-  namespace workspace {
-  };
-
-  namespace displaywindows {
-    namespace transliteration {
-      const QString icon = "bt_displaytranslit";
-    };
-    namespace displaySettings {
-      const QString icon = "bt_displayconfig";
-    };
-
-    namespace general {
-      namespace scrollButton {
-        QString tooltip;
-        QString whatsthis;
-
-      };
-    };
-    namespace bibleWindow {
-      namespace bookList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextBook {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::Key_B;
-       }
-      namespace previousBook {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_B;
-      }
-
-
-      namespace chapterList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextChapter {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::Key_H;
-      }
-      namespace previousChapter {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_H;
-      }
-
-      namespace verseList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextVerse {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_V;
-      }
-      namespace previousVerse {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_V;
-      }
-
-      namespace copyMenu {
-        const QString icon = "editcopy";//CResMgr::displaywindows::lexiconWindow::copyMenu::icon;
-      };
-      namespace saveMenu {
-        const QString icon = "filesave";//CResMgr::displaywindows::lexiconWindow::saveMenu::icon;
-      }
-      namespace printMenu {
-        const QString icon = "fileprint";//CResMgr::displaywindows::lexiconWindow::printMenu::icon;
-      }
-    };
-    namespace commentaryWindow {
-      namespace syncWindow {
-         QString tooltip;
-         QString whatsthis;
-         const QString icon 		= "bt_sync";
-         const KShortcut accel 	= KKeySequence(); //CResMgr::displaywindows::biblewindow::nextBook::accel;
-				 const char* actionName	= "commentary_syncWindow";
-       }
-
-    };
-    namespace lexiconWindow {
-      namespace entryList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextEntry {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = KKeySequence();
-      }
-      namespace previousEntry {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = KKeySequence();
-      }
-
-      namespace copyMenu {
-        const QString icon = "editcopy";
-      };
-      namespace saveMenu {
-        const QString icon = "filesave";
-      }
-      namespace printMenu {
-        const QString icon = "fileprint";
-      }
-    };
-    namespace bookWindow {
-      namespace toggleTree {
-        const QString icon = "view_sidetree";
-        const KShortcut accel = KKeySequence();
-      };
-    };
-
-    namespace writeWindow {
-      namespace saveText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "filesave";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_saveText";
-      };
-      namespace restoreText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "undo";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_restoreText";
-      };
-      namespace deleteEntry {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "editdelete";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_deleteEntry";
-      };
-
-      //formatting buttons
-      namespace boldText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_bold";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_boldText";
-      };
-      namespace italicText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_italic";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_italicText";
-      };
-      namespace underlinedText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_under";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_underlineText";
-      };
-
-      namespace alignLeft {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_left";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_alignLeft";
-      };
-      namespace alignCenter {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_center";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_alignCenter";
-      };
-      namespace alignRight {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "rightjust";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_alignRight";
-      };
-      namespace alignJustify {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_block";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName	= "writeWindow_alignJustify";
-      };
-
-      namespace fontFamily {
-        QString tooltip;
-        QString whatsthis;
-	      const KShortcut accel   = KKeySequence();
-				const char* actionName	= "writeWindow_fontFamily";
-      };
-      namespace fontSize {
-        QString tooltip;
-        QString whatsthis;
-	      const KShortcut accel   = KKeySequence();
-				const char* actionName	= "writeWindow_fontSize";
-      };
-      namespace fontColor {
-        QString tooltip;
-        QString whatsthis;
-      };
-
-    };
-  };
-
-  namespace printing {
-    namespace itemPage {
-      namespace styleChooser {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemUp {
-        const QString icon = "up";
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemDown {
-        const QString icon = "down";
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemDelete {
-        const QString icon = "edittrash";
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-
-    namespace styleList {
-      namespace newStyle {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon = "filenew";
-      };
-      namespace deleteStyle {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon = "editdelete";
-      };
-      namespace editStyle {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon = "pencil";
-      };
-    };
-    namespace printerSettings {
-      namespace margins {
-        QString whatsthis;
-
-        namespace upper {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace lower {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace left {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace right {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-    };
-  };
-  namespace settings {
-    namespace startup {
-      const QString icon = "bt_startconfig";
-      namespace dailyTip {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace showLogo {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace restoreWorkingArea {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace fonts {
-      const QString icon = "fonts";
-
-      namespace typeChooser {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace colors {
-      const QString icon = "colorize";
-
-      namespace text {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace background {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace links {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace footnotes {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace strongNumbers {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace highlightedVerse {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace jesusWords {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace morphTags {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace profiles {
-      const QString icon = "view_sidetree";
-
-      namespace list {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace createNew {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace deleteCurrent {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace renameCurrent {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace sword {
-      const QString icon = "bt_swordconfig";
-
-      namespace general {
-        namespace cacheKeys {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace scrolling {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace language {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-      namespace modules {
-        namespace bible {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace commentary {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace lexicon {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace dailyDevotional {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewStrongs {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace greekStrongs {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewMorph {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace greekMorph {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-      namespace filters {
-        namespace lineBreaks {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace verseNumbers {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace footnotes {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace strongsNumbers {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace morphTags {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace headings {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace lemmas {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewVowelPoints {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewCantillation {
-           QString tooltip;
-          QString whatsthis;
-        };
-        namespace greekAccents {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace textualVariants {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-    };
-    namespace keys {
-      const QString icon = "key_bindings";
-    };
-  };
-
-    namespace mainIndex { //Main menu->Settings
-      namespace search {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "find";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_M;
-        const char* actionName    = "GMsearch_action";
-      }
-      namespace newFolder {
-        const QString icon = "folder_new";
-      }
-      namespace changeFolder {
-        const QString icon = "folder";
-      }
-      namespace openedFolder {
-        const QString icon = "folder_open";
-      }
-      namespace closedFolder {
-        const QString icon = "folder";
-      }
-
-      namespace bookmark {
-        const QString icon = "bookmark";
-      }
-      namespace changeBookmark {
-        const QString icon = "bookmark";
-      }
-      namespace importBookmarks {
-        const QString icon = "bookmark";
-      }
-      namespace exportBookmarks {
-        const QString icon = "bookmark";
-      }
-      namespace printBookmarks {
-        const QString icon = "fileprint";
-      }
-      namespace deleteItems {
-        const QString icon = "filedelete";
-      }
-
-      namespace editModuleMenu {
-        const QString icon = "pencil";
-      }
-      namespace editModulePlain {
-        const QString icon = "pencil";
-      }
-      namespace editModuleHTML {
-        const QString icon = "pencil";
-      }
-
-      namespace unlockModule {
-        const QString icon = "unlock";
-      }
-      namespace aboutModule {
-        const QString icon = "info";
-      }
-    };
-  
-  namespace helpDialog {
-    const QString moduleLocked = "bibletime/helpdialog/help-module-encrypted.html";
-    const QString firstStart = "bibletime/helpdialog/help-first-startup.html";
-    const QString noSwordModules = "bibletime/helpdialog/help-no-modules.html";
-    const QString noSwordModuleConfigDir = "bibletime/helpdialog/help-no-mods-d.html";
-    const QString initBackendFailed = "bibletime/helpdialog/help-initbackend-failed.html";
-    const QString firstTimeSearchDialog = "bibletime/helpdialog/help-first-time-search.html";
-  };
-  
-};
-
-
-
-namespace CResMgr {
-  void init_i18n() {
-    using namespace CResMgr;
-    {
-      using namespace mainMenu;
-      {
-        using namespace file;
-        {
-          using namespace clearQueue;
-          tooltip    = makeToolTip( i18n("Clear print queue") );
-          whatsthis  = makeWhatsThis( tooltip, i18n("Clear the print queue of BibleTime.") );
-        };
-        {
-          using namespace print;
-          tooltip     = makeToolTip( i18n("Open the printer dialog") );
-          whatsthis   = makeWhatsThis( tooltip, i18n("Open the printer dialog of BibleTime, where you can edit the print queue, assign styles to the items and print them.") );
-        };
-        {
-          using namespace quit;
-          tooltip     = makeToolTip( i18n("Close BibleTime") );
-          whatsthis   = makeWhatsThis( tooltip, i18n("Close BibleTime and save the settings.") );
-        };
-
-        {
-          using namespace view;
-          {
-            using namespace showMainIndex;
-            tooltip     = makeToolTip(i18n("Show main index"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Toggle the main index view."));
-          }
-          {
-            using namespace showToolBar;
-            tooltip     = makeToolTip(i18n("Show main toolbar"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Toggle the main toolbar view."));
-          }
-        }
-
-        {
-          using namespace mainMenu::mainIndex;
-          {
-            using namespace search;
-            tooltip     = makeToolTip(i18n("Search in open modules"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the search dialog to search in all modules that are currently open."));
-          }
-          {
-            using namespace searchdefaultbible;
-            tooltip     = makeToolTip(i18n("Search default bible"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the search dialog to search in the default bible."));
-          }
-        };
-
-        {
-          using namespace window;
-          {
-            using namespace loadProfile;
-            tooltip     = makeToolTip( i18n("Load a session") );
-            whatsthis   = makeWhatsThis(tooltip,i18n("Restore a saved BibleTime session.") );
-          }
-          {
-            using namespace saveProfile;
-            tooltip     = makeToolTip(i18n("Save current session"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Save current BibleTime session so that it can be reused later."));
-          }
-          {
-            using namespace saveToNewProfile;
-            tooltip     = makeToolTip(i18n("Save as new session"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Create and save a new session."));
-          }
-          {
-            using namespace setupProfiles;
-            tooltip     = makeToolTip(i18n("Edit sessions"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Create new, delete or rename existing sessions."));
-          }
-          {
-            using namespace showFullscreen;
-            tooltip     = makeToolTip(i18n("Toggle fullscreen mode"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Toggle fullscreen mode of the main window."));
-          }
-          {
-            using namespace tile;
-            tooltip     = makeToolTip(i18n("Tile windows"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Tile the open display windows."));
-          }
-          {
-            using namespace cascade;
-            tooltip     = makeToolTip(i18n("Cascade windows"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Cascade the open display windows."));
-          }
-          {
-            using namespace autoTile;
-            tooltip     = makeToolTip(i18n("Automatically tile windows"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Automatically tile the open display windows."));
-          }
-          {
-            using namespace autoCascade;
-            tooltip     = makeToolTip(i18n("Automatically cascade windows"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Automatically cascade the open display windows."));
-          }
-          {
-            using namespace closeAll;
-            tooltip     = makeToolTip(i18n("Close all windows"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Close all open display windows."));
-          }
-        }
-
-        {
-          using namespace mainMenu::settings;
-          {
-            using namespace editToolBar;
-            tooltip     = makeToolTip(i18n("Edit toolbar"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open BibleTime's toolbar editor."));
-          }
-          {
-            using namespace optionsDialog;
-            tooltip     = makeToolTip(i18n("Configure BibleTime"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the dialog to set most of BibleTime's preferences."));
-          };
-          {
-            using namespace swordSetupDialog;
-            tooltip     = makeToolTip(i18n("Configure Sword"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the dialog to configure Sword and install/update/remove Sword modules."));
-          };
-
-        };
-
-        {
-          using namespace help;
-          {
-            using namespace handbook;
-            tooltip     = makeToolTip(i18n("BibleTime's handbook"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Open BibleTime's handbook in the KDE helpbrowser.<BR>The handbook explains how to use BibleTime in the best way."));
-          };
-          {
-            using namespace bibleStudyHowTo;
-            tooltip     = makeToolTip(i18n("BibleTime's Bible study HowTo"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the Bible study HowTo included with BibleTime in the KDE helpbrowser.<BR>This HowTo is an introduction on how to study the Bible in an efficient way."));
-          };
-          {
-            using namespace whatsThis;
-            tooltip     = makeToolTip(i18n("Enter \"What's this?\" mode"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Switch into the <B>\"What's this?\"</B> mode.<BR>All important elements of BibleTime's GUI offer a \"What's this?\" help message."));
-          };
-          {
-            using namespace bugreport;
-            tooltip     = makeToolTip(i18n("Send bugreport"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Send a bugreport to the developers of BibleTime."));
-          };
-          {
-            using namespace dailyTip;
-            tooltip     = makeToolTip(i18n("Show daily tips at startup"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Show a daily tip each time BibleTime starts.<BR>The tips contain important Bible quotations and helpful tips for using BibleTime."));
-          };
-          {
-            using namespace aboutBibleTime;
-            tooltip     = makeToolTip(i18n("About BibleTime"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Show detailed information about BibleTime."));
-          };
-          {
-            using namespace aboutKDE;
-            tooltip     = makeToolTip(i18n("About KDE"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Show detailed information about the KDE project."));
-          };
-        };
-      };
-    };
-
-    {
-      using namespace searchdialog;
-      {
-        using namespace searchButton;
-        tooltip     = makeToolTip(i18n("Start the search"));
-        whatsthis   = makeWhatsThis(tooltip, i18n("Start to search the text in each of the chosen modules."));
-      };
-      {
-        using namespace cancelSearchButton;
-        tooltip     = makeToolTip(i18n("Stop search"));
-        whatsthis   = makeWhatsThis(tooltip, i18n("Stop the active search."));
-      };
-
-      {
-        using namespace options;
-        {
-          using namespace moduleChooserButton;
-          tooltip     = makeToolTip(i18n("Choose modules"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("Open a dialog to choose modules for the search."));
-        };
-        {
-          using namespace searchedText;
-          tooltip     = makeToolTip(i18n("Search text"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("Enter the text you want to search in the chosen modules here."));
-        };
-        {
-          using namespace searchType;
-          {
-            using namespace multipleWords_and;
-            tooltip     = makeToolTip(i18n("Multiple words (AND)"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Treat the search text as multiple words. A text must contain all of the words to match. The order of the words is unimportant."));
-          };
-          {
-            using namespace multipleWords_or;
-            tooltip     = makeToolTip(i18n("Multiple words (OR)"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Treat the search text as multiple words. A text must contain one or more words of to match. The order is unimportant."));
-          };
-          {
-            using namespace exactMatch;
-            tooltip     = makeToolTip(i18n("Exact match"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("The search text will be used exactly as entered."));
-          };
-          {
-            using namespace regExp;
-            tooltip     = makeToolTip(i18n("Regular expression"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Treat the search string as a GNU regular expression. The BibleTime handbook contains an introduction to regular expressions."));
-          };
-        };
-
-        {
-          using namespace searchOptions;
-          {
-            using namespace caseSensitive;
-            tooltip     = makeToolTip(i18n("Case sensitive matching"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("If you choose this option the search will distinguish between upper and lowercase characters."));
-          };
-        };
-        {
-          using namespace chooseScope;
-          tooltip     = makeToolTip(i18n("Choose a search scope"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("Choose a scope from the list. Select the first item to use no scope, the second one is to use each module's last search result as search scope. The others are user defined search scopes."));
-        };
-        {
-          using namespace scopeEditor;
-          {
-            using namespace rangeList;
-            tooltip     = makeToolTip(i18n("Available search scopes"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Select an item from the list to edit the search scope."));
-          };
-          {
-            using namespace nameEdit;
-            tooltip     = makeToolTip(i18n("Search scope name"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Change the name of the selected search scope."));
-          };
-          {
-            using namespace editRange;
-            tooltip     = makeToolTip(i18n("Edit search scope ranges"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed."));
-          };
-          {
-            using namespace parsedResult;
-            tooltip     = makeToolTip(i18n("Parsed search ranges"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Contains the search ranges which will be used for the search."));
-          };
-          {
-            using namespace addNewRange;
-            tooltip     = makeToolTip(i18n("Add a new search scope"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Add a new search scope. First enter an appropriate name, then edit the search ranges."));
-          };
-          {
-            using namespace deleteCurrentRange;
-            tooltip     = makeToolTip(i18n("Delete current search scope"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Deletes the selected search scope. If you close the dialog using Cancel the settings won't be saved."));
-          };
-        };
-      }
-      {
-        using namespace result;
-        {
-          using namespace moduleList;
-          tooltip     = makeToolTip(i18n("Used modules"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("The list of modules chosen for the search."));
-        };
-        {
-          using namespace foundItems;
-          tooltip     = makeToolTip(i18n("Found items of selected module"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("This list contains the search result of the selected module."));
-        };
-        {
-          using namespace textPreview;
-          tooltip     = makeToolTip(i18n("Text preview"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("The text preview of the selected search result item."));
-        };
-      };
-    };
-
-    {
-      using namespace displaywindows;
-      {
-        using namespace general;
-        {
-          using namespace scrollButton;
-          tooltip = makeToolTip( i18n("Scroll through the list") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This button is useful to scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item."));
-        };
-        using namespace bibleWindow;
-        {
-          using namespace bookList;
-          tooltip = makeToolTip( i18n("List of books") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the books which are available in this module."));
-        };
-        {
-          using namespace nextBook;
-          tooltip = makeToolTip( i18n("Show the next book") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the next book of this module."));
-         }
-        {
-          using namespace previousBook;
-          tooltip = makeToolTip( i18n("Show the previous book") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the previous book of this module."));
-        }
-        {
-          using namespace chapterList;
-          tooltip = makeToolTip( i18n("List of chapters") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the chapters which are available in the current book."));
-        };
-        {
-          using namespace nextChapter;
-          tooltip = makeToolTip( i18n("Show the next chapter") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the previous chapter of the module."));
-        }
-        {
-         using namespace previousChapter;
-          tooltip = makeToolTip( i18n("Show the previous chapter") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the next chapter of the module."));
-        }
-        {
-         using namespace verseList;
-          tooltip = makeToolTip( i18n("List of verses") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the verses which are available in the current chapter."));
-        };
-        {
-         using namespace nextVerse;
-         tooltip = makeToolTip( i18n("Jump to the next verse") );
-         whatsthis = makeWhatsThis(tooltip, i18n("In  Bible texts, the next verse will be highlighted. In commentaries, the next entry will be shown."));
-
-        }
-        { using namespace previousVerse;
-          tooltip = makeToolTip( i18n("Jump to the previous verse") );
-          whatsthis = makeWhatsThis(tooltip, i18n("In Bible texts, the previous verse will be highlighted. In commentaries, the previous entry will be shown."));
-        }
-      };
-      {
-        using namespace commentaryWindow;
-        {
-          using namespace syncWindow;
-           tooltip = makeToolTip(i18n("Synchronize with Bible windows"));
-           whatsthis = makeWhatsThis(tooltip, i18n("Synchronize the displayed entry of this module with the active Bible window."));
-         }
-      };
-      {
-        using namespace lexiconWindow;
-        {
-          using namespace entryList;
-          tooltip = makeToolTip( i18n("List of entries") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the entries of the current module."));
-        };
-        {
-          using namespace nextEntry;
-          tooltip = makeToolTip( i18n("Show the next entry") );
-          whatsthis = makeWhatsThis(tooltip, i18n("The next entry of the module will be shown."));
-        };
-        {
-          using namespace previousEntry;
-          tooltip = makeToolTip( i18n("Show the previous entry") );
-          whatsthis = makeWhatsThis(tooltip, i18n("The previous entry of the module will be shown."));
-        };
-      };
-
-    {
-      using namespace writeWindow;
-      {
-        using namespace saveText;
-        tooltip   = makeToolTip( i18n("Save the current text") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Save the curent text into the module. The old text will be overwritten.") );
-      };
-      {
-        using namespace restoreText;
-        tooltip   = makeToolTip( i18n("Restore the old text") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Loads the old text from the module and loads it into the edit area. The unsaved text will be lost.") );
-      };
-      {
-        using namespace deleteEntry;
-        tooltip   = makeToolTip( i18n("Delete the current entry") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Deletes the current entry out of the module. The text will be lost.") );
-      };
-
-      //formatting buttons
-      {
-        using namespace boldText;
-        tooltip   = makeToolTip( i18n("Bold text") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Toggle bold formatting of the selected text.") );
-      };
-      {
-        using namespace italicText;
-        tooltip   = makeToolTip( i18n("Italic text") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Toggle italic formatting of the selected text.") );
-        };
-        {
-          using namespace underlinedText;
-          tooltip   = makeToolTip( i18n("Underline text") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Toggle underlined formatting of the selected text.") );
-        };
-
-        {
-          using namespace alignLeft;
-          tooltip   = makeToolTip( i18n("Align left") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The text will be aligned on the left side of the page.") );
-        };
-        {
-          using namespace alignCenter;
-          tooltip   = makeToolTip( i18n("Center") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Centers the text horizontally.") );
-        };
-        {
-          using namespace alignRight;
-          tooltip   = makeToolTip( i18n("Align right") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Aligns the text on the right side of the page.") );
-        };
-        {
-          using namespace alignJustify;
-          tooltip   = makeToolTip( i18n("Justify") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Justifies the text on the page.") );
-        };
-
-        {
-          using namespace fontFamily;
-          tooltip   = makeToolTip( i18n("Set the font") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Choose a new font for the selected text.") );
-        };
-        { using namespace fontSize;
-          tooltip   = makeToolTip( i18n("Set the font size") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Choose a new font size for the selected text.") );
-        };
-        { using namespace fontColor;
-          tooltip   = makeToolTip( i18n("Set the color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Choose a new color for the selected text.") );
-        };
-      };
-    };
-
-    {
-      using namespace printing;
-      {
-        using namespace itemPage;
-        {
-          using namespace styleChooser;
-          tooltip = makeToolTip(i18n("Styles"));
-          whatsthis = makeWhatsThis(tooltip,i18n("This list contains the available print styles."));
-        };
-        {
-          using namespace itemList;
-          tooltip = makeToolTip(i18n("List of print items"));
-          whatsthis = makeWhatsThis(tooltip,i18n("This is the list which contains the items to be printed."));
-        };
-        {
-          using namespace itemUp;
-          tooltip = makeToolTip(i18n("Move item up"));
-          whatsthis = makeWhatsThis(tooltip,i18n("Move the selected item up one line."));
-        };
-        {
-          using namespace itemDown;
-          tooltip = makeToolTip(i18n("Move item down"));
-          whatsthis = makeWhatsThis(tooltip,i18n("Move the selected item down one line."));
-        };
-        {
-          using namespace itemDelete;
-          tooltip = makeToolTip(i18n("Delete items"));
-          whatsthis = makeWhatsThis(tooltip,i18n("Delete the selected items."));
-        };
-      };
-
-      {
-        using namespace styleList;
-        {
-          using namespace newStyle;
-          tooltip = makeToolTip( i18n("New printing style") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Create a new printing style.") );
-
-        };
-        {
-          using namespace deleteStyle;
-          tooltip = makeToolTip( i18n("Delete printing style") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Remove the selected printing style from the list.") );
-
-        };
-        {
-          using namespace editStyle;
-          tooltip = makeToolTip( i18n("Edit printing style") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Change the properties of the selected printing style.") );
-
-        };
-      };
-      {
-        using namespace printerSettings;
-        {
-          margins::whatsthis = makeWhatsThis( makeToolTip(i18n("Size of page borders")), i18n("This group contains the page borders of the page measured in millimeters.") );
-          {
-            using namespace margins::upper;
-            tooltip = makeToolTip( i18n("Upper border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the top of the paper.") );
-          };
-          {
-            using namespace margins::lower;
-            tooltip = makeToolTip( i18n("Lower border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the bottom of the paper.") );
-          };
-          {
-            using namespace margins::left;
-            tooltip = makeToolTip( i18n("Left border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the left side of the paper.") );
-          };
-          {
-            using namespace margins::right;
-            tooltip = makeToolTip( i18n("Right border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the right side of the paper.") );
-          };
-        };
-      };
-    };
-    {
-      using namespace settings;
-      {
-        using namespace startup;
-        {
-          using namespace dailyTip;
-          tooltip   = makeToolTip( i18n("Show daily tip") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Activate this box to see a daily tip on startup."));
-        };
-        {
-          using namespace showLogo;
-          tooltip   = makeToolTip( i18n("Show startup logo") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Activate this to see the BibleTime logo on startup."));
-        };
-        {
-          using namespace restoreWorkingArea;
-          tooltip   = makeToolTip( i18n("Restore the last BibleTime session on startup") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Save the user's session when BibleTime is closed and restore it on the next startup."));
-        };
-      };
-      {
-        using namespace fonts;
-        {
-          using namespace typeChooser;
-          tooltip   = makeToolTip( i18n("Choose a language") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The font selection below will apply to all texts in this language."));
-        };
-      };
-      {
-        using namespace colors;
-        {
-          using namespace text;
-          tooltip = makeToolTip( i18n("Text color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The color used for normal text in the display windows."));
-        };
-        {
-          using namespace background;
-          tooltip = makeToolTip( i18n("Color of the background") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This is the background color used in display windows."));
-        };
-        {
-          using namespace links;
-          tooltip   = makeToolTip( i18n("Link color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The color used for all references into Sword modules."));
-        };
-        {
-          using namespace footnotes;
-          tooltip   = makeToolTip( i18n("Footnote color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This color will be used for all footnotes in the display windows."));
-        };
-        {
-          using namespace strongNumbers;
-          tooltip   = makeToolTip( i18n("Strong's Numbers") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This color will be used for every Strong's Number in the display windows."));
-        };
-        {
-          using namespace highlightedVerse;
-          tooltip   = makeToolTip( i18n("Color of the highlighted verse") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This is the color of the highlighted verse used in display windows."));
-        };
-        {
-          using namespace jesusWords;
-          tooltip   = makeToolTip( i18n("Words of Jesus") );
-          whatsthis = makeWhatsThis( tooltip, i18n("All words spoken by Jesus will appear in this color."));
-        };
-        {
-          using namespace morphTags;
-          tooltip = makeToolTip( i18n("Morphological tags") );
-          whatsthis = makeWhatsThis( tooltip, i18n("All morphological tags will appear in this color."));
-        };
-      };
-      {
-        using namespace profiles;
-        {
-          using namespace list;
-          tooltip   = makeToolTip( i18n("List of sessions") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The list of available sessions."));
-        };
-        {
-          using namespace createNew;
-          tooltip   = makeToolTip( i18n("Create new session") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Create a new, empty session with default settings."));
-        };
-        {
-          using namespace deleteCurrent;
-          tooltip   = makeToolTip( i18n("Delete session") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Delete the selected session."));
-        };
-        {
-          using namespace renameCurrent;
-          tooltip   = makeToolTip( i18n("Rename session") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Rename the selected session."));
-        };
-      };
-      {
-        using namespace settings::sword;
-        {
-          using namespace general;
-          {
-            using namespace cacheKeys;
-            tooltip   = makeToolTip( i18n("Use cache files for the lexicon entries") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Activate this to let BibleTime create index files for the lexicon entries. This increases the speed of opening large lexicon modules significantly, but does consume some disk space. Recommended."));
-          };
-          {
-            using namespace scrolling;
-            tooltip   = makeToolTip( i18n("Use down arrow to scroll to next verse") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Check this to use the down arrow to scroll to the next verse."));
-          };
-          {
-            using namespace language;
-            tooltip   = makeToolTip( i18n("List of languages") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Contains the languages which can be used for the biblical booknames."));
-          };
-        };
-        {
-          using namespace settings::sword::modules;
-          {
-            using namespace bible;
-            tooltip   = makeToolTip( i18n("The default bible used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default Bible is used when a hyperlink into a Bible is clicked."));
-          };
-          {
-            using namespace commentary;
-            tooltip   = makeToolTip( i18n("The default commentary used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default commentary is used when a hyperlink into a commentary is clicked."));
-          };
-          {
-            using namespace lexicon;
-            tooltip   = makeToolTip( i18n("The default lexicon used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default lexicon is used when a hyperlink into a lexicon is clicked."));
-          };
-          {
-            using namespace dailyDevotional;
-            tooltip   = makeToolTip( i18n("The default daily devotional module") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default devotional will be used to display a short start up devotional."));
-          };
-          {
-            using namespace hebrewStrongs;
-            tooltip   = makeToolTip( i18n("The default Hebrew lexicon used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked."));
-          };
-          {
-            using namespace greekStrongs;
-            tooltip   = makeToolTip( i18n("The default Greek lexicon used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default Greek lexicon is used when a hyperlink into a Greek lexicon is clicked."));
-          };
-          {
-            using namespace hebrewMorph;
-            tooltip   = makeToolTip( i18n("The default Morphological lexicon for Hebrew texts used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked."));
-          };
-          {
-            using namespace greekMorph;
-            tooltip   = makeToolTip( i18n("The default Morphological lexicon for Greek texts used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked."));
-          };
-        };
-        {
-          using namespace filters;
-          {
-            using namespace lineBreaks;
-            tooltip   = makeToolTip( i18n("Line breaks") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Insert line breaks after each verse."));
-          };
-          {
-            using namespace verseNumbers;
-            tooltip   = makeToolTip( i18n("Verse numbers") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show the verse number before each verse in Bibles."));
-          };
-          {
-            using namespace footnotes;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::footnotes) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show footnotes embedded in the module's text."));
-          };
-          {
-            using namespace strongsNumbers;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::strongNumbers) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show Strong's Numbers embedded in the text of modules which support this feature."));
-          };
-          {
-            using namespace morphTags;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::morphTags) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show tags providing morphological information in the text of modules which support this feature."));
-          };
-          {
-            using namespace headings;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::headings) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show section headings in the text in the text of modules which support this feature."));
-          };
-          {
-            using namespace lemmas;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::lemmas) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show root words."));
-          };
-          {
-            using namespace hebrewVowelPoints;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::hebrewPoints) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show hebrew vowel points in the text."));
-          };
-          {
-            using namespace hebrewCantillation;
-            tooltip  = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::hebrewCantillation) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show hebrew cantillation marks in the text."));
-          };
-          {
-            using namespace greekAccents;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::greekAccents) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show greek accents in the text."));
-          };
-          {
-            using namespace textualVariants;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::textualVariants) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Use different variants from the textual sources."));
-          };
-        };
-      };
-    };
-    {
-      using namespace mainIndex;
-      {
-        using namespace search;
-        tooltip     = makeToolTip(i18n("Search in open modules"));
-        whatsthis   = makeWhatsThis(tooltip, i18n("Opens the search dialog to search in the modules that are currently open."));
-      };
-    };
-  };
-};
diff --git a/bibletime/util/cresmgr.h b/bibletime/util/cresmgr.h
deleted file mode 100644
index d09a429..0000000
--- a/bibletime/util/cresmgr.h
+++ /dev/null
@@ -1,890 +0,0 @@
-/***************************************************************************
-                          chelpmgr.h  -  description
-                             -------------------
-    begin                : Mon Sep 16 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CRESMGR_H
-#define CRESMGR_H
-
-//Qt includes
-#include <qstring.h>
-#include <qkeysequence.h>
-
-//KDE includes
-#include <kshortcut.h>
-
-/** Provides static functions to easily access the Tooltip and WhatsThis texts for all the frontend parts.
-  * @author The BibleTime team
-  */  
-namespace CResMgr {
-  void init_i18n();
-  
-  namespace modules {
-    namespace bible {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-    namespace commentary {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-    namespace lexicon {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-    namespace book {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-  };  
-  
-  namespace mainMenu { //Main menu
-    namespace file { //Main menu->File
-      namespace clearQueue {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace print { //a standard action
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace quit { //a standard action
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-    }
-
-    namespace view { //Main menu->View
-      namespace showMainIndex {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace showToolBar { //a standard action
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-    }
-
-    namespace mainIndex { //configuration for the main index and the view->search menu
-      namespace search {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace searchdefaultbible {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-    };
-
-    namespace window { //Main menu->Window
-      namespace loadProfile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const char* actionName;
-      }
-      namespace saveProfile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const char* actionName;
-      }
-      namespace saveToNewProfile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace setupProfiles {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace showFullscreen {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace tile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace cascade {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace autoTile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace autoCascade {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace closeAll {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-    }
-
-    namespace settings { //Main menu->Settings
-      namespace editToolBar { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace optionsDialog { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace swordSetupDialog {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-    };
-
-    namespace help { //Main menu->Help
-      namespace handbook {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      };
-      namespace bibleStudyHowTo {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      };
-      namespace whatsThis { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace bugreport { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace dailyTip {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      };
-      namespace aboutBibleTime { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace aboutKDE { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-  }  //end of main menu
-
-  namespace searchdialog {
-    extern const QString icon;
-
-    namespace searchButton {
-      extern QString tooltip;
-      extern QString whatsthis;
-    };
-    namespace cancelSearchButton {
-      extern QString tooltip;
-      extern QString whatsthis;
-    };
-
-    namespace options {
-//      namespace moduleChooserDialog {
-//        extern QString tooltip;
-//        extern QString whatsthis;
-//      };
-      namespace moduleChooserButton {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace searchedText {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace searchType {
-        namespace multipleWords_and {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace multipleWords_or {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace exactMatch {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace regExp {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-
-      namespace searchOptions {
-        namespace caseSensitive {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-      namespace chooseScope {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace scopeEditor {
-        namespace rangeList {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace nameEdit {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace editRange {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace parsedResult {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace addNewRange {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace deleteCurrentRange {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-
-      };
-    }
-    namespace result {
-      namespace moduleList {
-        extern QString tooltip;
-        extern QString whatsthis;
-
-        namespace copyMenu {
-          extern const QString icon;
-        };
-        namespace saveMenu {
-          extern const QString icon;
-        };
-        namespace printMenu {
-          extern const QString icon;
-        };
-      };
-      namespace foundItems {
-        extern QString tooltip;
-        extern QString whatsthis;
-
-        namespace copyMenu {
-          extern const QString icon;
-        };
-        namespace saveMenu {
-          extern const QString icon;
-        };
-        namespace printMenu {
-          extern const QString icon;
-        };
-
-      };
-      namespace textPreview {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-  };
-
-  namespace workspace {
-  };
-
-  namespace displaywindows {
-    namespace transliteration {
-      extern const QString icon;
-    };
-    namespace displaySettings {
-      extern const QString icon;
-    };
-
-    namespace general {
-      namespace scrollButton{
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-
-    namespace bibleWindow {
-      namespace bookList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextBook {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousBook {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace chapterList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextChapter {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousChapter {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace verseList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextVerse {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousVerse {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace copyMenu {
-        extern const QString icon;
-      };
-      namespace saveMenu {
-        extern const QString icon;
-      }
-      namespace printMenu {
-        extern const QString icon;
-      }
-    };
-    namespace commentaryWindow {
-      namespace syncWindow {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      }
-
-    };
-
-    namespace lexiconWindow {
-      namespace entryList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextEntry {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousEntry {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace copyMenu {
-        extern const QString icon;
-      }
-      namespace saveMenu {
-        extern const QString icon;
-      }
-      namespace printMenu {
-        extern const QString icon;
-      }
-    };
-    namespace bookWindow {
-      namespace toggleTree {
-        extern const QString icon;
-        extern const KShortcut accel;
-      };
-    };
-
-
-    namespace writeWindow {
-      namespace saveText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace restoreText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace deleteEntry {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-
-    //formatting buttons
-      namespace boldText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace italicText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace underlinedText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-
-      namespace alignLeft {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace alignCenter {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace alignRight {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace alignJustify {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-
-      namespace fontFamily {
-        extern QString tooltip;
-        extern QString whatsthis;
-	      extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace fontSize {
-        extern QString tooltip;
-        extern QString whatsthis;
-	      extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace fontColor {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-
-    };
-  };
-
-   namespace printing {
-    namespace itemPage {
-      namespace styleChooser {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemUp {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemDown {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemDelete {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-
-    namespace styleList {
-      namespace newStyle {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace deleteStyle {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace editStyle {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace printerSettings {
-      namespace margins {
-        extern QString whatsthis;
-
-        namespace upper {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace lower {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace left {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace right {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-    };
-  };
-
-  namespace settings {
-    namespace startup {
-      extern const QString icon;
-
-      namespace dailyTip {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace showLogo {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace restoreWorkingArea {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace fonts {
-      extern const QString icon;
-
-      namespace typeChooser {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace colors {
-      extern const QString icon;
-
-      namespace text {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace background {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace links {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace footnotes {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace strongNumbers {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace highlightedVerse {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace jesusWords {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace morphTags {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace profiles {
-      extern const QString icon;
-
-      namespace list {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace createNew {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace deleteCurrent {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace renameCurrent {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace sword {
-      extern const QString icon;
-
-      namespace general {
-        namespace cacheKeys {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace scrolling {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace language {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-      namespace modules {
-        namespace bible {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace commentary {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace lexicon {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace dailyDevotional {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewStrongs {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace greekStrongs {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewMorph {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace greekMorph {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-      namespace filters {
-        namespace lineBreaks {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace verseNumbers {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace footnotes {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace strongsNumbers {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace morphTags {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace headings {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace lemmas {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewVowelPoints {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewCantillation {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace greekAccents {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace textualVariants {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-    };
-    namespace keys {
-      extern const QString icon;
-    };
-  };
-
-  namespace mainIndex { //configuration for the main index and the view->search menu
-    namespace search {
-      extern QString tooltip;
-      extern QString whatsthis;
-      extern const QString icon;
-      extern const KShortcut accel;
-      extern const char* actionName;
-    }
-    namespace newFolder {
-      extern const QString icon;
-    }
-    namespace changeFolder {
-      extern const QString icon;
-    }
-    namespace openedFolder {
-      extern const QString icon;
-    }
-    namespace closedFolder {
-      extern const QString icon;
-    }    
-
-    namespace bookmark {
-      extern const QString icon;
-    }
-    namespace changeBookmark {
-      extern const QString icon;
-    }
-    namespace importBookmarks {
-      extern const QString icon;
-    }
-    namespace exportBookmarks {
-      extern const QString icon;
-    }
-    namespace printBookmarks {
-      extern const QString icon;
-    }
-    namespace deleteItems {
-      extern const QString icon;
-    }
-
-    namespace editModuleMenu {
-      extern const QString icon;
-    }
-    namespace editModulePlain {
-      extern const QString icon;
-    }
-    namespace editModuleHTML {
-      extern const QString icon;
-    }
-
-    namespace unlockModule {
-      extern const QString icon;
-    }
-    namespace aboutModule {
-      extern const QString icon;
-    }    
-  };
-  
-  namespace helpDialog {
-    extern const QString moduleLocked;
-    extern const QString firstStart;
-    extern const QString noSwordModules;    
-    extern const QString noSwordModuleConfigDir;
-    extern const QString initBackendFailed;
-    extern const QString firstTimeSearchDialog;
-  };
-}
-
-#endif
diff --git a/bibletime/util/ctoolclass.cpp b/bibletime/util/ctoolclass.cpp
deleted file mode 100644
index d2caf7a..0000000
--- a/bibletime/util/ctoolclass.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/***************************************************************************
-                 ctoolclass.cpp - some methods,that would be normal global,but
-                 									I hate global function :-)
-
-    begin                : 20 Jan 1999                        
-    copyright            : (C) 1999 by Sandy Meier                         
-    email                : smeier@rz.uni-potsdam.de                         
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   * 
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "ctoolclass.h"
-
-#include "util/cresmgr.h"
-#include "backend/cswordmoduleinfo.h"
-
-//QT includes
-#include <qlabel.h>
-#include <qfile.h>
-#include <qfiledialog.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <kurl.h>
-#include <kfiledialog.h>
-#include <kapplication.h>
-
-
-QString CToolClass::locatehtml(const QString &filename) {
-  QString path = locate("html", KGlobal::locale()->language() + '/' + filename);
-  if (path.isNull())
-		path = locate("html", "default/" + filename);
-  if (path.isNull())
-		path = locate("html", "en/" + filename);
-  return path;
-}
-
-/** Converts HTML text to plain text */
-QString CToolClass::htmlToText(const QString& html) {
-  QString newText = html;
-  // convert some tags we need in code
-	newText.replace( QRegExp(" "),"#SPACE#" );
-	newText.replace( QRegExp("<BR>\\s*"), "<BR>\n" );
- 	newText.replace( QRegExp("#SPACE#")," " );
-
-  QRegExp re("<.+>");
-  re.setMinimal(true);
-  newText.replace( re,"" );
-	return newText;	
-}
-
-/** Converts text to HTML (\n to <BR>) */
-QString CToolClass::textToHTML(const QString& text){
-	QString newText = text;
-	newText.replace( QRegExp("<BR>\n"),"#NEWLINE#" );
-	newText.replace( QRegExp("\n"),"<BR>\n" );
-	newText.replace( QRegExp("#NEWLINE#"),"<BR>\n");	
-	return newText;
-}
-
-/** Creates the file filename and put text into the file.
- */
-bool CToolClass::savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite, const QTextStream::Encoding& fileEncoding){
-	QFile saveFile(filename);
-	bool ret;
-
-	if (saveFile.exists()) {
-		if (!forceOverwrite && KMessageBox::warningYesNo(0,
-				  QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
-					  .arg( i18n("The file already exists.") )
-					  .arg( i18n("Do you want to overwrite it?")
-          )
-        ) == KMessageBox::No
-		) {
-			return false;
-    }
-		else { //either the user chose yes or forceOverwrite is set
-			saveFile.remove();
-    }
-	};
-
-	if ( saveFile.open(IO_ReadWrite) ) {
-		QTextStream textstream( &saveFile );
-		textstream.setEncoding(fileEncoding);
-		textstream << text;
-		saveFile.close();
-		ret = true;
-	}
-	else {
-		KMessageBox::error(0, QString::fromLatin1("<qt>%1<BR><B>%2</B></qt>")
-			.arg( i18n("The file couldn't be saved.") )
-			.arg( i18n("Please check permissions etc.")));
-		saveFile.close();
-		ret = false;
-	}
-	return ret;
-}
-
-
-/** Returns the icon used for the module given as aparameter. */
-QPixmap CToolClass::getIconForModule( CSwordModuleInfo* module_info ){
-  if (!module_info)
-  	return SmallIcon(CResMgr::modules::book::icon_locked, 16);
-
-  if (module_info->category() == CSwordModuleInfo::Cult) {
-    return SmallIcon("stop.png", 16);
-  };
-   
-   
-  QPixmap img;
-  
- 	switch (module_info->type()){
- 	  case CSwordModuleInfo::Bible:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::bible::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::bible::icon_unlocked, 16);
-      break;
-  
- 	  case CSwordModuleInfo::Lexicon:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::lexicon::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::lexicon::icon_unlocked, 16);
-      break;
- 	
- 	  case CSwordModuleInfo::Commentary:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::commentary::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::commentary::icon_unlocked, 16);
-      break;
- 	
- 	  case CSwordModuleInfo::GenericBook:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::book::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::book::icon_unlocked, 16);
-      break;
- 	
- 	  case CSwordModuleInfo::Unknown: //fall though to default
- 	  default:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::book::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::book::icon_unlocked, 16);
-      break;
- 	}
-
-  
-  return img;
-}
-
-QLabel* CToolClass::explanationLabel(QWidget* parent, const QString& heading, const QString& text ){
-  QLabel* label = new QLabel( QString::fromLatin1("<B>%1</B><BR>%2").arg(heading).arg(text),parent );
-  label->setAutoResize(true);
-  label->setMargin(1);
-  label->setFrameStyle(QFrame::Box | QFrame::Plain);
-  return label;
-}
-
-/** No descriptions */
-bool CToolClass::inHTMLTag(int pos, QString & text){
- int i1=text.findRev("<",pos);
- int i2=text.findRev(">",pos);
- int i3=text.find(">",pos);
- int i4=text.find("<",pos);
-
-
-//	if ((i1>0) && (i2==-1))  //we're in th first html tag
-//		i2=i1; // not ncessary, just for explanation
-
-	if ((i3>0) && (i4==-1))  //we're in the last html tag
-	  i4=i3+1;
-
-//  qWarning("%d > %d && %d < %d",i1,i2,i3,i4);
-
- if ( (i1>i2) && (i3<i4) )
-    return true; //yes, we're in a tag
-
-  return false;
-}
diff --git a/bibletime/util/ctoolclass.h b/bibletime/util/ctoolclass.h
deleted file mode 100644
index f7c7453..0000000
--- a/bibletime/util/ctoolclass.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
-                 ctoolclass.h - some methods,that would be normal global, but
-                  I hate global function :-)
-                             -------------------                                         
-
-    begin                : 20 Jan 1999
-    copyright            : (C) 1999 by Joachim Ansorg
-    email                : Jockel123@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   * 
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-
-
-//Qt includes
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qtextstream.h>
-
-
-#ifndef CTOOLCLASS_H
-#define CTOOLCLASS_H
-
-
-class CSwordModuleInfo;
-class QLabel;
-
-/**
- * Provides some useful functions which would be normally global.
- *
- * Some methods,that would be normaly global, but I hate global functions :-)
- * (the function locateHTML is from Sandy Meier (KDevelop))
- *
- * @short A class which contains static members to do small things.
- * @author Joachim Ansorg <jansorg@gmx.de>
- */
-class CToolClass {
-
-public:
- /**
-  * @return The path of the HTML file "filename". This function searches only in $KDEDIR.
-  * @author Sandy Meier of the KDevelop team.
-  */
-  static QString locatehtml(const QString &filename);
-	/**
-  * Converts HTML text to plain text.
- 	* This function converts some HTML tags in text (e.g. <BR> to \n)
- 	* @return The text withput HTML tags and with converted <BR> to \n
- 	* @author Joachim Ansorg 	
- 	*/
-  static QString htmlToText(const QString&);
-  /**
-  * Converts text to HTML converting some text commands into HTML tags (e.g. \n to <BR>)
-  * @return The HTML formatted text we got after changing \n to <BR>
-  * @author Joachim Ansorg
-  */
-  static QString textToHTML(const QString&);
-  /**
-  * Creates the file filename and put the text of parameter "text" into the file.
-  * @return True if saving was sucessful, otherwise false
-  * @author Joachim Ansorg
-  */
-  static bool savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite = false, const QTextStream::Encoding& fileEncoding = QTextStream::Locale);
-  /**
- 	* Returns the icon used for the module given as aparameter.
- 	*/
-  static QPixmap getIconForModule( CSwordModuleInfo* );
-  /** Returns a label to explain difficult things of dialogs.
-  * This function returns a label with heading "heading" and explanation "text". This label should be used to
-  * explain difficult things of the GUI, e.g. in the optionsdialog.
-  */
-  static QLabel* explanationLabel(QWidget* parent, const QString& heading, const QString& text );
-  /**
-  * Returns true if the character at position "pos" of text is inside an HTML tag. Returns false if it's not inside an HTML tag.
-  */
-  static bool inHTMLTag(int pos, QString & text);
-};
-
-#endif
diff --git a/bibletime/util/scoped_resource.h b/bibletime/util/scoped_resource.h
deleted file mode 100644
index 351667c..0000000
--- a/bibletime/util/scoped_resource.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#ifndef SCOPED_RESOURCE_H_INCLUDED
-#define SCOPED_RESOURCE_H_INCLUDED
-
-/**
-* The util namespace should take all classes which are of a generic type,
-* used to perform common tasks which are not BibleTime-specific. See
-* @ref scoped_resource for an example.
-*/
-namespace util
-{
-/**
-* A class template, scoped_resource, designed to
-* implement the Resource Acquisition Is Initialization (RAII) approach
-* to resource management. scoped_resource is designed to be used when
-* a resource is initialized at the beginning or middle of a scope,
-* and released at the end of the scope. The template argument
-* ReleasePolicy is a functor which takes an argument of the
-* type of the resource, and releases it.
-*
-* Usage example, for working with files:
-*
-* @code
-* struct close_file { void operator(int fd) const {close(fd);} };
-* ...
-* {
-*    const scoped_resource<int,close_file> file(open("file.txt",O_RDONLY));
-*    read(file, buf, 1000);
-* } // file is automatically closed here
-* @endcode
-*
-* Note that scoped_resource has an explicit constructor, and prohibits
-* copy-construction, and thus the initialization syntax, rather than
-* the assignment syntax must be used when initializing.
-*
-* i.e. using scoped_resource<int,close_file> file = open("file.txt",O_RDONLY);
-* in the above example is illegal.
-*
-*/
-template<typename T,typename ReleasePolicy>
-class scoped_resource
-{
-	T resource;
-	ReleasePolicy release;
-	
-	//prohibited operations
-	scoped_resource(const scoped_resource&);
-	scoped_resource& operator=(const scoped_resource&);
-public:
-	typedef T resource_type;
-	typedef ReleasePolicy release_type;
-	
-  /**
-  * Constructor
-	*
-	* @ param res This is the resource to be managed
-	* @ param rel This is the functor to release the object
-  */
-	explicit scoped_resource(resource_type res,release_type rel=release_type())
-			: resource(res), release(rel) {}
-
-  /**
-  * The destructor is the main point in this class. It takes care of proper
-	* deletion of the resource, using the provided release policy.
-	*/
-	~scoped_resource()
-	{
-		release(resource);
-	}
-
-  /**
-  * This operator makes sure you can access and use the scoped_resource
-	* just like you were using the resource itself.
-  *
-  * @ret the underlying resource
-	*/
-	operator resource_type() const { return resource; }
-
-  /**
-  * This function provides explicit access to the resource. Its behaviour
-  * is identical to operator resource_type()
-	*
-	* @ret the underlying resource
-  */
-  resource_type get() const { return resource; }
-
-	/**
-  * This function provides convenient direct access to the -> operator
-  * if the underlying resource is a pointer. Only call this function
-  * if resource_type is a pointer type.
-  */
-	resource_type operator->() const { return resource; }
-
-};
-
-/**
-* A helper policy for scoped_ptr.
-* It will call the delete operator on a pointer, and assign the pointer to 0
-*/
-struct delete_item {
-	template<typename T>
-	void operator()(T*& p) const { delete p; p = 0; }
-};
-/**
-* A helper policy for scoped_array.
-* It will call the delete[] operator on a pointer, and assign the pointer to 0
-*/
-struct delete_array {
-	template<typename T>
-	void operator()(T*& p) const { delete [] p; p = 0; }
-};
-
-/**
-* A class which implements an approximation of
-* template<typename T>
-* typedef scoped_resource<T*,delete_item> scoped_ptr<T>;
-*
-* It is a convenient synonym for a common usage of @ref scoped_resource.
-* See scoped_resource for more details on how this class behaves.
-*
-* Usage example:
-* @code
-* {
-*    const scoped_ptr<Object> ptr(new Object);
-*    ...use ptr as you would a normal Object*...
-* } // ptr is automatically deleted here
-* @endcode
-*
-* NOTE: use this class only to manage a single object, *never* an array.
-* Use scoped_array to manage arrays. This distinction is because you
-* may call delete only on objects allocated with new, delete[] only
-* on objects allocated with new[].
-*/
-template<typename T>
-struct scoped_ptr : public scoped_resource<T*,delete_item>
-{
-	explicit scoped_ptr(T* p) : scoped_resource<T*,delete_item>(p) {}
-};
-
-/**
-* This class has identical behaviour to @ref scoped_ptr, except it manages
-* heap-allocated arrays instead of heap-allocated single objects
-*
-* Usage example:
-* @code
-* {
-*    const scoped_array<char> ptr(new char[n]);
-*    ...use ptr as you would a normal char*...
-* } // ptr is automatically deleted here
-* @endcode
-*
-*/
-template<typename T>
-struct scoped_array : public scoped_resource<T*,delete_array>
-{
-	explicit scoped_array(T* p) : scoped_resource<T*,delete_array>(p) {}
-};
-
-}
-
-#endif
diff --git a/bibletime/xml/Makefile.am b/bibletime/xml/Makefile.am
deleted file mode 100644
index acb432e..0000000
--- a/bibletime/xml/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = bibletimeui.rc 
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = bibletimeui.rc 
diff --git a/bibletime/xml/Makefile.in b/bibletime/xml/Makefile.in
deleted file mode 100644
index ae674ba..0000000
--- a/bibletime/xml/Makefile.in
+++ /dev/null
@@ -1,512 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-EXTRA_DIST = bibletimeui.rc 
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = bibletimeui.rc 
-subdir = bibletime/xml
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(rc_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/xml/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/xml/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/xml/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-rcDATA_INSTALL = $(INSTALL_DATA)
-install-rcDATA: $(rc_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \
-	  $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \
-	done
-
-uninstall-rcDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(rcdir)/$$f"; \
-	  rm -f $(DESTDIR)$(rcdir)/$$f; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-rcDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-rcDATA
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-rcDATA install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-rcDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/xml/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/xml/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/xml/bibletimeui.rc b/bibletime/xml/bibletimeui.rc
deleted file mode 100644
index 6866376..0000000
--- a/bibletime/xml/bibletimeui.rc
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="BibleTime" version="20">
-<MenuBar>
- <Menu name="file" noMerge="1"><text>&amp;File</text>
-  <Action name="file_clear_queue_action"/>
-  <Action name="file_print"/>
-  <Separator/>
-  <Action name="file_quit"/>
- </Menu>
- <Menu name="search" noMerge="1"><Text>&amp;Search</Text>
- <Action name="groupmanager_searchdefaultbible_action"/>
- <Action name="groupmanager_search_action"/>
- </Menu>
- <Menu name="settings" noMerge="1"><Text>&amp;Settings</Text>
-  <Action name="options_configure_toolbars"/>
-  <Separator/>
-  <Action name="options_configure"/>
-  <Separator/>
-  <Action name="options_sword_setup"/>
- </Menu>
- <Menu name="view" noMerge="1"><Text>&amp;View</Text>
-  <Action name="options_show_toolbar"/>
-  <Separator/>
-  <Action name="viewMainIndex_action"/>
- </Menu>
- <Menu name="window"><Text>&amp;Window</Text>
-  <Action name="windowSaveProfile_action"/>
-  <Action name="windowSaveToNewProfile_action"/>
-  <Action name="windowLoadProfile_action"/>
-  <Action name="windowEditProfiles_action"/>
-  <Separator/>
-  <Action name="windowFullscreen_action"/>
-  <Separator/>
-  <Action name="windowTile_action"/>
-  <Action name="windowCascade_action"/>
-  <Action name="windowAutoTile_action"/>
-  <Action name="windowAutoCascade_action"/>
-  <Separator/>
-  <Action name="windowCloseAll_action"/>
-  <Separator/>
- </Menu>
- <Menu name="help" noMerge="1"><Text>&amp;Help</Text>
-  <Action name="helpHandbook_action"/>
-  <Action name="helpHowTo_action"/>
-  <Separator/>
-  <Action name="help_whats_this"/>
-  <Action name="help_report_bug"/>
-  <Action name="helpDailyTip_action"/>
-  <Separator/>
-  <Action name="help_about_app"/>
-  <Action name="help_about_kde"/>
- </Menu>
-</MenuBar>
-<ToolBar name="mainToolBar" fullWidth="true" noMerge="1" newLine="1">
- <Action name="file_quit"/>
- <Separator/>
- <Action name="groupmanager_search_action"/>
- <Separator/>
- <Action name="file_print"/>
- <Action name="file_clear_queue_action"/>
- <Separator/>
- <Action name="viewMainIndex_action"/>
- <Action name="windowFullscreen_action"/>
- <Separator/>
- <Action name="windowLoadProfile_action"/>
- <Action name="windowSaveToNewProfile_action"/>
- <Separator/>
- <Action name="help_whats_this"/>
-</ToolBar>
-</kpartgui>
author	Roberto C. Sanchez <roberto@connexer.com>	2014-10-21 22:48:14 -0400
committer	Roberto C. Sanchez <roberto@connexer.com>	2014-10-21 22:48:14 -0400
commit	3edaf04fe3c966997d7c84a8973c62ab5df500bb (patch)
tree	46865fe911db1fca1c6a8678795bae46a19d9f1b /bibletime
parent	472963ff3697fb12af111e4a8fa2b985216826d5 (diff)