9 files changed, 5 insertions, 473 deletions
diff --git a/Rules.make b/Rules.make
index 3fbce76..64237cf 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,319 +1,313 @@
 .phony: force
 force:
 $(configs) :
        $(call makecfg,$@)
 $(TOPDIR)/gen.pro : $(TOPDIR)/.config
        echo > $@
 # added for threaded version
 ifneq ($(CONFIG_THREADED),)
        echo CONFIG += thread >> $@
 else
        echo CONFIG -= thread >> $@
 endif
 # added for auto stripped build
 ifneq ($(CONFIG_STRIP),)
        echo CONFIG += strip >> $@
 endif
 ifneq ($(CONFIG_DEBUG),)
        echo CONFIG += debug >> $@
        echo CONFIG -= release >> $@
        echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@
        echo DEFINES += QT_DEBUG >> $@
 else
        echo CONFIG -= debug >> $@
        echo CONFIG += release >> $@
        echo DEFINES += "OPIE_NO_DEBUG" >> $@
 endif
 ifeq ($(CONFIG_STATIC),y)
        echo !contains\( TARGET,qpe \) \{ >> $@
        echo CONFIG += staticlib >> $@
        echo \} >> $@
 endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
        echo CONFIG -= qt3 >> $@
 else
        echo CONFIG += qt3 >> $@
 endif
 ifneq ($(CONFIG_QUICK_LAUNCH),)
        echo contains\( CONFIG, quick-app \) \{ >> $@
        echo CONFIG -= staticlib >> $@
        echo CONFIG -= quick-app >> $@
        echo CONFIG += quick-app-lib >> $@
        echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
        echo \} >> $@
 else
        echo contains\( CONFIG, quick-app \) \{ >> $@
        echo CONFIG -= quick-app >> $@
        echo CONFIG += quick-app-bin >> $@
        echo \} >> $@
 endif
 ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
        echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
 else
        echo ENABLE_SQL_PIM_BACKEND=n >> $@
 endif
-ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
-        echo CONFIG += no-override >> $@
-endif
 ifeq ($(CONFIG_OPIELOGIN_USEPAM),y)
        echo CONFIG += OPIELOGIN_USEPAM >> $@
 endif
 ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y)
        echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@
 endif
-ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y)
-        echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@
-endif
 ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
        echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
        echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
 endif
 ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
        echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
 endif
 ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y)
        echo DEFINES += USE_FILE_NOTIFICATION >> $@
 endif
 ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
        echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
 endif
 ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
        echo DEFINES += OPIE_NEW_MALLOC >> $@
 endif
 ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
        echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
 endif
        echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
 ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
        echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
 endif
 ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y)
        echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@
        endif
 # Write LIB dirs and INC dirs...
 ifeq ($(CONFIG_LIBETPAN_DEP),y)
        echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
        echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBPCAP_DEP),y)
        echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@
        echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSQLITE_DEP),y)
        echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
        echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBXINE_DEP),y)
        echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
        echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBBLUEZ_DEP),y)
        echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@
        echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBIPK_DEP),y)
        echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
        echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSDK_DEP),y)
        echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
        echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSWORD_DEP),y)
        echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
        echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBFREETYPE2_DEP),y)
        echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@
 endif
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
        @echo Generating dependency information...
 # add to subdir-y, and add descend rules
        @cat $(TOPDIR)/packages | grep -v '^#' | \
                awk '{print \
                        ".PHONY : " $$2 "\n" \
                        "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
                        print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
        cat $(TOPDIR)/packages | grep -v '^#' | \
                perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
                        >> $(TOPDIR)/.depends
 # interpackage dependency generation
        @cat $(TOPDIR)/packages | \
                $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
 $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
        @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
        @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
        @-rm -f dirs
 $(QTDIR)/stamp-headers :
        @-rm -f $(QTDIR)/stamp-headers*
        ( cd $(QTDIR)/include; \
                $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
                qcopchannel_qws.h qwindowsystem_qws.h \
                qfontmanager_qws.h qwsdefaultdecoration_qws.h))
        touch $@
 $(QTDIR)/stamp-headers-x11 :
        @-rm -f $(QTDIR)/stamp-headers*
        cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
        touch $@
 $(OPIEDIR)/stamp-headers :
        @-rm -f $(OPIEDIR)/stamp-headers*
        mkdir -p $(TOPDIR)/include/qpe \
                $(TOPDIR)/include/qtopia \
                $(TOPDIR)/include/opie \
                $(TOPDIR)/include/opie2 \
                $(TOPDIR)/include/opie2/private \
                $(TOPDIR)/include/qtopia/private \
                $(TOPDIR)/include/sl
        ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
        ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
        ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
        # libopie2
        ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
        ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
        ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
        # auxilliary libraries
        ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
        ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
        ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
        ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
        ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
        # all
        ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
        ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
        ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
        ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
        ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
        touch $@
 $(OPIEDIR)/stamp-headers-x11 :
        @-rm -f $(OPIEDIR)/stamp-headers*
        mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
                $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
        ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
        ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
        ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
        ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
        ( cd include/opie &&  ln -sf ../../libsql/*.h .; )
        ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
        ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
        ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
        ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
        ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
        touch $@
 $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
        @-rm -f $@
        @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
                ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
        @touch $@
 $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
        +$(call descend,$(shell dirname $@),$(shell basename $@))
 menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
        $(TOPDIR)/scripts/kconfig/mconf ./config.in
        @touch ./.config.stamp
 xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
        $(TOPDIR)/scripts/kconfig/qconf ./config.in
        @touch .config.stamp
 gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
        $(TOPDIR)/scripts/kconfig/gconf ./config.in
        @touch .config.stamp
 config: $(TOPDIR)/scripts/kconfig/conf ./config.in
        $(TOPDIR)/scripts/kconfig/conf ./config.in
        @touch .config.stamp
 oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
        $(TOPDIR)/scripts/kconfig/conf -o ./config.in
        @touch .config.stamp
 randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
        $(TOPDIR)/scripts/kconfig/conf -r ./config.in
        @touch .config.stamp
 allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
        $(TOPDIR)/scripts/kconfig/conf -y ./config.in
        @touch .config.stamp
 allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
        $(TOPDIR)/scripts/kconfig/conf -n ./config.in
        @touch .config.stamp
 defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
        $(TOPDIR)/scripts/kconfig/conf -d ./config.in
        @touch .config.stamp
 $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
 $(TOPDIR)/mkspecs/default :
        ln -sf linux-g++ $@
 $(TOPDIR)/scripts/subst : force
        @( \
                echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
                echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
                echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
                echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
                echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
                echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
                echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
        ) > $@ || ( rm -f $@; exit 1 )
 $(TOPDIR)/scripts/filesubst : force
        @( \
                echo 's,\$$OPIEDIR/root/,/,g'; \
                echo 's,$(OPIEDIR)/root/,/,g'; \
                echo 's,\$$OPIEDIR,$(prefix),g'; \
                echo 's,$(OPIEDIR),$(prefix),g'; \
                echo 's,\$$QTDIR,$(prefix),g'; \
                echo 's,$(QTDIR),$(prefix),g'; \
                echo 's,^\(\./\)*root/,/,g'; \
                echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
                echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
                echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
                echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
                echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
                echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
                echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
                echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
                echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
                echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
                echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
        ) > $@ || ( rm -f $@; exit 1 )
 ## general rules ##
 define descend
        $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
 endef
 define makefilegen
        cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages))
 endef
 define makecfg
        $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
 endef
diff --git a/config.in b/config.in
index 323ca51..f913aad 100644
--- a/config.in
+++ b/config.in
@@ -1,283 +1,275 @@
 mainmenu "Opie Configuration"
 menu "Build Parameters"
 choice
  prompt "Target Machine"
  default TARGET_X86
  help
    Please select the architecture of the machine you will be
    building the OpenZaurus buildroot for.
  config TARGET_X86
    boolean "Intel X86"
  config TARGET_MACOSX
    boolean "Mac OS X (DARWIN)"
  config TARGET_SHARP
    boolean "Sharp Zaurus w/ SA1100 (5000 and 5500)"
  config TARGET_C700
    boolean "Sharp Zaurus w/ PXA25x (5600, C7x0, C8x0)"
  config TARGET_OE
    boolean "OpenEmbedded w/ OE build dir set below"
  config TARGET_IPAQ
    boolean "iPAQ"
  config TARGET_RAMSES
    boolean "Ramses"
  config TARGET_SIMPAD
    boolean "SIMpad"
  config TARGET_YOPY
    boolean "Yopy 3500/3700"  
 endchoice
 config OE_BUILD_DIR
  depends TARGET_OE
  string "OE build directory"
  default ">>>set OpenEmbedded build directory here<<<"
 config OE_HOST_SYS
  depends TARGET_OE
  string "OE host system"
  default "i686-linux"
      
 config OPTIMIZE
  boolean "Use optimizations"
  default "y" if ! TARGET_X86
 config THREADED
  boolean "Enable threaded build"
  default "n"
 config STATIC
  boolean "Build static libraries"
  default "n"
 config DEBUG
  boolean "Enable debug builds"
  default n
 config RELEASE
  bool
  default y
  depends !DEBUG
  
 config QUICK_LAUNCH
  boolean "Enable Quick Launch"
  default n if TARGET_X86
  default y if ! TARGET_X86
  
 config QUICKLAUNCH_PATH
  string "Path to quicklauncher"
  default "./quicklauncher" if TARGET_X86
  default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
 config SPECFILE
  string
  default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
  default "linux-g++" if TARGET_X86 && X11
  default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
  default "linux-g++" if TARGET_SHARP && X11
  default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
  default "linux-g++" if TARGET_IPAQ && X11
  default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
  default "linux-g++" if TARGET_RAMSES && X11
  default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
  default "linux-g++" if TARGET_SIMPAD && X11
  default "qws/linux-yopy-g++" if TARGET_YOPY && (! X11)
  default "qws/macx-generic-g++" if TARGET_MACOSX && (! X11)
  default "qws/linux-oe-g++" if TARGET_OE && (!X11)
 config CUSTOMFILE
  string
  default "custom-ipaq.h" if TARGET_IPAQ
  default "custom-sharp.h" if TARGET_SHARP
  default "custom-ramses.h" if TARGET_RAMSES
  default "custom-ipaq.h" if TARGET_SIMPAD
  default "custom-yopy.h" if TARGET_YOPY
 config OPTIMIZATIONS
  string "Optimization flags"
  depends OPTIMIZE
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_YOPY
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SIMPAD
  default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700
 config EXPERIMENTAL
  bool "Prompt for development and/or incomplete items"
  default y
 config USE_CCACHE
  bool "Use ccache, if available?"
  default y
 endmenu
 menu "Configuration"
-config OPIE_NO_OVERRIDE_QT
-  boolean "Build Opie against an unpatched version of Qt"
-  default n
-config OPIE_NO_ERASERECT_FIX
-  boolean "Disable Fixup eraseRect for HancomMobileWord,neocal.. to make libopiecore work on Sharps libqpe"
-  default n
 config OPIE_NO_BUILTIN_SHUTDOWN
  boolean "Disable the built in shutdown application"
  default y
 config OPIE_NO_BUILTIN_CALIBRATE
  boolean "Disable the built in calibrate application"
  default y if TARGET_YOPY
  default n if ! TARGET_YOPY
 config OPIE_SOUND_FRAGMENT_SHIFT
  string  "The sound fragment used in Opie Player I"
  default "14" if TARGET_IPAQ
  default "16" if ! TARGET_IPAQ
 config USE_REALTIME_AUDIO_THREAD
  boolean "Use a realtime thread in Opie Player I"
  default y if TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP
  default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 config QT_QWS_ALLOW_OVERCLOCK
  boolean "Allow the user to overclock the device"
  depends TARGET_RAMSES
  default n
 config USE_FILE_NOTIFICATION
  boolean "Substitute (some) polling interfaces with OFileNotifier"
  default y
 config OPIE_NEW_ALLOC
  boolean "Use malloc and free for the implementation"
  default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
  default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 config OPIE_TASKBAR_LOCK_KEY_STATE
  boolean "Have a KeyLock state indicator on the taskbar"
  default y if TARGET_SHARP
  default n if !TARGET_SHARP
 config LIBQPE_WITHROHFEEDBACK
  boolean "Build libqpe with Right-On-Hold feedback"
  default y
 config OPIE_NO_SOUND_PCM_READ_BITS
  boolean "There is not a pcm_read_bits io control"
  default y if TARGET_SHARP
  default n if ! TARGET_SHARP
 endmenu
 menu "Dependencies"
    source dependencies.in
 endmenu
 menu "Base"
  choice
    prompt "Qpe Library Selection"
    default LIBQPE
    source library/config.in
    source x11/config.in
  endchoice
  source libopie2/config.in
  source libqtaux/config.in
  source rsync/config.in
  source core/opie-login/config.in
  source core/opiealarm/config.in
  source core/tools/quicklauncher/config.in
  source core/launcher/config.in
  source core/symlinker/config.in
 endmenu
 comment ""
 menu "Applets"
  source core/applets/config.in
  source noncore/applets/config.in
 endmenu
 menu "Apps"
  source core/apps/config.in
  source noncore/apps/config.in
 endmenu
 menu "Communications and Networking"
  source noncore/comm/config.in
  source noncore/net/config.in
 endmenu
 menu "Games"
  source noncore/games/config.in
 endmenu
 menu "Graphics and Multimedia"
  source freetype/config.in
  source noncore/graphics/config.in
  source core/multimedia/config.in
  source noncore/multimedia/config.in
 endmenu
 menu "Input methods"
  source inputmethods/config.in
 endmenu
 menu "Pim"
  source core/obex/config.in
  source core/pim/config.in
  comment "Today Plugins ---"
    source noncore/todayplugins/config.in
    source core/pim/today/plugins/config.in
 endmenu
 menu "Settings"
  source core/settings/config.in
  source noncore/settings/config.in
  source noncore/securityplugins/config.in
 endmenu
 menu "Theming"
  comment "Decorations ---"
  source noncore/decorations/config.in
  comment "Styles ---"
  source noncore/styles/config.in
 endmenu
 menu "Tools"
  source noncore/tools/config.in
 endmenu
 menu "Development"
  source development/keyview/config.in
  #source development/debugviewer/config.in
 endmenu
 menu "Examples"
    config EXAMPLES
        boolean "Compile Example Application"
    source examples/config.in
 endmenu
 comment ""
 menu "Unsupported / Unmaintained"
  source noncore/unsupported/config.in
 endmenu
 comment ""
  depends on EXPERIMENTAL
 menu "Experimental"
  depends on EXPERIMENTAL
  source libslcompat/config.in
  source core/qws/config.in
 endmenu
diff --git a/library/library.pro b/library/library.pro
index 04e125f..95c18a2 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,145 +1,139 @@
        TEMPLATE= lib
        #CONFIG         += qt warn_on release
        CONFIG  += qt warn_on debug
        HEADERS=   calendar.h \
            global.h \
            resource.h \
            xmlreader.h \
            mimetype.h \
            menubutton.h \
            network.h \
            networkinterface.h \
            filemanager.h \
            fontmanager.h \
            qdawg.h \
            datebookmonth.h \
            fileselector.h \
            fileselector_p.h \
            imageedit.h \
            qcopenvelope_qws.h \
            qpedecoration_qws.h \
            qpeapplication.h \
            qpestyle.h \
            qpedialog.h \
            lightstyle.h \
            config.h \
            applnk.h \
            sound.h \
            tzselect.h \
            qmath.h \
            datebookdb.h \
            alarmserver.h \
            process.h \
            password.h \
            timestring.h \
            fontfactoryinterface.h \
            fontdatabase.h \
            power.h \
            storage.h \
            qpemessagebox.h \
            timeconversion.h \
            qpedebug.h \
            qpemenubar.h \
            qpetoolbar.h \
            backend/categories.h \
            stringutil.h \
            backend/palmtoprecord.h \
            backend/task.h \
            backend/event.h \
            backend/contact.h\
            categorymenu.h \
            categoryedit_p.h \
            categoryselect.h \
            categorywidget.h \
        ir.h \
        backend/vobject_p.h \
        findwidget_p.h \
        finddialog.h \
        lnkproperties.h \
        windowdecorationinterface.h \
        textcodecinterface.h \
        imagecodecinterface.h \
-        qt_override_p.h \
        qpeglobal.h
        
        SOURCES=   calendar.cpp \
            global.cpp \
            xmlreader.cpp \
            mimetype.cpp \
            menubutton.cpp \
            network.cpp \
            networkinterface.cpp \
            filemanager.cpp \
            fontmanager.cpp \
            qdawg.cpp \
            datebookmonth.cpp \
            fileselector.cpp \
            imageedit.cpp \
            resource.cpp \
            qpedecoration_qws.cpp \
            qcopenvelope_qws.cpp \
            qpeapplication.cpp \
            qpestyle.cpp \
            qpedialog.cpp \
            lightstyle.cpp \
            config.cpp \
            applnk.cpp \
            sound.cpp \
            tzselect.cpp \
            qmath.c \
            datebookdb.cpp \
            alarmserver.cpp \
            password.cpp \
            process.cpp \
            process_unix.cpp \
            timestring.cpp \
            fontdatabase.cpp \
            power.cpp \
            storage.cpp \
            qpemessagebox.cpp \
            backend/timeconversion.cpp \
            qpedebug.cpp \
            qpemenubar.cpp \
            qpetoolbar.cpp \
            backend/categories.cpp \
            backend/stringutil.cpp \
            backend/palmtoprecord.cpp \
            backend/task.cpp \
            backend/event.cpp \
            backend/contact.cpp \
            categorymenu.cpp \
        categoryedit_p.cpp \
        categoryselect.cpp \
        categorywidget.cpp \
        ir.cpp \
        backend/vcc_yacc.cpp \
        backend/vobject.cpp \
        findwidget_p.cpp \
        finddialog.cpp \
        lnkproperties.cpp \
-        qt_override.cpp   \
        widget_showing.cpp
 # Qt 3 compatibility
 HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
        LIBS    += -ldl -lcrypt -lm
 INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
        TARGET  = qpe
        DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
        VERSION         = 1.5.0.1
 include( $(OPIEDIR)/include.pro )
-contains( CONFIG, no-override ){
-    DEFINES += OPIE_NO_OVERRIDE_QT
-}
 contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
    DEFINES += OPIE_WITHROHFEEDBACK
    SOURCES += backend/rohfeedback.cpp
    HEADERS += backend/rohfeedback.h
 }
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 1c5ced3..2bd7cbe 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1,355 +1,354 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 */
 #define QTOPIA_INTERNAL_LANGLIST
 #include <stdlib.h>
 #include <unistd.h>
 #ifndef Q_OS_MACX
 #include <linux/limits.h> // needed for some toolchains (PATH_MAX)
 #endif
 #include <qfile.h>
 #include <qqueue.h>
 #ifdef Q_WS_QWS
 #ifndef QT_NO_COP
 #if QT_VERSION <= 231
 #define private public
 #define sendLocally processEvent
 #include "qcopenvelope_qws.h"
 #undef private
 #else
 #include "qcopenvelope_qws.h"
 #endif
 #endif
 #include <qwindowsystem_qws.h>
 #endif
 #include <qtextstream.h>
 #include <qpalette.h>
 #include <qbuffer.h>
 #include <qptrdict.h>
 #include <qregexp.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qdragobject.h>
 #include <qtextcodec.h>
 #include <qevent.h>
 #include <qtooltip.h>
 #include <qsignal.h>
 #include <qmainwindow.h>
 #include <qwidgetlist.h>
 #include <qpixmapcache.h>
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #define QTOPIA_INTERNAL_INITAPP
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #include "styleinterface.h"
 #if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
 #include <qwindowsstyle.h>
 #include <qmotifstyle.h>
 #include <qmotifplusstyle.h>
 #include "lightstyle.h"
 #include <qpe/qlibrary.h>
 #endif
 #include "global.h"
 #include "resource.h"
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include "qutfcodec.h"
 #endif
 #include "config.h"
 #include "network.h"
 #ifdef QWS
 #include "fontmanager.h"
 #include "fontdatabase.h"
 #endif
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 #include <qtopia/qpeglobal.h>
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
 #endif
-#include "qt_override_p.h"
 #include <backend/rohfeedback.h>
 static bool useBigPixmaps = 0;
 class HackWidget : public QWidget
 {
 public:
    bool needsOk()
    { return (getWState() & WState_Reserved1 ); }
    QRect normalGeometry()
    { return topData()->normalGeometry; };
 };
 class QPEApplicationData
 {
 public:
    QPEApplicationData ( ) :
          presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
          notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
          keep_running( true ), qcopQok( false ),
          fontFamily( "Vera" ), fontSize( 10 ), smallIconSize( 14 ),
          bigIconSize( 32 ), qpe_main_widget( 0 )
    {
        Config cfg( "qpe" );
        cfg.setGroup( "Appearance" );
        useBigPixmaps = cfg.readBoolEntry( "useBigPixmaps", false );
        fontFamily = cfg.readEntry( "FontFamily", "Vera" );
        fontSize = cfg.readNumEntry( "FontSize", 10 );
        smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
        bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
 #ifdef OPIE_WITHROHFEEDBACK
        RoH = 0;
 #endif
    }
    int presstimer;
    QWidget* presswidget;
    QPoint presspos;
 #ifdef OPIE_WITHROHFEEDBACK
    Opie::Internal::RoHFeedback *RoH;
 #endif
    bool rightpressed : 1;
    bool kbgrabbed    : 1;
    bool notbusysent  : 1;
    bool preloaded    : 1;
    bool forceshow    : 1;
    bool nomaximize   : 1;
    bool keep_running : 1;
    bool qcopQok      : 1;
    QCString fontFamily;
    int fontSize;
    int smallIconSize;
    int bigIconSize;
    QString appName;
    struct QCopRec
    {
        QCopRec( const QCString &ch, const QCString &msg,
                 const QByteArray &d ) :
                channel( ch ), message( msg ), data( d )
        { }
        QCString channel;
        QCString message;
        QByteArray data;
    };
    QWidget* qpe_main_widget;
        QGuardedPtr<QWidget> lastraised;
    QQueue<QCopRec> qcopq;
        QString styleName;
    QString decorationName;
    void enqueueQCop( const QCString &ch, const QCString &msg,
                      const QByteArray &data )
    {
        qcopq.enqueue( new QCopRec( ch, msg, data ) );
    }
    void sendQCopQ()
    {
            if (!qcopQok )
                return;
        QCopRec * r;
           while((r=qcopq.dequeue())) {
               // remove from queue before sending...
               // event loop can come around again before getting
               // back from sendLocally
 #ifndef QT_NO_COP
               QCopChannel::sendLocally( r->channel, r->message, r->data );
 #endif
           delete r;
           }
    }
    static void show_mx(QWidget* mw, bool nomaximize, QString &strName) {
        if ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") )
        {
            ( (  QMainWindow* ) mw )->setUsesBigPixmaps( useBigPixmaps );
        }
        QPoint p;
        QSize s;
        bool max;
        if ( mw->isVisible() ) {
            if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
                mw->resize(s);
                mw->move(p);
            }
            mw->raise();
        } else {
            if ( mw->layout() && mw->inherits("QDialog") ) {
                if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
                    mw->resize(s);
                    mw->move(p);
                    if ( max && !nomaximize ) {
                        mw->showMaximized();
                    } else {
                        mw->show();
                    }
                } else {
                    QPEApplication::showDialog((QDialog*)mw,nomaximize);
                }
            } else {
                if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
                    mw->resize(s);
                    mw->move(p);
                } else {    //no stored rectangle, make an estimation
                    int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2;
                    int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2;
                    mw->move( QMAX(x,0), QMAX(y,0) );
 #ifdef Q_WS_QWS
                    if ( !nomaximize )
                        mw->showMaximized();
 #endif
                }
                if ( max && !nomaximize )
                    mw->showMaximized();
                else
                    mw->show();
            }
        }
    }
    static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
    {
    maximized = TRUE;
    // 350 is the trigger in qwsdefaultdecoration for providing a resize button
    if ( qApp->desktop()->width() <= 350 )
        return FALSE;
    Config cfg( "qpe" );
    cfg.setGroup("ApplicationPositions");
    QString str = cfg.readEntry( app, QString::null );
    QStringList l = QStringList::split(",", str);
    if ( l.count() == 5) {
        p.setX( l[0].toInt() );
        p.setY( l[1].toInt() );
        s.setWidth( l[2].toInt() );
        s.setHeight( l[3].toInt() );
        maximized = l[4].toInt();
        return TRUE;
    }
    return FALSE;
    }
        static bool validate_widget_size(const QWidget *w, QPoint &p, QSize &s)
    {
 #ifndef Q_WS_QWS
    QRect qt_maxWindowRect = qApp->desktop()->geometry();
 #endif
    int maxX = qt_maxWindowRect.width();
    int maxY = qt_maxWindowRect.height();
    int wWidth = s.width() + ( w->frameGeometry().width() - w->geometry().width() );
    int wHeight = s.height() + ( w->frameGeometry().height() - w->geometry().height() );
    // total window size is not allowed to be larger than desktop window size
    if ( ( wWidth >= maxX ) && ( wHeight >= maxY ) )
        return FALSE;
    if ( wWidth > maxX ) {
        s.setWidth( maxX - (w->frameGeometry().width() - w->geometry().width() ) );
        wWidth = maxX;
    }
    if ( wHeight > maxY ) {
        s.setHeight( maxY - (w->frameGeometry().height() - w->geometry().height() ) );
        wHeight = maxY;
    }
    // any smaller than this and the maximize/close/help buttons will be overlapping
    if ( wWidth < 80 || wHeight < 60 )
        return FALSE;
    if ( p.x() < 0 )
        p.setX(0);
    if ( p.y() < 0 )
        p.setY(0);
    if ( p.x() + wWidth > maxX )
        p.setX( maxX - wWidth );
    if ( p.y() + wHeight > maxY )
        p.setY( maxY - wHeight );
    return TRUE;
    }
    static void store_widget_rect(QWidget *w, QString &app)
    {
    // 350 is the trigger in qwsdefaultdecoration for providing a resize button
    if ( qApp->desktop()->width() <= 350 )
        return;
    // we use these to map the offset of geometry and pos.  ( we can only use normalGeometry to
    // get the non-maximized version, so we have to do it the hard way )
    int offsetX = w->x() - w->geometry().left();
    int offsetY = w->y() - w->geometry().top();
    QRect r;
    if ( w->isMaximized() )
        r = ( (HackWidget *) w)->normalGeometry();
    else
        r = w->geometry();
    // Stores the window placement as pos(), size()  (due to the offset mapping)
    Config cfg( "qpe" );
    cfg.setGroup("ApplicationPositions");
    QString s;
    s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() );
    cfg.writeEntry( app, s );
    }
    static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
    {
        /*
        // This works but disable it for now until it is safe to apply
        // What is does is scan the .desktop files of all the apps for
        // the applnk that has the corresponding argv[0] as this program
        // then it uses the name stored in the .desktop file as the caption
        // for the main widget. This saves duplicating translations for
        // the app name in the program and in the .desktop files.
        AppLnkSet apps( appsPath );
@@ -1099,594 +1098,555 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
                        return TRUE;
                    }
                    else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
                        QSignal s;
                        s.connect( active, SLOT( accept() ) );
                        s.activate();
                    }
                    else {
                        // do the same as with the select key: Map to the default action of the widget:
                        mapToDefaultAction( ke, Qt::Key_Return );
                    }
                }
            }
        }
        else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
            // Use special "select" key to do whatever default action a widget has
            mapToDefaultAction( ke, Qt::Key_Space );
        }
        else if ( ke->simpleData.keycode == Qt::Key_Escape &&
                  ke->simpleData.is_press ) {
            // Escape key closes app if focus on toplevel
            QWidget * active = activeWindow();
            if ( active && active->testWFlags( WType_TopLevel ) &&
                    ( int ) active->winId() == ke->simpleData.window &&
                    !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
                if ( active->inherits( "QDialog" ) ) {
                    HackDialog * d = ( HackDialog * ) active;
                    d->rejectIt();
                    return TRUE;
                } else /*if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 )*/ {
                active->close();
                }
            }
        }
        else if ( ke->simpleData.keycode >= Qt::Key_F1 && ke->simpleData.keycode <= Qt::Key_F29 ) {
            // this should be if ( ODevice::inst ( )-> buttonForKeycode ( ... ))
            // but we cannot access libopie function within libqpe :(
            QWidget * active = activeWindow ( );
            if ( active && ((int) active-> winId ( ) == ke-> simpleData.window )) {
                if ( d-> kbgrabbed ) { // we grabbed the keyboard
                    QChar ch ( ke-> simpleData.unicode );
                    QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease,
                                    ke-> simpleData.keycode,
                                    ch. latin1 ( ),
                                    ke-> simpleData.modifiers,
                                    QString ( ch ),
                                    ke-> simpleData.is_auto_repeat, 1 );
                    QObject *which = QWidget::keyboardGrabber ( );
                    if ( !which )
                        which = QApplication::focusWidget ( );
                    if ( !which )
                        which = QApplication::activeWindow ( );
                    if ( !which )
                        which = qApp;
                    QApplication::sendEvent ( which, &qke );
                }
                else { // we didn't grab the keyboard, so send the event to the launcher
                    QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
                    e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
                }
            }
            return true;
        }
    }
    if ( e->type == QWSEvent::Focus ) {
        QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
        if ( !fe->simpleData.get_focus ) {
            QWidget * active = activeWindow();
            while ( active && active->isPopup() ) {
                active->close();
                active = activeWindow();
            }
        }
        else {
            // make sure our modal widget is ALWAYS on top
            QWidget *topm = activeModalWidget();
            if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
                topm->raise();
            }
        }
        if ( fe->simpleData.get_focus && inputMethodDict ) {
            InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
            if ( m == AlwaysOff )
                Global::hideInputMethod();
            if ( m == AlwaysOn )
                Global::showInputMethod();
        }
    }
    return QApplication::qwsEventFilter( e );
 }
 #endif
 /*!
  Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
    ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
    // Need to delete QCopChannels early, since the display will
    // be gone by the time we get to ~QObject().
    delete sysChannel;
    delete pidChannel;
 #endif
 #ifdef OPIE_WITHROHFEEDBACK
    if( d->RoH )
      delete d->RoH;
 #endif
    delete d;
 }
 /*!
  Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
    QString base, dir;
    if (getenv( "OPIEDIR" ))
        base = QString(getenv("OPIEDIR")).stripWhiteSpace();
    if ( !base.isNull() && (base.length() > 0 )){
 #ifdef Q_OS_WIN32
        QString temp(base);
        if (temp[(int)temp.length()-1] != QDir::separator())
            temp.append(QDir::separator());
        dir = temp;
 #else
        dir = QString( base ) + "/";
 #endif
    }else{
        dir = QString( ".." ) + QDir::separator();
    }
    return dir;
 }
 /*!
  Returns the user's current Document directory. There is a trailing "/".
  .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
    const char* base = getenv( "HOME");
    if ( base )
        return QString( base ) + "/Documents";
    return QString( "../Documents" );
 }
 static int deforient = -1;
 /*!
  \internal
 */
 int QPEApplication::defaultRotation()
 {
    if ( deforient < 0 ) {
        QString d = getenv( "QWS_DISPLAY" );
        if ( d.contains( "Rot90" ) ) {
            deforient = 90;
        }
        else if ( d.contains( "Rot180" ) ) {
            deforient = 180;
        }
        else if ( d.contains( "Rot270" ) ) {
            deforient = 270;
        }
        else {
            deforient = 0;
        }
    }
    return deforient;
 }
 /*!
  \internal
 */
 void QPEApplication::setDefaultRotation( int r )
 {
    if ( qApp->type() == GuiServer ) {
        deforient = r;
        setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
        Config config("qpe");
        config.setGroup( "Rotation" );
        config.writeEntry( "Rot", r );
    }
    else {
 #ifndef QT_NO_COP
        { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
            e << r;
        }
 #endif
    }
 }
 #include <qgfx_qws.h>
 #include <qwindowsystem_qws.h>
 #if QT_VERSION > 236
 extern void qws_clearLoadedFonts();
 #endif
 void QPEApplication::setCurrentMode( int x, int y, int depth )
 {
    // Reset the caches
 #if QT_VERSION > 236
    qws_clearLoadedFonts();
 #endif
    QPixmapCache::clear();
    // Change the screen mode
    qt_screen->setMode(x, y, depth);
    if ( qApp->type() == GuiServer ) {
 #if QT_VERSION > 236
        // Reconfigure the GuiServer
        qwsServer->beginDisplayReconfigure();
        qwsServer->endDisplayReconfigure();
 #endif
        // Get all the running apps to reset
        QCopEnvelope env( "QPE/System", "reset()" );
    }
 }
 void QPEApplication::reset() {
    // Reconnect to the screen
    qt_screen->disconnect();
    qt_screen->connect( QString::null );
    // Redraw everything
    applyStyle();
 }
 #if (QT_VERSION < 238) && defined Q_OS_MACX
 bool qt_left_hand_scrollbars = false;
 #else
 extern bool qt_left_hand_scrollbars QPE_WEAK_SYMBOL;
 #endif
 /*!
  \internal
 */
 void QPEApplication::applyStyle()
 {
    Config config( "qpe" );
    config.setGroup( "Appearance" );
 #if QT_VERSION > 233
-#if !defined(OPIE_NO_OVERRIDE_QT)
-    // don't block ourselves ...
-    Opie::force_appearance = 0;
-    static QString appname = Opie::binaryName ( );
-    QStringList ex = config. readListEntry ( "NoStyle", ';' );
-    int nostyle = 0;
-    for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
-        if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
-            nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
-            break;
-        }
-    }
-#else
-        int nostyle = 0;
-#endif
    // Widget style
    QString style = config.readEntry( "Style", "FlatStyle" );
-    // don't set a custom style
-    if ( nostyle & Opie::Force_Style )
-        style = "FlatStyle";
    internalSetStyle ( style );
    // Colors - from /etc/colors/Liquid.scheme
    QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) );
    QColor btncolor( config.readEntry( "Button", "#96c8fa" ) );
    QPalette pal( btncolor, bgcolor );
    QString color = config.readEntry( "Highlight", "#73adef" );
    pal.setColor( QColorGroup::Highlight, QColor( color ) );
    color = config.readEntry( "HighlightedText", "#FFFFFF" );
    pal.setColor( QColorGroup::HighlightedText, QColor( color ) );
    color = config.readEntry( "Text", "#000000" );
    pal.setColor( QColorGroup::Text, QColor( color ) );
    color = config.readEntry( "ButtonText", "#000000" );
    pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) );
    color = config.readEntry( "Base", "#FFFFFF" );
    pal.setColor( QColorGroup::Base, QColor( color ) );
    pal.setColor( QPalette::Disabled, QColorGroup::Text,
                  pal.color( QPalette::Active, QColorGroup::Background ).dark() );
    setPalette( pal, TRUE );
        // Set the ScrollBar on the 'right' side but only if the weak symbol is present
        if (&qt_left_hand_scrollbars )
            qt_left_hand_scrollbars = config.readBoolEntry( "LeftHand", false );
    // Window Decoration
    QString dec = config.readEntry( "Decoration", "Flat" );
-    // don't set a custom deco
-    if ( nostyle & Opie::Force_Decoration )
-        dec = "";
    if ( dec != d->decorationName ) {
        qwsSetDecoration( new QPEDecoration( dec ) );
        d->decorationName = dec;
    }
    // Font
    QString ff = config.readEntry( "FontFamily", font().family() );
    int fs = config.readNumEntry( "FontSize", font().pointSize() );
-    // don't set a custom font
-    if ( nostyle & Opie::Force_Font ) {
-        ff = "Vera";
-        fs = 10;
-    }
    setFont ( QFont ( ff, fs ), true );
-#if !defined(OPIE_NO_OVERRIDE_QT)
-    // revert to global blocking policy ...
-    Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
-    Opie::force_appearance &= ~nostyle;
-#endif
 #endif
 }
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
    QDataStream stream( data, IO_ReadOnly );
    if ( msg == "applyStyle()" ) {
        applyStyle();
    }
    else if ( msg == "toggleApplicationMenu()" ) {
        QWidget *active = activeWindow ( );
        if ( active ) {
            QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( );
            bool oldactive = man-> isActive ( );
            man-> setActive( !man-> isActive() );
            if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
                QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
            }
        }
    }
    else if ( msg == "setDefaultRotation(int)" ) {
        if ( type() == GuiServer ) {
            int r;
            stream >> r;
            setDefaultRotation( r );
        }
    }
    else if ( msg == "setCurrentMode(int,int,int)" ) { // Added: 2003-06-11 by Tim Ansell <mithro@mithis.net>
            if ( type() == GuiServer ) {
        int x, y, depth;
        stream >> x;
        stream >> y;
        stream >> depth;
        setCurrentMode( x, y, depth );
            }
     }
    else if ( msg == "reset()" ) {
            if ( type() != GuiServer )
                reset();
    }
    else if ( msg == "setCurrentRotation(int)" ) {
        int r;
        stream >> r;
        setCurrentRotation( r );
     }
    else if ( msg == "shutdown()" ) {
        if ( type() == GuiServer )
            shutdown();
    }
    else if ( msg == "quit()" ) {
        if ( type() != GuiServer )
            tryQuit();
    }
    else if ( msg == "forceQuit()" ) {
        if ( type() != GuiServer )
            quit();
    }
    else if ( msg == "restart()" ) {
        if ( type() == GuiServer )
            restart();
    }
    else if ( msg == "language(QString)" ) {
        if ( type() == GuiServer ) {
            QString l;
            stream >> l;
            QString cl = getenv( "LANG" );
            if ( cl != l ) {
                if ( l.isNull() )
                    unsetenv( "LANG" );
                else
                    setenv( "LANG", l.latin1(), 1 );
                restart();
            }
        }
    }
    else if ( msg == "timeChange(QString)" ) {
        QString t;
        stream >> t;
        if ( t.isNull() )
            unsetenv( "TZ" );
        else
            setenv( "TZ", t.latin1(), 1 );
        // emit the signal so everyone else knows...
        emit timeChanged();
    }
    else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
        if ( type() == GuiServer ) {
            QDateTime when;
            QCString channel, message;
            int data;
            stream >> when >> channel >> message >> data;
            AlarmServer::addAlarm( when, channel, message, data );
        }
    }
    else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
        if ( type() == GuiServer ) {
            QDateTime when;
            QCString channel, message;
            int data;
            stream >> when >> channel >> message >> data;
            AlarmServer::deleteAlarm( when, channel, message, data );
        }
    }
    else if ( msg == "clockChange(bool)" ) {
        int tmp;
        stream >> tmp;
        emit clockChanged( tmp );
    }
    else if ( msg == "weekChange(bool)" ) {
        int tmp;
        stream >> tmp;
        emit weekChanged( tmp );
    }
    else if ( msg == "setDateFormat(DateFormat)" ) {
        DateFormat tmp;
        stream >> tmp;
        emit dateFormatChanged( tmp );
    }
    else if ( msg == "setVolume(int,int)" ) {
        int t, v;
        stream >> t >> v;
        setVolume( t, v );
        emit volumeChanged( muted );
    }
    else if ( msg == "volumeChange(bool)" ) {
        stream >> muted;
        setVolume();
        emit volumeChanged( muted );
    }
    else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
        int t, v;
        stream >> t >> v;
        setMic( t, v );
        emit micChanged( micMuted );
    }
    else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
        stream >> micMuted;
        setMic();
        emit micChanged( micMuted );
    }
    else if ( msg == "setBass(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
        int t, v;
        stream >> t >> v;
        setBass( t, v );
    }
    else if ( msg == "bassChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
            setBass();
    }
        else if ( msg == "setTreble(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
        int t, v;
        stream >> t >> v;
        setTreble( t, v );
    }
    else if ( msg == "trebleChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
            setTreble();
    } else if ( msg == "getMarkedText()" ) {
    if ( type() == GuiServer ) {
        const ushort unicode = 'C'-'@';
        const int scan = Key_C;
        qwsServer->processKeyEvent( unicode, scan, ControlButton, TRUE, FALSE );
        qwsServer->processKeyEvent( unicode, scan, ControlButton, FALSE, FALSE );
    }
    } else if ( msg == "newChannel(QString)") {
    QString myChannel = "QPE/Application/" + d->appName;
    QString channel;
    stream >> channel;
    if (channel == myChannel) {
        processQCopFile();
        d->sendQCopQ();
    }
    }
 #endif
 }
 /*!
  \internal
 */
 bool QPEApplication::raiseAppropriateWindow()
 {
    bool r=FALSE;
    // 1. Raise the main widget
    QWidget *top = d->qpe_main_widget;
    if ( !top ) top = mainWidget();
    if ( top && d->keep_running ) {
    if ( top->isVisible() )
        r = TRUE;
    else if (d->preloaded) {
        // We are preloaded and not visible.. pretend we just started..
 #ifndef QT_NO_COP
        QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
        e << d->appName;
 #endif
    }
    d->show_mx(top,d->nomaximize, d->appName);
    top->raise();
    }
    QWidget *topm = activeModalWidget();
    // 2. Raise any parentless widgets (except top and topm, as they
    //     are raised before and after this loop).  Order from most
    //     recently raised as deepest to least recently as top, so
    //     that repeated calls cycle through widgets.
    QWidgetList *list = topLevelWidgets();
    if ( list ) {
    bool foundlast = FALSE;
    QWidget* topsub = 0;
    if ( d->lastraised ) {
        for (QWidget* w = list->first(); w; w = list->next()) {
        if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
            if ( w == d->lastraised )
            foundlast = TRUE;
            if ( foundlast ) {
            w->raise();
            topsub = w;
            }
        }
        }
    }
    for (QWidget* w = list->first(); w; w = list->next()) {
        if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
        if ( w == d->lastraised )
            break;
        w->raise();
        topsub = w;
        }
    }
    d->lastraised = topsub;
    delete list;
    }
    // 3. Raise the active modal widget.
    if ( topm ) {
    topm->show();
    topm->raise();
    // If we haven't already handled the fastAppShowing message
    if (!top && d->preloaded) {
 #ifndef QT_NO_COP
        QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
        e << d->appName;
 #endif
    }
    r = FALSE;
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 849d5b3..167fe69 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -1,244 +1,239 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __QPE_APPLICATION_H__
 #define __QPE_APPLICATION_H__
 #include <stdlib.h> // for setenv()
 #include <qglobal.h>
 #include <qapplication.h>
 #include <qdialog.h>
 #include <qwsdisplay_qws.h>
 #if defined(_WS_QWS_) && !defined(Q_WS_QWS)
 #define Q_WS_QWS
 #endif
 #include "qpedecoration_qws.h"
 #include "timestring.h"
 #include "qpeglobal.h"
 class QCopChannel;
 class QPEApplicationData;
 class QWSEvent;
 class QWSKeyEvent;
 /**
  \brief The QPEApplication class implements various system services
    that are available to all Qtopia applications.
  Simply by using QPEApplication instead of QApplication, a standard Qt
  application becomes a Qtopia application. It automatically follows
  style changes, quits and raises, and in the
  case of \link docwidget.html document-oriented\endlink applications,
  changes the currently displayed document in response to the environment.
  To create a \link docwidget.html document-oriented\endlink
  application use showMainDocumentWidget(); to create a
  non-document-oriented application use showMainWidget(). The
  keepRunning() function indicates whether the application will
  continue running after it's processed the last \link qcop.html
  QCop\endlink message. This can be changed using setKeepRunning().
  A variety of signals are emitted when certain events occur, for
  example, timeChanged(), clockChanged(), weekChanged(),
  dateFormatChanged() and volumeChanged(). If the application receives
  a \link qcop.html QCop\endlink message on the application's
  QPE/Application/\e{appname} channel, the appMessage() signal is
  emitted. There are also flush() and reload() signals, which
  are emitted when synching begins and ends respectively - upon these
  signals, the application should save and reload any data
  files that are involved in synching. Most of these signals will initially
  be received and unfiltered through the appMessage() signal.
  This class also provides a set of useful static functions. The
  qpeDir() and documentDir() functions return the respective paths.
  The grabKeyboard() and ungrabKeyboard() functions are used to
  control whether the application takes control of the device's
  physical buttons (e.g. application launch keys). The stylus' mode of
  operation is set with setStylusOperation() and retrieved with
  stylusOperation(). There are also setInputMethodHint() and
  inputMethodHint() functions.
  \ingroup qtopiaemb
 */
 class QPEApplication : public QApplication
 {
    Q_OBJECT
 public:
    QPEApplication( int& argc, char **argv, Type=GuiClient );
    ~QPEApplication();
    static QString qpeDir();
    static QString documentDir();
    void applyStyle();
    void reset();
    static int defaultRotation();
    static void setDefaultRotation(int r);
    static void setCurrentRotation(int r);
    static void setCurrentMode(int x, int y, int depth );
    static void grabKeyboard();
    static void ungrabKeyboard();
    enum StylusMode {
        LeftOnly,
        RightOnHold
        // RightOnHoldLeftDelayed, etc.
    };
    static void setStylusOperation( QWidget*, StylusMode );
    static StylusMode stylusOperation( QWidget* );
    enum InputMethodHint {
        Normal,
        AlwaysOff,
        AlwaysOn
    };
    enum screenSaverHint {
        Disable = 0,
        DisableLightOff = 1,
        DisableSuspend = 2,
        Enable = 100
    };
    static void setInputMethodHint( QWidget *, InputMethodHint );
    static InputMethodHint inputMethodHint( QWidget * );
    void showMainWidget( QWidget*, bool nomax=FALSE );
    void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
    static void showDialog( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
    static int execDialog ( QDialog*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
    static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
    /* Merge setTempScreenSaverMode */
 #ifdef QTOPIA_INTERNAL_INITAPP
    void initApp( int argv, char **argv );
 #endif
    static void setKeepRunning();
    bool keepRunning() const;
    bool keyboardGrabbed() const;
    int exec();
 signals:
    void clientMoused();
    void timeChanged();
    void clockChanged( bool pm );
    void micChanged( bool muted );
    void volumeChanged( bool muted );
    void appMessage( const QCString& msg, const QByteArray& data);
    void weekChanged( bool startOnMonday );
    void dateFormatChanged( DateFormat );
    void flush();
    void reload();
    /* linkChanged signal */
 private slots:
    void systemMessage( const QCString &msg, const QByteArray &data );
    void pidMessage( const QCString &msg, const QByteArray &data );
    void removeSenderFromStylusDict();
    void hideOrQuit();
 protected:
    bool qwsEventFilter( QWSEvent * );
    void internalSetStyle( const QString &style );
    void prepareForTermination(bool willrestart);
    virtual void restart();
    virtual void shutdown();
    bool eventFilter( QObject *, QEvent * );
    void timerEvent( QTimerEvent * );
    bool raiseAppropriateWindow();
    virtual void tryQuit();
-#ifndef OPIE_NO_ERASE_RECT_HACKFIX
-    #if QT_VERSION > 233
-    virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
-    #endif
-#endif
 private:
    void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
    void processQCopFile();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
    QCopChannel *sysChannel;
    QCopChannel *pidChannel;
 #endif
    QPEApplicationData *d;
    bool reserved_sh;
 };
 enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
 inline int TransToDeg ( Transformation t )
 {
    int d = static_cast<int>( t );
    return d * 90;
 }
 inline Transformation DegToTrans ( int d )
 {
    Transformation t = static_cast<Transformation>( d / 90 );
    return t;
 }
 /*
 * Set current rotation of Opie, and rotation for newly started apps.
 * Differs from setDefaultRotation in that 1) it rotates currently running apps,
 * and 2) does not set deforient or save orientation to qpe.conf.
 */
 inline void QPEApplication::setCurrentRotation( int r )
 {
    // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots
    // for compatibility with the SharpROM use fallback to setDefaultTransformation()
 #if QT_VERSION > 233
    Transformation e = DegToTrans( r );
    ::setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
    qApp->desktop()->qwsDisplay()->setTransformation( e );
 #else
    setDefaultRotation( r );
 #endif
 }
 /*
 * Qtopia 1.7 SDK compatibility macros
 * FIXME: Support Opie Quicklaunch Interface
 */
        #define QTOPIA_ADD_APPLICATION(NAME,IMPLEMENTATION)             \
                int main( int argc, char** argv )                       \
                {                                                       \
                        QPEApplication app = QPEApplication( argc, argv );\
                        IMPLEMENTATION* mw = new IMPLEMENTATION();      \
                        app.showMainWidget( mw );                       \
                        app.exec();                                     \
        }
 #define QTOPIA_MAIN // Bee-Bop-Alula
 /*
 * -remove me
 */ 
 #ifdef Q_WS_QWS
 extern Q_EXPORT QRect qt_maxWindowRect;
 #endif
 #endif
diff --git a/library/qt_override.cpp b/library/qt_override.cpp
deleted file mode 100644
index a0d753b..0000000
--- a/library/qt_override.cpp
+++ b/dev/null
@@ -1,170 +0,0 @@
-#include <qpe/qpeapplication.h>
-#include <qfontdatabase.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-#include <sys/param.h> // for toolchains with old libc headers
-#include <qtopia/qpeglobal.h>
-#include "qt_override_p.h"
-#if QT_VERSION > 233
-#ifndef OPIE_NO_ERASE_RECT_HACKFIX
-struct color_fix_t {
-        char *m_app;
-        char *m_class;
-        char *m_name;
-        QColorGroup::ColorRole m_set;
-        QColorGroup::ColorRole m_get;
-};
-static const color_fix_t apps_that_need_special_colors [] = {
-        { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base },
-        { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base },
-        { 0, 0, 0, QColorGroup::Base, QColorGroup::Base }
-};
-#endif
-#ifndef OPIE_NO_OVERRIDE_QT
-static const char * const apps_that_need_pointsizes_times_10 [] = {
-        "HancomMobileWord",
-        "hancomsheet",
-        "HancomPresenterViewer",
-        0
-};
-int Opie::force_appearance = 0;
-// Return the *real* name of the binary - not just a quick guess
-// by looking at argv [0] (which could be anything)
-static void binaryNameFree ( )
-{
-        ::free ((void *) Opie::binaryName ( )); // we need to cast away the const here
-}
-const char *Opie::binaryName ( )
-{
-        static const char *appname = 0;
-        if ( !appname ) {
-                char dst [PATH_MAX + 1];
-                int l = ::readlink ( "/proc/self/exe", dst, PATH_MAX );
-                if ( l <= 0 )
-                        l = 0;
-                dst [l] = 0;
-                const char *b = ::strrchr ( dst, '/' );
-                appname = ::strdup ( b ? b + 1 : dst );
-                ::atexit ( binaryNameFree );
-        }
-        return appname;
-}
-#else
-int Opie::force_appearance = 0;
-#endif
-// Fix for a toolchain incompatibility (binaries compiled with
-// old tcs using shared libs compiled with newer tcs)
-extern "C" {
-extern void __gmon_start__ ( ) QPE_WEAK_SYMBOL;
-extern void __gmon_start__ ( )
-{
-}
-}
-#ifndef OPIE_NO_ERASE_RECT_HACKFIX
-// Fix for apps, that use QPainter::eraseRect() which doesn't work with styles
-// that set a background pixmap (it would be easier to fix eraseRect(), but
-// TT made it an inline ...)
-void QPEApplication::polish ( QWidget *w )
-{
-#ifndef OPIE_NO_OVERRIDE_QT
-        for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) {
-                if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) &&
-                    ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) &&
-                    ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) {
-                        QPalette pal = w-> palette ( );
-                        pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get ));
-                        w-> setPalette ( pal );
-                }
-        }
-#endif
-        QApplication::polish ( w );
-}
-#endif
-#ifndef OPIE_NO_OVERRIDE_QT
-// Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes
-// were multiplied by 10 (which was incorrect)
-QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset )
-{
-        QValueList <int> sl = pointSizes_NonWeak ( family, style, charset );
-        for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) {
-                if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) {
-                        for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
-                                *it *= 10;
-                }
-        }
-        return sl;
-}
-// Various style/font/color related overrides for weak symbols in Qt/E,
-// which allows us to force the usage of the global Opie appearance.
-void QApplication::setStyle ( QStyle *style )
-{
-        if ( Opie::force_appearance & Opie::Force_Style )
-                delete style;
-        else
-                QApplication::setStyle_NonWeak ( style );
-}
-void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const char *className )
-{
-        if (!( Opie::force_appearance & Opie::Force_Style ))
-                QApplication::setPalette_NonWeak ( pal, informWidgets, className );
-}
-void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *className )
-{
-        if (!( Opie::force_appearance & Opie::Force_Font ))
-                QApplication::setFont_NonWeak ( fnt, informWidgets, className );
-}
-void QApplication::qwsSetDecoration ( QWSDecoration *deco )
-{
-        if ( Opie::force_appearance & Opie::Force_Decoration )
-                delete deco;
-        else
-                QApplication::qwsSetDecoration_NonWeak ( deco );
-}
-#endif
-#endif
diff --git a/library/qt_override_p.h b/library/qt_override_p.h
deleted file mode 100644
index cb05d15..0000000
--- a/library/qt_override_p.h
+++ b/dev/null
@@ -1,25 +0,0 @@
-#ifndef __QT_OVERRIDE_H__
-#define __QT_OVERRIDE_H__
-#if QT_VERSION > 233
-namespace Opie {
-enum ForceAppearance {
-        Force_Style      = 0x01,
-        Force_Font       = 0x02,
-        Force_Decoration = 0x04,
-        Force_All        = 0xff,
-        Force_None       = 0x00,
-};
-extern const char *binaryName ( );
-extern int force_appearance;
-}
-#endif // (QT_VERSION >233)
-#endif
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 088171c..d649ed6 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -40,853 +40,653 @@
 #include <opie2/ofiledialog.h>
 #include <opie2/otabwidget.h>
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpestyle.h>
 #include <qpe/lightstyle.h>
 #include <qpe/styleinterface.h>
 /* QT */
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #endif
 #include <qtoolbutton.h>
 #include <qwindowsstyle.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qwhatsthis.h>
 using namespace Opie;
 using namespace Opie::Ui;
 using namespace Opie::Core;
 class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
    DefaultWindowDecoration() : ref(0) {}
    QString name() const
    {
        return "Default";
    }
    QPixmap icon() const
    {
        return QPixmap();
    }
    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface )
    {
        *iface = 0;
        if ( uuid == IID_QUnknown )
            *iface = this;
        else if ( uuid == IID_WindowDecoration )
            *iface = this;
        if ( *iface )
            (*iface)->addRef();
        return QS_OK;
    }
    Q_REFCOUNT
 private:
    ulong ref;
 };
 QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
 {
    QWidget* tab = new QWidget( parent, "StyleTab" );
    QVBoxLayout* vertLayout = new QVBoxLayout( tab, 3, 3 );
    m_style_list = new QListBox( tab, "m_style_list" );
    vertLayout->addWidget( m_style_list );
    QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) );
    m_style_settings = new QPushButton ( tr( "Settings..." ), tab );
    connect ( m_style_settings, SIGNAL( clicked()), this, SLOT( styleSettingsClicked()));
    vertLayout-> addWidget ( m_style_settings );
    QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote:  This option is not available for all styles." ) );
    QString s = cfg. readEntry ( "Style", "Light" );
 #if QT_VERSION >= 0x030000
    m_style_list->insertStringList(QStyleFactory::styles());
 #else
    m_style_list-> insertItem ( new StyleListItem ( "Windows", new QWindowsStyle ( )));
    m_style_list-> insertItem ( new StyleListItem ( "Light", new LightStyle ( )));
    m_style_list-> insertItem ( new StyleListItem ( "QPE", new QPEStyle ( )));
 #endif
    {
        QString path = QPEApplication::qpeDir ( );
        path.append( "/plugins/styles/" );
        QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
        for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
        {
            QString libstr = path;
            libstr.append( "/" );
            libstr.append( *it );
            QLibrary *lib = new QLibrary ( libstr );
            StyleInterface *iface;
            if (( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) && iface )
            {
                StyleListItem *slit = new StyleListItem ( lib, iface );
                m_style_list-> insertItem ( slit );
                if ( slit-> key ( ) == s )
                    m_style_list-> setCurrentItem ( slit );
            }
            else
                delete lib;
        }
    }
    m_original_style = m_style_list-> currentItem ( );
    styleClicked ( m_original_style );
    connect( m_style_list, SIGNAL( highlighted(int) ), this, SLOT( styleClicked(int) ) );
    return tab;
 }
 QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
 {
    QWidget* tab = new QWidget( parent, "DecoTab" );
    QVBoxLayout* vertLayout = new QVBoxLayout( tab, 3, 3 );
    m_deco_list = new QListBox( tab, "m_deco_list" );
    vertLayout->addWidget( m_deco_list );
    QWhatsThis::add( m_deco_list, tr( "Window decorations control the way the application title bar and its buttons appear.\n\nClick here to select an available decoration." ) );
    QString s = cfg. readEntry ( "Decoration", "libflat.so" );
    m_deco_list-> insertItem ( new DecoListItem ( "QPE" ));
    {
        QString path = QPEApplication::qpeDir();
        path.append( "/plugins/decorations/" );
        QStringList sl = QDir ( path, "lib*.so" ). entryList ( );
        for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
        {
            QString libstr = path;
            libstr.append( "/" );
            libstr.append( *it );
            QLibrary *lib = new QLibrary ( libstr );
            WindowDecorationInterface *iface;
            if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK )
            {
                DecoListItem *dlit = new DecoListItem ( lib, iface );
                m_deco_list-> insertItem ( dlit );
                if ( dlit-> key ( ) == s )
                    m_deco_list-> setCurrentItem ( dlit );
            }
            else
                delete lib;
        }
    }
    m_original_deco = m_deco_list-> currentItem ( );
    if ( m_deco_list-> currentItem  ( ) < 0 )
        m_deco_list-> setCurrentItem ( 0 );
    decoClicked ( m_original_deco );
    connect( m_deco_list, SIGNAL( highlighted(int) ), this, SLOT( decoClicked(int) ) );
    return tab;
 }
 QWidget *Appearance::createFontTab ( QWidget *parent, Config &cfg )
 {
    QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
    QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
    int size = cfg. readNumEntry ( "FontSize", 10 );
    m_fontselect = new OFontSelector ( false, parent, "FontTab" );
    m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
    QWhatsThis::add( m_fontselect, tr( "Select the desired name, style and size of the default font applications will use." ) );
    connect( m_fontselect, SIGNAL( fontSelected(const QFont&)),
             this, SLOT( fontClicked(const QFont&)));
    return m_fontselect;
 }
 QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
 {
    QWidget *tab = new QWidget( parent, "ColorTab" );
    QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 3, 3 );
    gridLayout->setRowStretch ( 3, 10 );
    m_color_list = new QListBox ( tab );
    gridLayout->addMultiCellWidget ( m_color_list, 0, 3, 0, 0 );
    connect( m_color_list, SIGNAL( highlighted(int) ), this, SLOT( colorClicked(int) ) );
    QWhatsThis::add( m_color_list, tr( "Color schemes are a collection of colors which are used for various parts of the display.\n\nClick here to select an available scheme." ) );
    m_color_list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), cfg ));
    QString path = QPEApplication::qpeDir ( );
    path.append( "/etc/colors/" );
    QStringList sl = QDir ( path ). entryList ( "*.scheme" );
    for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
    {
        QString name = (*it). left ((*it). find ( ".scheme" ));
        QString pathstr = path;
        pathstr.append( *it );
        Config config ( pathstr, Config::File );
        config. setGroup ( "Colors" );
        m_color_list-> insertItem ( new ColorListItem ( name, config ));
    }
    m_color_list-> setCurrentItem ( 0 );
    QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" );
    tempButton->setText( tr( "Edit..." ) );
    connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) );
    gridLayout->addWidget( tempButton, 0, 1 );
    QWhatsThis::add( tempButton, tr( "Click here to change the colors in the current color scheme." ) );
    tempButton = new QPushButton( tab, "deleteSchemeButton" );
    tempButton->setText( tr( "Delete" ) );
    connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) );
    gridLayout->addWidget( tempButton, 1, 1 );
    QWhatsThis::add( tempButton, tr( "Click here to delete the color scheme selected in the list to the left." ) );
    tempButton = new QPushButton( tab, "saveSchemeButton" );
    tempButton->setText( tr( "Save" ) );
    connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) );
    gridLayout->addWidget( tempButton, 2, 1 );
    QWhatsThis::add( tempButton, tr( "Click here to name and save the current color scheme." ) );
    return tab;
 }
 QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 {
    QWidget *tab = new QWidget ( parent );
    QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
-    QGridLayout *lay = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
-    m_force = new QCheckBox ( tr( "Force styling for all applications." ), tab );
-    m_force-> setChecked ( cfg. readBoolEntry ( "ForceStyle" ));
-    lay-> addMultiCellWidget ( m_force, 0, 0, 0, 1 );
-    QWhatsThis::add( m_force, tr( "Click here to allow all applications to use global appearance settings." ) );
-    QLabel *l = new QLabel ( tab );
-    l-> setText ( QString ( "<p>%1</p>" ). arg ( tr( "Disable styling for these applications ( <b>*</b> can be used as a wildcard):" )));
-    lay-> addMultiCellWidget ( l, 1, 1, 0, 1 );
-    QWhatsThis::add( l, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
-    m_except = new QListView ( tab );
-    m_except-> addColumn ( Resource::loadIconSet ( "appearance" ), "", 24 );
-    m_except-> addColumn ( Resource::loadIconSet ( "font" ), "", 24 );
-    m_except-> addColumn ( Resource::loadIconSet ( "appearance/deco" ), "", 24 );
-    m_except-> addColumn ( tr( "Binary file(s)" ));
-    m_except-> setColumnAlignment ( 0, AlignCenter );
-    m_except-> setColumnAlignment ( 1, AlignCenter );
-    m_except-> setColumnAlignment ( 2, AlignCenter );
-    m_except-> setAllColumnsShowFocus ( true );
-    m_except-> setMinimumHeight ( 30 );
-    m_except-> header ( )-> setClickEnabled ( false );
-    m_except-> header ( )-> setResizeEnabled ( false );
-    m_except-> header ( )-> setMovingEnabled ( false );
-    m_except-> setSorting ( -1 );
-    lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 );
-    QWhatsThis::add( m_except, tr( "If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.\n\nThis area allows you to select an application and which settings you wish to disable." ) );
-    connect ( m_except, SIGNAL( clicked(QListViewItem*,const QPoint&,int)), this, SLOT( clickedExcept(QListViewItem*,const QPoint&,int)));
-    QToolButton *tb = new QToolButton ( tab );
-    tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
-    tb-> setFocusPolicy ( QWidget::StrongFocus );
-    lay-> addWidget ( tb, 2, 1 );
-    connect ( tb, SIGNAL( clicked()), this, SLOT( addExcept()));
-    QWhatsThis::add( tb, tr( "Click here to add an application to the list above." ) );
-    tb = new QToolButton ( tab );
-    tb-> setIconSet ( Resource::loadIconSet ( "editdelete" ));
-    tb-> setFocusPolicy ( QWidget::StrongFocus );
-    lay-> addWidget ( tb, 3, 1 );
-    connect ( tb, SIGNAL( clicked()), this, SLOT( delExcept()));
-    QWhatsThis::add( tb, tr( "Click here to delete the currently selected application." ) );
-    tb = new QToolButton ( tab );
-    tb-> setIconSet ( Resource::loadIconSet ( "up" ));
-    tb-> setFocusPolicy ( QWidget::StrongFocus );
-    lay-> addWidget ( tb, 4, 1 );
-    connect ( tb, SIGNAL( clicked()), this, SLOT( upExcept()));
-    QWhatsThis::add( tb, tr( "Click here to move the currently selected application up in the list." ) );
-    tb = new QToolButton ( tab );
-    tb-> setIconSet ( Resource::loadIconSet ( "down" ));
-    tb-> setFocusPolicy ( QWidget::StrongFocus );
-    lay-> addWidget ( tb, 5, 1 );
-    connect ( tb, SIGNAL( clicked()), this, SLOT( downExcept()));
-    QWhatsThis::add( tb, tr( "Click here to move the currently selected application down in the list." ) );
-    lay-> setRowStretch ( 6, 10 );
-    lay-> setColStretch ( 0, 10 );
-    QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
-    QListViewItem *lvit = 0;
-    for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
-    {
-        int fl = ( *it ). left ( 1 ). toInt ( 0, 32 );
-        lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
-    }
-    vertLayout-> addSpacing ( 3 );
-    QFrame *f = new QFrame ( tab );
-    f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
-    vertLayout-> addWidget ( f );
-    vertLayout-> addSpacing ( 3 );
    QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
    int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
    bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
    QLabel* label = new QLabel( tr( "Tab style:" ), tab );
    gridLayout-> addWidget ( label, 0, 0 );
    QWhatsThis::add( label, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
    QButtonGroup* btngrp = new QButtonGroup( tab, "buttongroup" );
    btngrp-> hide ( );
    btngrp-> setExclusive ( true );
    m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" );
    m_tabstyle_list-> insertItem ( tr( "Tabs" ));
    m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" ));
    m_tabstyle_list-> insertItem ( tr( "Drop down list" ));
    m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" ));
    m_tabstyle_list-> setCurrentItem ( style );
    gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 );
    QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
    m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
    btngrp-> insert ( m_tabstyle_top );
    gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
    QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
    m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
    btngrp-> insert ( m_tabstyle_bottom );
    gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
    QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
    m_tabstyle_top-> setChecked ( tabtop );
    m_tabstyle_bottom-> setChecked ( !tabtop );
    m_original_tabstyle = style;
    m_original_tabpos = tabtop;
    vertLayout-> addSpacing ( 3 );
    QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
    QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
    m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
    QPixmap cw1 = Resource::loadIconSet("redo"). pixmap( );
    m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
    QImage ccwImage = cw1. convertToImage( ). mirror( 1, 0 );
    QPixmap ccw1;
    m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
    QPixmap flip1 = Resource::loadIconSet("pass"). pixmap( );
    QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
    rotbtngrp-> hide ( );
    rotbtngrp-> setExclusive ( true );
    rotbtngrp-> insert ( m_rotdir_cw );
    rotbtngrp-> insert ( m_rotdir_ccw );
    rotbtngrp-> insert ( m_rotdir_flip );
    ccw1. convertFromImage( ccwImage );
    m_rotdir_cw-> setPixmap( cw1 );
    m_rotdir_ccw-> setPixmap( ccw1 );
    m_rotdir_flip-> setPixmap( flip1 );
    rotLay-> addWidget ( rotlabel, 0 );
    rotLay-> addWidget ( m_rotdir_cw, 0 );
    rotLay-> addWidget ( m_rotdir_ccw, 0 );
    rotLay-> addWidget ( m_rotdir_flip, 0 );
    int rotDirection = cfg.readNumEntry( "rotatedir" );
    ODirection rot = CW;
    if (rotDirection == -1)
    {
        rot = ODevice::inst ( )-> direction ( );
    }
    else
    {
        rot = (ODirection)rotDirection;
    }
    m_rotdir_cw-> setChecked ( rot == CW );
    m_rotdir_ccw-> setChecked ( rot == CCW );
    m_rotdir_flip-> setChecked ( rot == Flip );
+    /*
+     * add a spacing
+     */
+    vertLayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::MinimumExpanding,  QSizePolicy::MinimumExpanding ) );
    return tab;
 }
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
        : QDialog ( parent, name, true, WStyle_ContextHelp )
 {
    setCaption( tr( "Appearance Settings" ) );
    Config config( "qpe" );
    config.setGroup( "Appearance" );
    QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
    m_sample = new SampleWindow ( this );
    m_sample-> setDecoration ( new DefaultWindowDecoration ( ) );
    QWhatsThis::add( m_sample, tr( "This is a preview window.  Look here to see your new appearance as options are changed." ) );
    OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
    QWidget *styletab;
    m_color_list = 0;
    tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
    tw-> addTab ( createFontTab ( tw, config ), "font", tr( "Font" ));
    tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) );
    tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) );
    tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) );
    top-> addWidget ( tw, 10 );
    top-> addWidget ( m_sample, 1 );
    tw-> setCurrentTab ( styletab );
    connect ( tw, SIGNAL( currentChanged(QWidget*)), this, SLOT( tabChanged(QWidget*)));
    m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false;
 }
 Appearance::~Appearance()
 {}
 void Appearance::tabChanged ( QWidget *w )
 {
    if ( w == m_advtab )
    {
        m_sample-> hide ( );
        updateGeometry ( ); // shouldn't be necessary ...
    }
    else
        m_sample-> show ( );
 }
 void Appearance::accept ( )
 {
    bool newtabpos = m_tabstyle_top-> isChecked ( );
    int newtabstyle = m_tabstyle_list-> currentItem ( );
    Config config ( "qpe" );
    config. setGroup ( "Appearance" );
    if ( m_style_changed )
    {
        StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
        if ( item )
            config.writeEntry( "Style", item-> key ( ));
    }
    if ( m_deco_changed )
    {
        DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( ));
        if ( item )
            config.writeEntry( "Decoration", item-> key ( ));
    }
    if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos ))
    {
        config. writeEntry ( "TabStyle", newtabstyle + 1 );
        config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" );
    }
    if ( m_font_changed )
    {
        config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( ));
        config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( ));
        config. writeEntry ( "FontSize", m_fontselect-> fontSize ( ));
    }
    if ( m_color_changed )
    {
        ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
        if ( item )
            item-> save ( config );
    }
    ODirection rot;
    if (m_rotdir_ccw-> isChecked ( ))
    {
        rot = CCW;
    }
    else if (m_rotdir_cw-> isChecked ( ))
    {
        rot = CW;
    }
    else
    {
        rot = Flip;
    }
    config. writeEntry ( "rotatedir", (int)rot );
-    m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
-    QStringList sl;
-    QString exceptstr;
-    for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( ))
-    {
-        int fl = 0;
-        fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
-        fl |= ( it-> noFont ( ) ? 0x02 : 0 );
-        fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
-        exceptstr = QString::number ( fl, 32 );
-        exceptstr.append( it-> pattern ( ));
-        sl << exceptstr;
-    }
-    config. writeEntry ( "NoStyle", sl, ';' );
-    config. writeEntry ( "ForceStyle", m_force-> isChecked ( ));
    config. write ( ); // need to flush the config info first
    Global::applyStyle ( );
    QDialog::accept ( );
 }
 void Appearance::done ( int r )
 {
    QDialog::done ( r );
    close ( );
 }
 void Appearance::styleClicked ( int index )
 {
    StyleListItem *sli = (StyleListItem *) m_style_list-> item ( index );
    m_style_settings-> setEnabled ( sli ? sli-> hasSettings ( ) : false );
    if ( m_sample && sli && sli-> style ( ))
    {
        int ci = m_color_list ? m_color_list-> currentItem ( ) : -1;
        m_sample-> setStyle2 ( sli-> style ( ), ci < 0 ? palette ( ) : ((ColorListItem *) m_color_list-> item ( ci ))-> palette ( ));
    }
    m_style_changed |= ( index != m_original_style );
 }
 void Appearance::styleSettingsClicked ( )
 {
    StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
    if ( item && item-> hasSettings ( ))
    {
        QDialog *d = new QDialog ( this, "SETTINGS-DLG", true );
        QVBoxLayout *vbox = new QVBoxLayout ( d, 3, 0 );
        QWidget *w = item-> settings ( d );
        if ( w )
        {
            vbox-> addWidget ( w );
            d-> setCaption ( w-> caption ( ));
            bool accepted = ( QPEApplication::execDialog ( d ) == QDialog::Accepted );
            if ( item-> setSettings ( accepted ))
                m_style_changed = true;
        }
        delete d;
    }
 }
 void Appearance::decoClicked ( int index )
 {
    DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index );
    if ( m_sample )
    {
        if ( dli && dli-> interface ( ))
            m_sample-> setDecoration ( dli-> interface ( ));
        else
            m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
        m_sample-> repaint ( );
    }
    m_deco_changed |= ( index != m_original_deco );
 }
 void Appearance::fontClicked ( const QFont &f )
 {
    m_font_changed |= ( f != m_sample-> font ( ));
    m_sample-> setFont ( f );
 }
 void Appearance::colorClicked ( int index )
 {
    ColorListItem *item = (ColorListItem *) m_color_list-> item ( index );
    if ( item )
        m_sample-> setPalette ( item-> palette ( ));
    m_color_changed |= ( item-> palette ( ) != qApp-> palette ( ));
 }
 void Appearance::editSchemeClicked ( )
 {
    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
    int cnt = 0;
    QString labels [QColorGroup::NColorRoles];
    QColor colors [QColorGroup::NColorRoles];
    for ( int role = 0; role < (int) QColorGroup::NColorRoles; ++role )
    {
        QColor col = item->color( static_cast<QColorGroup::ColorRole>( role ) );
        if ( col. isValid ( ))
        {
            labels[cnt] = item->label( static_cast<QColorGroup::ColorRole>( role ) );
            colors[cnt] = col;
            cnt++;
        }
    }
    EditScheme* editdlg = new EditScheme( cnt, labels, colors, this, "editScheme", true );
    if ( QPEApplication::execDialog( editdlg ) == QDialog::Accepted )
    {
        ColorListItem *citem = (ColorListItem *) m_color_list-> item ( 0 );
        cnt = 0;
        for ( int role = 0; role < (int) QColorGroup::NColorRoles; ++role )
        {
            if ( item->color( static_cast<QColorGroup::ColorRole>( role ) ).isValid() )
            {
                citem->setColor( static_cast<QColorGroup::ColorRole>( role ), colors[cnt] );
                cnt++;
            }
        }
        m_color_list-> setCurrentItem ( 0 );
        colorClicked ( 0 );
        m_color_changed = true;
    }
    delete editdlg;
 }
 void Appearance::saveSchemeClicked()
 {
    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
    if ( !item )
        return;
    QDialog *d = new QDialog ( this, 0, true );
    d-> setCaption ( tr( "Save Scheme" ));
    QLineEdit *ed = new QLineEdit ( d );
    ( new QVBoxLayout ( d, 3, 3 ))-> addWidget ( ed );
    ed-> setFocus ( );
    if ( d-> exec ( ) == QDialog::Accepted )
    {
        QString schemename = ed-> text ( );
        QString filestr = QPEApplication::qpeDir();
        filestr.append( "/etc/colors/" );
        filestr.append( schemename );
        filestr.append( ".scheme" );
        QFile file ( filestr );
        if ( !file. exists ( ))
        {
            QPalette p = item-> palette ( );
            Config config ( file.name(), Config::File );
            config. setGroup( "Colors" );
            item-> save ( config );
            config. write ( ); // need to flush the config info first
            m_color_list-> insertItem ( new ColorListItem ( schemename, config ));
        }
        else
        {
            QMessageBox::information ( this, tr( "Save scheme" ), tr( "Scheme does already exist." ));
        }
    }
    delete d;
 }
 void Appearance::deleteSchemeClicked()
 {
    ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
    if ( !item )
        return;
    if ( m_color_list-> currentItem ( ) > 0 )
    {
        if ( QPEMessageBox::confirmDelete ( this, tr( "Delete scheme" ), item-> text ( ) ) )
        {
            QString filestr = QPEApplication::qpeDir ( );
            filestr.append( "/etc/colors/" );
            filestr.append( item-> text ( ) );
            filestr.append( ".scheme" );
            QFile::remove ( filestr );
            delete item;
        }
    }
    else
    {
        QMessageBox::information( this, tr( "Delete scheme" ), tr( "Unable to delete current scheme." ));
    }
 }
-void Appearance::addExcept ( )
-{
-    ExceptListItem *it = new ExceptListItem ( m_except, 0, tr( "<new>" ), true, true, true );
-    m_except-> ensureItemVisible ( it );
-    m_except-> setSelected ( it, true );
-}
-void Appearance::delExcept ( )
-{
-    if ( m_except-> selectedItem ( ))
-    {
-        m_except-> setFocus ( );
-        delete m_except-> selectedItem ( );
-    }
-}
-void Appearance::upExcept ( )
-{
-    ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
-    if ( it && it-> itemAbove ( ))
-        it-> itemAbove ( )-> moveItem ( it );
-}
-void Appearance::downExcept ( )
-{
-    ExceptListItem *it = (ExceptListItem *) m_except-> selectedItem ( );
-    if ( it && it-> itemBelow ( ))
-        it-> moveItem ( it-> itemBelow ( ));
-}
-class ExEdit : public QLineEdit
-{
-public:
-    ExEdit ( ExceptListItem *item )
-            : QLineEdit ( item-> listView ( )-> viewport ( ), "exedit" ), it ( item )
-    {
-        setFrame ( false );
-        QRect r = it-> listView ( )-> itemRect ( it );
-        int x = it-> listView ( )-> header ( )-> cellPos ( 3 ) - 1;
-        int y = r. y ( );
-        int w = it-> listView ( )-> viewport ( )-> width ( ) - x;
-        int h = r. height ( ); // + 2;
-        setText ( it-> pattern ( ));
-        setGeometry ( x, y, w, h );
-        odebug << "ExEdit: [" << it->text(2).latin1() << "] at "
-               << x << "," << y << " " << w << "," << h << oendl;
-        m_out = true;
-        show ( );
-        setFocus ( );
-        selectAll ( );
-        end ( true );
-    }
-    virtual void focusOutEvent ( QFocusEvent * )
-    {
-        hide ( );
-        if ( m_out )
-            it-> setPattern ( text ( ));
-        delete this;
-    }
-    virtual void keyPressEvent ( QKeyEvent *e )
-    {
-        if ( e-> key ( ) == Key_Return )
-            it-> listView ( )-> setFocus ( );
-        else if ( e-> key ( ) == Key_Escape )
-        {
-            m_out = false;
-            it-> listView ( )-> setFocus ( );
-        }
-        else
-            QLineEdit::keyPressEvent ( e );
-    }
-private:
-    ExceptListItem *it;
-    bool m_out;
-};
-void Appearance::clickedExcept ( QListViewItem *item, const QPoint &, int c )
-{
-    if ( !item || c < 0 || c > 3 )
-        return;
-    ExceptListItem *it = (ExceptListItem *) item;
-    if ( c == 0 )
-        it-> setNoStyle ( !it-> noStyle ( ));
-    else if ( c == 1 )
-        it-> setNoFont ( !it-> noFont ( ));
-    else if ( c == 2 )
-        it-> setNoDeco ( !it-> noDeco ( ));
-    else if ( c == 3 )
-    {
-        m_except-> ensureItemVisible ( it );
-        new ExEdit ( it );
-    }
-}
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index 134a918..de2f1ab 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -1,132 +1,124 @@
 /*
 � � � � � � � �              This file is part of the OPIE Project
               =.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
 � � � � � � �.=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This file is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This file is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef APPEARANCESETTINGS_H
 #define APPEARANCESETTINGS_H
 #include <opie2/ofontselector.h>
 #include <qpe/fontdatabase.h>
 #include <qdialog.h>
 using Opie::Ui::OFontSelector;
 class QCheckBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QListBox;
 class QMultiLineEdit;
 class QPushButton;
 class QRadioButton;
 class QToolButton;
 class SampleWindow;
 namespace Opie {namespace Ui {class OFontSelector;}}
 class QListView;
 class QListViewItem;
 class Config;
 class Appearance : public QDialog
 {
    Q_OBJECT
 public:
    Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~Appearance();
    static QString appName() { return QString::fromLatin1("appearance"); }
 protected:
    virtual void accept ( );
    virtual void done ( int r );
 protected slots:
    void styleClicked ( int );
    void styleSettingsClicked ( );
    void decoClicked ( int );
    void fontClicked ( const QFont & );
    void colorClicked ( int );
    void editSchemeClicked();
    void saveSchemeClicked();
    void deleteSchemeClicked();
    void tabChanged ( QWidget * );
-    void addExcept ( );
-    void delExcept ( );
-    void upExcept ( );
-    void downExcept ( );
-    void clickedExcept ( QListViewItem *, const QPoint &, int );
 private:
    void changeText();
    QWidget *createStyleTab ( QWidget *parent, Config &cfg );
    QWidget *createDecoTab ( QWidget *parent, Config &cfg );
    QWidget *createFontTab ( QWidget *parent, Config &cfg );
    QWidget *createColorTab ( QWidget *parent, Config &cfg );
    QWidget *createAdvancedTab ( QWidget *parent, Config &cfg );
 private:
    bool m_style_changed;
    bool m_font_changed;
    bool m_scheme_changed;
    bool m_deco_changed;
    bool m_color_changed;
    int  m_original_style;
    int  m_original_deco;
    int  m_original_tabstyle;
    bool m_original_tabpos;
    QListBox *    m_style_list;
    QPushButton * m_style_settings;
    QListBox *    m_deco_list;
    QListBox *    m_color_list;
    Opie::Ui::OFontSelector *m_fontselect;
    SampleWindow *m_sample;
    QComboBox *   m_tabstyle_list;
    QRadioButton *m_tabstyle_top;
    QRadioButton *m_tabstyle_bottom;
    QRadioButton *m_rotdir_cw;
    QRadioButton *m_rotdir_ccw;
    QRadioButton *m_rotdir_flip;
    QWidget *     m_advtab;
-    QListView *   m_except;
-    QCheckBox *   m_force;
 };
 #endif